http_digest: Post SSPI support tidy up

Post tidy up to ensure commonality of code style and variable names.

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 59bafc7c3d4be245a28d6774f8add64e7d502dc4..7d5a63d61e86a275e12d6f4d2731c5b9148fd978 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -96,7 +96,7 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
 
   for(c = DIGEST_MAX_VALUE_LENGTH - 1; (*str && (*str != '=') && c--); )
     *value++ = *str++;
-  *value=0;
+  *value = 0;
 
   if('=' != *str++)
     /* eek, no match */
@@ -123,19 +123,19 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
       if(!starts_with_quote) {
         /* this signals the end of the content if we didn't get a starting
            quote and then we do "sloppy" parsing */
-        c=0; /* the end */
+        c = 0; /* the end */
         continue;
       }
       break;
     case '\r':
     case '\n':
       /* end of string */
-      c=0;
+      c = 0;
       continue;
     case '\"':
       if(!escape && starts_with_quote) {
         /* end of string */
-        c=0;
+        c = 0;
         continue;
       }
       break;
@@ -143,7 +143,7 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
     escape = FALSE;
     *content++ = *str;
   }
-  *content=0;
+  *content = 0;
 
   *endptr = str;
 
@@ -787,7 +787,7 @@ CURLcode Curl_sasl_decode_digest_http_message(const char *chlg,
 
         free(tmp);
 
-        /* Select only auth o auth-int. Otherwise, ignore */
+        /* Select only auth or auth-int. Otherwise, ignore */
         if(foundAuth) {
           digest->qop = strdup(DIGEST_QOP_VALUE_STRING_AUTH);
           if(!digest->qop)

diff --git a/lib/http_digest.c b/lib/http_digest.c
index f52c8dd22d7a20f878a2cfaefd68b0382433d17d..ba59e5d14824ab70b9328761caa36df8e84bb958 100644 (file)
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -48,14 +48,16 @@ CURLcode Curl_input_digest(struct connectdata *conn,
                            const char *header) /* rest of the *-authenticate:
                                                   header */
 {
-  struct SessionHandle *data=conn->data;
-  struct digestdata *d;
+  struct SessionHandle *data = conn->data;
+
+  /* Point to the correct struct with this */
+  struct digestdata *digest;
 
   if(proxy) {
-    d = &data->state.proxydigest;
+    digest = &data->state.proxydigest;
   }
   else {
-    d = &data->state.digest;
+    digest = &data->state.digest;
   }
 
   if(!checkprefix("Digest", header))
@@ -65,7 +67,7 @@ CURLcode Curl_input_digest(struct connectdata *conn,
   while(*header && ISSPACE(*header))
     header++;
 
-  return Curl_sasl_decode_digest_http_message(header, d);
+  return Curl_sasl_decode_digest_http_message(header, digest);
 }
 
 CURLcode Curl_output_digest(struct connectdata *conn,
@@ -90,18 +92,18 @@ CURLcode Curl_output_digest(struct connectdata *conn,
   const char *passwdp;
 
   /* Point to the correct struct with this */
-  struct digestdata *d;
+  struct digestdata *digest;
   struct auth *authp;
 
   if(proxy) {
-    d = &data->state.proxydigest;
+    digest = &data->state.proxydigest;
     allocuserpwd = &conn->allocptr.proxyuserpwd;
     userp = conn->proxyuser;
     passwdp = conn->proxypasswd;
     authp = &data->state.authproxy;
   }
   else {
-    d = &data->state.digest;
+    digest = &data->state.digest;
     allocuserpwd = &conn->allocptr.userpwd;
     userp = conn->user;
     passwdp = conn->passwd;
@@ -112,15 +114,15 @@ CURLcode Curl_output_digest(struct connectdata *conn,
 
   /* not set means empty */
   if(!userp)
-    userp="";
+    userp = "";
 
   if(!passwdp)
-    passwdp="";
+    passwdp = "";
 
 #if defined(USE_WINDOWS_SSPI)
-  have_chlg = d->input_token ? TRUE : FALSE;
+  have_chlg = digest->input_token ? TRUE : FALSE;
 #else
-  have_chlg = d->nonce ? TRUE : FALSE;
+  have_chlg = digest->nonce ? TRUE : FALSE;
 #endif
 
   if(!have_chlg) {
@@ -147,13 +149,13 @@ CURLcode Curl_output_digest(struct connectdata *conn,
     path = (unsigned char *) aprintf("%.*s", urilen, uripath);
   }
   else
-    path = (unsigned char *) strdup((char *)uripath);
+    path = (unsigned char *) strdup((char *) uripath);
 
   if(!path)
     return CURLE_OUT_OF_MEMORY;
 
   result = Curl_sasl_create_digest_http_message(data, userp, passwdp, request,
-                                                path, d, &response, &len);
+                                                path, digest, &response, &len);
   free(path);
   if(result)
     return result;