From 220342850749ffd044aeb3118f083600507dacef Mon Sep 17 00:00:00 2001 From: brectanus Date: Wed, 12 Dec 2007 18:43:40 +0000 Subject: [PATCH] Prefer "offset" to "pos". --- apache2/msc_xml.c | 2 +- apache2/re_operators.c | 4 ++-- apache2/re_variables.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apache2/msc_xml.c b/apache2/msc_xml.c index 7eab6937..7f642dec 100644 --- a/apache2/msc_xml.c +++ b/apache2/msc_xml.c @@ -33,7 +33,7 @@ static void xml_receive_sax_error(void *data, const char *msg, ...) { if (msr == NULL) return; - apr_snprintf(message, sizeof(message), "%s (line %d pos %d)", + apr_snprintf(message, sizeof(message), "%s (line %d offset %d)", log_escape_nq(msr->mp, msr->xml->parsing_ctx->lastError.message), msr->xml->parsing_ctx->lastError.line, msr->xml->parsing_ctx->lastError.int2); diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 2685421f..e21c0182 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -78,7 +78,7 @@ static int msre_op_rx_param_init(msre_rule *rule, char **error_msg) { /* Compile pattern */ regex = msc_pregcomp(rule->ruleset->mp, pattern, PCRE_DOTALL | PCRE_DOLLAR_ENDONLY, &errptr, &erroffset); if (regex == NULL) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (pos %d): %s", + *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (offset %d): %s", erroffset, errptr); return 0; } @@ -972,7 +972,7 @@ static int msre_op_verifyCC_init(msre_rule *rule, char **error_msg) { /* Compile pattern */ regex = msc_pregcomp(rule->ruleset->mp, pattern, PCRE_DOTALL | PCRE_MULTILINE, &errptr, &erroffset); if (regex == NULL) { - *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (pos %d): %s", + *error_msg = apr_psprintf(rule->ruleset->mp, "Error compiling pattern (offset %d): %s", erroffset, errptr); return 0; } diff --git a/apache2/re_variables.c b/apache2/re_variables.c index 3a5d4535..0ccfb4fd 100644 --- a/apache2/re_variables.c +++ b/apache2/re_variables.c @@ -69,7 +69,7 @@ static char *var_generic_list_validate(msre_ruleset *ruleset, msre_var *var) { regex = msc_pregcomp(ruleset->mp, pattern, PCRE_DOTALL | PCRE_CASELESS | PCRE_DOLLAR_ENDONLY, &errptr, &erroffset); if (regex == NULL) { - return apr_psprintf(ruleset->mp, "Error compiling pattern (pos %d): %s", + return apr_psprintf(ruleset->mp, "Error compiling pattern (offset %d): %s", erroffset, errptr); }