Fix some compiler warnings:

- suggest braces around empty body in an 'if' statement
- comparison of unsigned expression >= 0 is always true
- comparison of unsigned expression < 0 is always false

Please review carefully.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954641 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c
index 59bed3778b1c96d3005d0c3f4584d7c400d53e6a..3693db8d25b727e164c797bccabaefc37705652d 100644 (file)
--- a/modules/filters/mod_request.c
+++ b/modules/filters/mod_request.c
@@ -312,13 +312,14 @@ typedef enum {
  */
 static int ap_parse_request_form(request_rec * r, ap_filter_t * f,
                                  apr_array_header_t ** ptr,
-                                 apr_size_t num, apr_size_t size)
+                                 apr_size_t num, apr_size_t usize)
 {
     apr_bucket_brigade *bb = NULL;
     int seen_eos = 0;
     char buffer[HUGE_STRING_LEN + 1];
     const char *ct;
     apr_size_t offset = 0;
+    apr_ssize_t size;
     ap_form_type_t state = FORM_NAME, percent = FORM_NORMAL;
     ap_form_pair_t *pair = NULL;
     apr_array_header_t *pairs = apr_array_make(r->pool, 4, sizeof(ap_form_pair_t));
@@ -334,6 +335,11 @@ static int ap_parse_request_form(request_rec * r, ap_filter_t * f,
         return ap_discard_request_body(r);
     }
 
+    if (usize > APR_SIZE_MAX >> 1)
+        size = APR_SIZE_MAX >> 1;
+    else
+        size = usize;
+
     if (!f) {
         f = r->input_filters;
     }

diff --git a/modules/proxy/ajp_msg.c b/modules/proxy/ajp_msg.c
index 511b25a8573a6ad7bc98d37b4025a34123e3a116..b511ce1585d22efc9ffcc20f02bd69b6a2994b34 100644 (file)
--- a/modules/proxy/ajp_msg.c
+++ b/modules/proxy/ajp_msg.c
@@ -292,8 +292,10 @@ apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
     /* We checked for space !!  */
     memcpy(msg->buf + msg->len, value, len + 1); /* including \0 */
 
-    if (convert)   /* convert from EBCDIC if needed */
+    if (convert) {
+        /* convert from EBCDIC if needed */
         ap_xlate_proto_to_ascii((char *)msg->buf + msg->len, len + 1);
+    }
 
     msg->len += len + 1;
 

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index e7b50f476bdd7d9d666555b2ce000483713ad709..3bb4a9aee86dcb896289767564255e3d9a4fe78d 100644 (file)
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -795,8 +795,9 @@ static int ftp_set_TYPE(char xfer_type, request_rec *r, conn_rec *ftp_ctrl,
                              "Unable to set transfer type");
     }
 /* Allow not implemented */
-    else if (rc == 504)
-        /* ignore it silently */;
+    else if (rc == 504) {
+        /* ignore it silently */
+    }
 
     return ret;
 }

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index f21bdcd94f8368c882a55a2a3e204fe57372cef1..e4226a6dce2080d0ae3659ea7b8005fba8f25323 100644 (file)
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -438,7 +438,7 @@ static apr_status_t slotmem_dptr(ap_slotmem_instance_t *slot,
     if (!slot) {
         return APR_ENOSHMAVAIL;
     }
-    if (id < 0 || id >= slot->desc.num) {
+    if (id >= slot->desc.num) {
         return APR_ENOSHMAVAIL;
     }
 

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index ec9dd5d0a8d3906ddca05a8816eee3c8bc61ee09..78325a4d1d5c9f8eb6743bb7127778ed218646a6 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1165,12 +1165,14 @@ const char *ssl_cmd_SSLRequire(cmd_parms *cmd,
 const char *ssl_cmd_SSLRenegBufferSize(cmd_parms *cmd, void *dcfg, const char *arg)
 {
     SSLDirConfigRec *dc = dcfg;
-    
-    dc->nRenegBufferSize = atoi(arg);
-    if (dc->nRenegBufferSize < 0) {
+    int val;
+
+    val = atoi(arg);
+    if (val < 0) {
         return apr_pstrcat(cmd->pool, "Invalid size for SSLRenegBufferSize: ",
                            arg, NULL);
     }
+    dc->nRenegBufferSize = val;
 
     return NULL;
 }

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index c2bde94340110fb26505e09ac270ca14aec755a3..f44c707fa31d60887d416192be691ccd1df8ca92 100644 (file)
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -324,7 +324,7 @@ BOOL SSL_X509_getBC(X509 *cert, int *ca, int *pathlen)
     char *cp;
 
     bc = X509_get_ext_d2i(cert, NID_basic_constraints, NULL, NULL);
-    if (bc == NULL);
+    if (bc == NULL)
         return FALSE;
     *ca = bc->ca;
     *pathlen = -1 /* unlimited */;

diff --git a/server/core_filters.c b/server/core_filters.c
index 3c97400a7283f4b9a9302082f71844c9438ec8a6..827986e17907013c1ae524570b83260af5523517 100644 (file)
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -468,7 +468,7 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *new_bb)
             non_file_bytes_in_brigade = 0;
         }
         else if (!APR_BUCKET_IS_METADATA(bucket)) {
-            if (bucket->length < 0) {
+            if (bucket->length != (apr_size_t)-1) {
                 const char *data;
                 apr_size_t length;
                 /* XXX support nonblocking read here? */