Remove warnings seen with Sun's Forte compiler.

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

diff --git a/CHANGES b/CHANGES
index 352974ef1f85ef198b6aec2ca384d12a0cc5f6f0..975a455cfa676feb4e8613be653bc38bfec20a18 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.42
 
+  *) Remove warnings with Sun's Forte compiler.  [Justin Erenkrantz]
+
   *) Fixed mod_disk_cache's generation of 304s
      [Kris Verbeeck <Kris.Verbeeck@ubizen.com>]
 

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 916ce01e8de6563152ea7a43da6eba35d7fd9001..d74dca29434d7f43a8651fed0db5495b26ee1534 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -49,7 +49,7 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , no, [
     fi
     APR_ADDTO(LIBS, [-lz])
     AC_MSG_CHECKING([for zlib library])
-    AC_TRY_LINK([#include <zlib.h>], [return Z_OK;], 
+    AC_TRY_LINK([#include <zlib.h>], [int i = Z_OK;], 
     [AC_MSG_RESULT(found) 
      AC_CHECK_HEADERS(zutil.h)],
     [AC_MSG_RESULT(not found)

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 8b1db773fd353f1451f182384c80809d92529f03..402a6de3165406270b1aff6ba9e086895e5a32d2 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2086,7 +2086,7 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                 break;
             }
             /* Percolate upwards */
-            while (current != (struct parse_node *) NULL) {
+            if (current != (struct parse_node *) NULL) {
                 switch (current->token.type) {
                 case token_not:
                 case token_eq:
@@ -2106,7 +2106,6 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                     *was_error = 1;
                     return retval;
                 }
-                break;
             }
             if (current == (struct parse_node *) NULL) {
                 new->left = root;
@@ -2215,7 +2214,7 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                 break;
             }
             /* Percolate upwards */
-            while (current != (struct parse_node *) NULL) {
+            if (current != (struct parse_node *) NULL) {
                 switch (current->token.type) {
                 case token_not:
                 case token_eq:
@@ -2238,7 +2237,6 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                     *was_error = 1;
                     return retval;
                 }
-                break;
             }
             if (current == (struct parse_node *) NULL) {
                 new->left = root;

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 14e971ce79c751e3221554289e119e2afad36dd1..0365adfb3adcfccd8691ce32a0cd4e511682ecfc 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -335,7 +335,8 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd)
         return DECLINED; /* XXX */
     }
 
-    vhost_md5 = ap_md5_binary(c->pool, sc->vhost_id, sc->vhost_id_len);
+    vhost_md5 = ap_md5_binary(c->pool, (unsigned char *)sc->vhost_id,
+                              sc->vhost_id_len);
 
     if (!SSL_set_session_id_context(ssl, (unsigned char *)vhost_md5,
                                     MD5_DIGESTSIZE*2))

diff --git a/modules/ssl/ssl_expr_parse.y b/modules/ssl/ssl_expr_parse.y
index c063b2bbee41d19cc366a8aa3a905f3cd9396ca8..13eb5085052e60cd556b00c34ab40a6283858384 100644 (file)
--- a/modules/ssl/ssl_expr_parse.y
+++ b/modules/ssl/ssl_expr_parse.y
@@ -151,7 +151,6 @@ regex     : T_REGEX {
                                          REG_EXTENDED|REG_NOSUB)) == NULL) {
                     ssl_expr_error = "Failed to compile regular expression";
                     YYERROR;
-                    regex = NULL;
                 }
                 $$ = ssl_expr_make(op_Regex, regex, NULL);
             }
@@ -161,7 +160,6 @@ regex     : T_REGEX {
                                          REG_EXTENDED|REG_NOSUB|REG_ICASE)) == NULL) {
                     ssl_expr_error = "Failed to compile regular expression";
                     YYERROR;
-                    regex = NULL;
                 }
                 $$ = ssl_expr_make(op_Regex, regex, NULL);
             }

diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index b3e866fd5ac6d8018ecf492466c9e90a3407db0c..b11bc0da7b2470421f6e0797a360929b92713fa7 100644 (file)
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -386,7 +386,7 @@ BOOL SSL_X509_getCN(apr_pool_t *p, X509 *xs, char **cppCN)
     X509_NAME *xsn;
     X509_NAME_ENTRY *xsne;
     int i, nid;
-    char *data_ptr;
+    unsigned char *data_ptr;
     int data_len;
 
     xsn = X509_get_subject_name(xs);