From 335cd45dcd02e256a44eb9b9de1c556f6f077eed Mon Sep 17 00:00:00 2001
From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Sun, 15 Sep 2002 00:00:48 +0000
Subject: [PATCH] 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
---
 CHANGES                       | 2 ++
 modules/filters/config.m4     | 2 +-
 modules/filters/mod_include.c | 6 ++----
 modules/ssl/mod_ssl.c         | 3 ++-
 modules/ssl/ssl_expr_parse.y  | 2 --
 modules/ssl/ssl_util_ssl.c    | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 352974ef1f..975a455cfa 100644
--- 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 916ce01e8d..d74dca2943 100644
--- 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 8b1db773fd..402a6de316 100644
--- 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 14e971ce79..0365adfb3a 100644
--- 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 c063b2bbee..13eb508505 100644
--- 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 b3e866fd5a..b11bc0da7b 100644
--- 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);
-- 
2.50.1