svn commit: r126445 - /httpd/apreq/branches/multi-env-unstable/acinclude.m4 /httpd/apreq/branches/multi-env-unstable/t/params.c

[joes]

Author: joes
Date: Tue Jan 25 15:39:57 2005
New Revision: 126445

URL: http://svn.apache.org/viewcvs?view=rev&rev=126445
Log:

gcc warning cleanups; this patch represents part two of 

        http://marc.theaimsgroup.com/?l=apreq-dev&m=110667661730797&w=2

Submitted by: Max Kellermann
Reviewed by: joes

Modified:
   httpd/apreq/branches/multi-env-unstable/acinclude.m4
   httpd/apreq/branches/multi-env-unstable/t/params.c

Modified: httpd/apreq/branches/multi-env-unstable/acinclude.m4
Url: 
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/acinclude.m4?view=diff&rev=126445&p1=httpd/apreq/branches/multi-env-unstable/acinclude.m4&r1=126444&p2=httpd/apreq/branches/multi-env-unstable/acinclude.m4&r2=126445
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/acinclude.m4        (original)
+++ httpd/apreq/branches/multi-env-unstable/acinclude.m4        Tue Jan 25 
15:39:57 2005
@@ -142,10 +142,9 @@
         fi
 
         if test "x$USE_MAINTAINER_MODE" != "xno"; then
-            CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes 
-Wmissing-declarations"
-            # -Werror temporarily removed until the next patch is applied
+            CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes 
-Wmissing-declarations -Werror"
             if test "$GCC" = "yes"; then
-                CPPFLAGS="$CPPFLAGS -Wwrite-strings -Wcast-qual -Wfloat-equal 
-Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return 
-Wmissing-noreturn -Wmissing-format-attribute -Wpacked -Wredundant-decls 
-Wnested-externs -Winline -Wdisabled-optimization -Wno-long-long -Wendif-labels 
-Wcast-align -Wpacked"
+                CPPFLAGS="$CPPFLAGS -Wwrite-strings -Wcast-qual -Wfloat-equal 
-Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return 
-Wmissing-noreturn -Wmissing-format-attribute -Wpacked -Wredundant-decls 
-Wnested-externs -Wdisabled-optimization -Wno-long-long -Wendif-labels 
-Wcast-align -Wpacked"
                 # -Wdeclaration-after-statement is only supported on gcc 3.4+
             fi
         fi

Modified: httpd/apreq/branches/multi-env-unstable/t/params.c
Url: 
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/t/params.c?view=diff&rev=126445&p1=httpd/apreq/branches/multi-env-unstable/t/params.c&r1=126444&p2=httpd/apreq/branches/multi-env-unstable/t/params.c&r2=126445
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/t/params.c  (original)
+++ httpd/apreq/branches/multi-env-unstable/t/params.c  Tue Jan 25 15:39:57 2005
@@ -177,7 +177,7 @@
     apr_size_t exp_len, res_len, res_quote_len;
     char *res = apr_palloc(p,24);
     char *res_quote = apr_palloc(p,24);
-    const char *exp = apr_palloc(p,24);
+    const char *expe = apr_palloc(p,24);
     int i;
     const char * arr[] = {"cest", "\"cest", "ce\"st", "\"cest\""};
     const char * arr_quote[] = 
@@ -194,9 +194,9 @@
         CuAssertStrNEquals(tc, res, res_quote, res_len);
         res_len = apreq_quote_once(res, arr[i], arr_len[i]);
         exp_len = (i == 3) ? arr_len[i] : arr_quote_len[i];
-        exp = (i == 3) ? arr[i] : arr_quote[i];
+        expe = (i == 3) ? arr[i] : arr_quote[i];
         CuAssertIntEquals(tc, exp_len, res_len);
-        CuAssertStrNEquals(tc, exp, res, exp_len);
+        CuAssertStrNEquals(tc, expe, res, exp_len);
     }
 }