http: aesthetic change

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c43faac47af667e8328e47e34f60787e278ea26..d3ac754c32a39aa4dde5caf873bcc2336eca4fc8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-04  Giuseppe Scrivano  <gscrivan@redhat.com>
+
+       * http.c (modify_param_value, extract_param): Aesthetic change.
+

 2014-02-14  Vladimír Pýcha  <vpycha@gmail.com> (tiny change)
 
        * http.c (parse_content_disposition, extract_param)
 2014-02-14  Vladimír Pýcha  <vpycha@gmail.com> (tiny change)
 
        * http.c (parse_content_disposition, extract_param)

diff --git a/src/http.c b/src/http.c
index 690fcdecfd04ab65a58db2912661386f03b7b780..cd2bd15eb1574f42584bfb5a64e39cf92bc1351f 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1040,7 +1040,7 @@ modify_param_name(param_token *name)
 static void
 modify_param_value (param_token *value, int encoding_type )
 {
 static void
 modify_param_value (param_token *value, int encoding_type )
 {

-  if (RFC2231_ENCODING == encoding_type)
+  if (encoding_type == RFC2231_ENCODING)

     {
       const char *delim = memrchr (value->b, '\'', value->e - value->b);
       if ( delim != NULL )
     {
       const char *delim = memrchr (value->b, '\'', value->e - value->b);
       if ( delim != NULL )


@@ -1073,6 +1073,7 @@ extract_param (const char **source, param_token *name, param_token *value,
                char separator, bool *is_url_encoded)
 {
   const char *p = *source;
                char separator, bool *is_url_encoded)
 {
   const char *p = *source;

+  int param_type;

   if (is_url_encoded)
     *is_url_encoded = false;   /* initializing the out parameter */
 
   if (is_url_encoded)
     *is_url_encoded = false;   /* initializing the out parameter */
 


@@ -1130,10 +1131,10 @@ extract_param (const char **source, param_token *name, param_token *value,
     }
   *source = p;
 
     }
   *source = p;
 

-  int param_type = modify_param_name(name);
-  if (NOT_RFC2231 != param_type)
+  param_type = modify_param_name(name);
+  if (param_type != NOT_RFC2231)

     {
     {

-      if (RFC2231_ENCODING == param_type && is_url_encoded)
+      if (param_type == RFC2231_ENCODING && is_url_encoded)

         *is_url_encoded = true;
       modify_param_value(value, param_type);
     }
         *is_url_encoded = true;
       modify_param_value(value, param_type);
     }