More fixes for picky compilers

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

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index df19df399ee1fae79200f909167053b69ceac926..968e1a07e83469763739d95dc1ab0067b44ff88c 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -83,7 +83,7 @@ static const char *ap_expr_eval_var(ap_expr_eval_ctx *ctx,
 static const char *ap_expr_eval_string_func(ap_expr_eval_ctx *ctx, const ap_expr *info,
                                             const ap_expr *arg)
 {
-    ap_expr_string_func_t *func = info->node_arg1;
+    ap_expr_string_func_t *func = (ap_expr_string_func_t *)info->node_arg1;
     const void *data = info->node_arg2;
 
     AP_DEBUG_ASSERT(info->node_op == op_StringFuncInfo);
@@ -186,7 +186,7 @@ static int ap_expr_eval_comp(ap_expr_eval_ctx *ctx, const ap_expr *node)
             else if (e2->node_op == op_ListFuncCall) {
                 const ap_expr *info = e2->node_arg1;
                 const ap_expr *arg = e2->node_arg2;
-                ap_expr_list_func_t *func = info->node_arg1;
+                ap_expr_list_func_t *func = (ap_expr_list_func_t *)info->node_arg1;
                 apr_array_header_t *haystack;
                 int i = 0;
                 AP_DEBUG_ASSERT(func != NULL);

diff --git a/server/util_expr_scan.c b/server/util_expr_scan.c
index 86e7a39eee03798f65552b7323bccc8088c49087..5eea9522ef7e272a0aba42b241da39e0251ef702 100644 (file)
--- a/server/util_expr_scan.c
+++ b/server/util_expr_scan.c
@@ -1138,9 +1138,8 @@ case 21:
 YY_RULE_SETUP
 #line 198 "util_expr_scan.l"
 {
-    char c[2] = { yytext[0], '\0' };
     char *msg = apr_psprintf(yyextra->pool,
-                             "Invalid character in variable name '%s'", c);
+                             "Invalid character in variable name '%c'", yytext[0]);
     PERROR(msg);
 }
        YY_BREAK
@@ -1443,8 +1442,7 @@ case 64:
 YY_RULE_SETUP
 #line 336 "util_expr_scan.l"
 {
-    char c[2] = { yytext[0], '\0' };
-    char *msg = apr_psprintf(yyextra->pool, "Parse error near '%s'", c);
+    char *msg = apr_psprintf(yyextra->pool, "Parse error near '%c'", yytext[0]);
     PERROR(msg);
 }
        YY_BREAK

diff --git a/server/util_expr_scan.l b/server/util_expr_scan.l
index d2840a00b40d78609b7e4aee5fd782c93a9ea81a..1ee8f8b1f23413616838c50bcfe3797b47af485d 100644 (file)
--- a/server/util_expr_scan.l
+++ b/server/util_expr_scan.l
@@ -196,9 +196,8 @@
 }
 
 <var>.|\n {
-    char c[2] = { yytext[0], '\0' };
     char *msg = apr_psprintf(yyextra->pool,
-                             "Invalid character in variable name '%s'", c);
+                             "Invalid character in variable name '%c'", yytext[0]);
     PERROR(msg);
 }
 
@@ -334,8 +333,7 @@
   * Anything else is an error
   */
 .|\n {
-    char c[2] = { yytext[0], '\0' };
-    char *msg = apr_psprintf(yyextra->pool, "Parse error near '%s'", c);
+    char *msg = apr_psprintf(yyextra->pool, "Parse error near '%c'", yytext[0]);
     PERROR(msg);
 }