From: Brian Pane <brianp@apache.org>
Date: Sun, 6 Jan 2002 06:53:25 +0000 (+0000)
Subject: Cleaned up a couple of ap_ssi_parse_string calls that I missed
X-Git-Tag: 2.0.30~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb748619ebb1dd4fd40bca3e2e9896b64679dc4f;p=apache

Cleaned up a couple of ap_ssi_parse_string calls that I missed
in the last commit


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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 93de761a60..1b7b151637 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2213,8 +2213,8 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
             if (!current->left->done) {
                 switch (current->left->token.type) {
                 case token_string:
-                    ap_ssi_parse_string(r, ctx, current->left->token.value,
-                                        buffer, sizeof(buffer), 0);
+                    buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+                                                 NULL, MAX_STRING_LEN, 0);
                     apr_cpystrn(current->left->token.value, buffer,
                                 sizeof(current->left->token.value));
                     current->left->value = 
@@ -2229,8 +2229,8 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
             if (!current->right->done) {
                 switch (current->right->token.type) {
                 case token_string:
-                    ap_ssi_parse_string(r, ctx, current->right->token.value,
-                                        buffer, sizeof(buffer), 0);
+                    buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+                                                 NULL, MAX_STRING_LEN, 0);
                     apr_cpystrn(current->right->token.value, buffer,
                                 sizeof(current->right->token.value));
                     current->right->value = 
@@ -2280,12 +2280,12 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                 *was_error = 1;
                 goto RETURN;
             }
-            ap_ssi_parse_string(r, ctx, current->left->token.value,
-                         buffer, sizeof(buffer), 0);
+            buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+                                         NULL, MAX_STRING_LEN, 0);
             apr_cpystrn(current->left->token.value, buffer,
                         sizeof(current->left->token.value));
-            ap_ssi_parse_string(r, ctx, current->right->token.value,
-                         buffer, sizeof(buffer), 0);
+            buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+                                         NULL, MAX_STRING_LEN, 0);
             apr_cpystrn(current->right->token.value, buffer,
                         sizeof(current->right->token.value));
             if (current->right->token.type == token_re) {
@@ -2339,12 +2339,12 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
                 *was_error = 1;
                 goto RETURN;
             }
-            ap_ssi_parse_string(r, ctx, current->left->token.value,
-                         buffer, sizeof(buffer), 0);
+            buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+                                         NULL, MAX_STRING_LEN, 0);
             apr_cpystrn(current->left->token.value, buffer,
                         sizeof(current->left->token.value));
-            ap_ssi_parse_string(r, ctx, current->right->token.value,
-                         buffer, sizeof(buffer), 0);
+            buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+                                         NULL, MAX_STRING_LEN, 0);
             apr_cpystrn(current->right->token.value, buffer,
                         sizeof(current->right->token.value));
 #ifdef DEBUG_INCLUDE