Commit c260c9fa authored by Steve Holme's avatar Steve Holme
Browse files

curl_sasl: Minor code policing following recent commits

parent 731e6a66

lib/curl_sasl.c

+11 −8
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ const struct { 
    return result; \

  }





/*

 * Return 0 on success and then the buffers are filled in fine.

 *
@@ -1212,8 +1211,7 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused) 
 *

 * Return the SASL mechanism token or 0 if no match.

 */

unsigned int

Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len)

unsigned int Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len)

{

  unsigned int i;

  char c;
@@ -1223,8 +1221,10 @@ Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len) 
       !memcmp(ptr, mechtable[i].name, mechtable[i].len)) {

      if(len)

        *len = mechtable[i].len;



      if(maxlen == mechtable[i].len)

        return mechtable[i].bit;



      c = ptr[mechtable[i].len];

      if(!ISUPPER(c) && !ISDIGIT(c) && c != '-' && c != '_')

        return mechtable[i].bit;
@@ -1244,7 +1244,7 @@ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl, 
{

  CURLcode result = CURLE_OK;

  unsigned int mechbit;

  size_t llen;

  size_t mechlen;



  if(!len)

    return CURLE_URL_MALFORMAT;
@@ -1256,8 +1256,8 @@ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl, 


    if(strnequal(value, "*", len))

      sasl->prefmech = SASL_AUTH_ANY;

    else if((mechbit = Curl_sasl_decode_mech(value, len, &llen)) &&

      llen == len)

    else if((mechbit = Curl_sasl_decode_mech(value, len, &mechlen)) &&

            mechlen == len)

      sasl->prefmech |= mechbit;

    else

      result = CURLE_URL_MALFORMAT;
@@ -1434,6 +1434,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
  }



  Curl_safefree(resp);



  return result;

}
@@ -1602,6 +1603,8 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
  }



  Curl_safefree(resp);



  state(sasl, conn, newstate);



  return result;

}

lib/curl_sasl.h

+1 −1

File changed.

Contains only whitespace changes.