define and use 'enum MHD_Result'

6 files changed, 15 insertions, 15 deletions

diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c
index 4f600ef0..430c8e18 100644
--- a/src/microhttpd/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
@@ -52,7 +52,7 @@ testStartError ()
 }
 
 
-static int
+static enum MHD_Result
 apc_nothing (void *cls,
              const struct sockaddr *addr,
              socklen_t addrlen)
@@ -63,7 +63,7 @@ apc_nothing (void *cls,
 }
 
 
-static int
+static enum MHD_Result
 apc_all (void *cls,
          const struct sockaddr *addr,
          socklen_t addrlen)
@@ -74,7 +74,7 @@ apc_all (void *cls,
 }
 
 
-static int
+static enum MHD_Result
 ahc_nothing (void *cls,
              struct MHD_Connection *connection,
              const char *url,
diff --git a/src/microhttpd/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
index 2c37565c..e70171cc 100644
--- a/src/microhttpd/test_postprocessor.c
+++ b/src/microhttpd/test_postprocessor.c
@@ -92,7 +92,7 @@ mismatch (const char *a, const char *b)
 }
 
 
-static int
+static enum MHD_Result
 value_checker (void *cls,
                enum MHD_ValueKind kind,
                const char *key,
@@ -140,10 +140,10 @@ value_checker (void *cls,
     fprintf (stderr,
              "Wanted: `%s' `%s' `%s' `%s' `%s'\n",
              want[idx],
-             want[idx+1],
-             want[idx+2],
-             want[idx+3],
-             want[idx+4]);
+             want[idx + 1],
+             want[idx + 2],
+             want[idx + 3],
+             want[idx + 4]);
     fprintf (stderr,
              "Unexpected result: %d/%d/%d/%d/%d/%d/%d\n",
              (idx < 0),
@@ -155,7 +155,7 @@ value_checker (void *cls,
              (0 != memcmp (data, &want[idx + 4][off], size)));
     return MHD_NO;
   }
-  if ( ( (NULL == want[idx+4]) &&
+  if ( ( (NULL == want[idx + 4]) &&
          (0 == off + size) ) ||
        (off + size == strlen (want[idx + 4])) )
     *want_off = idx + 5;
diff --git a/src/microhttpd/test_postprocessor_amp.c b/src/microhttpd/test_postprocessor_amp.c
index 54936979..8692d443 100644
--- a/src/microhttpd/test_postprocessor_amp.c
+++ b/src/microhttpd/test_postprocessor_amp.c
@@ -7,7 +7,7 @@
 
 uint64_t num_errors;
 
-int
+enum MHD_Result
 check_post (void *cls, enum MHD_ValueKind kind, const char*key,
             const char*filename, const char*content_type,
             const char*content_encoding, const char*data,
diff --git a/src/microhttpd/test_postprocessor_large.c b/src/microhttpd/test_postprocessor_large.c
index 0e2a10d2..678de808 100644
--- a/src/microhttpd/test_postprocessor_large.c
+++ b/src/microhttpd/test_postprocessor_large.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #endif
 
-static int
+static enum MHD_Result
 value_checker (void *cls,
                enum MHD_ValueKind kind,
                const char *key,
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 404c2854..b3aecafa 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -843,7 +843,7 @@ upgrade_cb (void *cls,
  *         #MHD_NO if the socket must be closed due to a serios
  *         error while handling the request
  */
-static int
+static enum MHD_Result
 ahc_upgrade (void *cls,
              struct MHD_Connection *connection,
              const char *url,
@@ -854,7 +854,7 @@ ahc_upgrade (void *cls,
              void **con_cls)
 {
   struct MHD_Response *resp;
-  int ret;
+  enum MHD_Result ret;
   (void) cls;
   (void) url;
   (void) method;                        /* Unused. Silent compiler warning. */
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index a17293db..d8d35838 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -867,7 +867,7 @@ upgrade_cb (void *cls,
  *         #MHD_NO if the socket must be closed due to a serios
  *         error while handling the request
  */
-static int
+static enum MHD_Result
 ahc_upgrade (void *cls,
              struct MHD_Connection *connection,
              const char *url,
@@ -878,7 +878,7 @@ ahc_upgrade (void *cls,
              void **con_cls)
 {
   struct MHD_Response *resp;
-  int ret;
+  enum MHD_Result ret;
   (void) cls;
   (void) url;
   (void) method;                        /* Unused. Silent compiler warning. */