summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2020-01-15 09:56:07 -0700
committerKarl Williamson <khw@cpan.org>2020-01-23 15:46:56 -0700
commit5763c818d507cbfb16047c9eb043b2b45ec416d4 (patch)
treebcb6e8700f8bd8319dcb2c7c62ff96f4b8c79614
parenteb761011ef445316d4cd232c3204dde4641e2a79 (diff)
downloadperl-5763c818d507cbfb16047c9eb043b2b45ec416d4.tar.gz
dquote.c: Change parameter name
In two functions, future commits will generalize this parameter to be possibly a warning message instead of only an error message. Change its name to reflect the added meaning.
-rw-r--r--dquote.c28
-rw-r--r--embed.fnc4
-rw-r--r--proto.h8
3 files changed, 20 insertions, 20 deletions
diff --git a/dquote.c b/dquote.c
index 4898b350da..3a2ba46c26 100644
--- a/dquote.c
+++ b/dquote.c
@@ -57,7 +57,7 @@ Perl_grok_bslash_c(pTHX_ const char source, const bool output_warning)
bool
Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
- const char** error_msg,
+ const char** message,
const bool output_warning, const bool strict,
const bool UTF)
{
@@ -80,7 +80,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
* range *s..send-1
* uv points to a UV that will hold the output value, valid only if the
* return from the function is TRUE
- * error_msg is a pointer that will be set to an internal buffer giving an
+ * message is a pointer that will be set to an internal buffer giving an
* error message upon failure (the return is FALSE). Untouched if
* function succeeds
* output_warning says whether to output any warning messages, or suppress
@@ -103,7 +103,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
(*s)++;
if (send <= *s || **s != '{') {
- *error_msg = "Missing braces on \\o{}";
+ *message = "Missing braces on \\o{}";
return FALSE;
}
@@ -113,7 +113,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
while (isOCTAL(**s)) { /* Position beyond the legal digits */
(*s)++;
}
- *error_msg = "Missing right brace on \\o{";
+ *message = "Missing right brace on \\o{";
return FALSE;
}
@@ -122,7 +122,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
numbers_len = e - *s;
if (numbers_len == 0) {
(*s)++; /* Move past the } */
- *error_msg = "Empty \\o{}";
+ *message = "Empty \\o{}";
return FALSE;
}
@@ -134,7 +134,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
if (strict) {
*s += numbers_len;
*s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
- *error_msg = "Non-octal character";
+ *message = "Non-octal character";
return FALSE;
}
else if (output_warning) {
@@ -155,7 +155,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
bool
Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
- const char** error_msg,
+ const char** message,
const bool output_warning, const bool strict,
const bool UTF)
{
@@ -179,7 +179,7 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
* range *s..send-1
* uv points to a UV that will hold the output value, valid only if the
* return from the function is TRUE
- * error_msg is a pointer that will be set to an internal buffer giving an
+ * message is a pointer that will be set to an internal buffer giving an
* error message upon failure (the return is FALSE). Untouched if
* function succeeds
* output_warning says whether to output any warning messages, or suppress
@@ -205,7 +205,7 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
if (send <= *s) {
if (strict) {
- *error_msg = "Empty \\x";
+ *message = "Empty \\x";
return FALSE;
}
@@ -227,10 +227,10 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
if (strict && len != 2) {
if (len < 2) {
*s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
- *error_msg = "Non-hex character";
+ *message = "Non-hex character";
}
else {
- *error_msg = "Use \\x{...} for more than two hex characters";
+ *message = "Use \\x{...} for more than two hex characters";
}
return FALSE;
}
@@ -246,7 +246,7 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
/* XXX The corresponding message above for \o is just '\\o{'; other
* messages for other constructs include the '}', so are inconsistent.
*/
- *error_msg = "Missing right brace on \\x{}";
+ *message = "Missing right brace on \\x{}";
return FALSE;
}
@@ -256,7 +256,7 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
if (numbers_len == 0) {
if (strict) {
(*s)++; /* Move past the } */
- *error_msg = "Empty \\x{}";
+ *message = "Empty \\x{}";
return FALSE;
}
*s = e + 1;
@@ -273,7 +273,7 @@ Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv,
if (strict && numbers_len != (STRLEN) (e - *s)) {
*s += numbers_len;
*s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
- *error_msg = "Non-hex character";
+ *message = "Non-hex character";
return FALSE;
}
diff --git a/embed.fnc b/embed.fnc
index 36472ad2ed..014e0f2f42 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1139,7 +1139,7 @@ ApdR |I32 |looks_like_number|NN SV *const sv
EpRX |bool |grok_bslash_x |NN char** s \
|NN const char* const send \
|NN UV* uv \
- |NN const char** error_msg \
+ |NN const char** message \
|const bool output_warning \
|const bool strict \
|const bool utf8
@@ -1147,7 +1147,7 @@ EpRX |char |grok_bslash_c |const char source|const bool output_warning
EpRX |bool |grok_bslash_o |NN char** s \
|NN const char* const send \
|NN UV* uv \
- |NN const char** error_msg \
+ |NN const char** message \
|const bool output_warning \
|const bool strict \
|const bool utf8
diff --git a/proto.h b/proto.h
index 0cf4442309..1f71619e19 100644
--- a/proto.h
+++ b/proto.h
@@ -5916,15 +5916,15 @@ PERL_CALLCONV char Perl_grok_bslash_c(pTHX_ const char source, const bool output
__attribute__warn_unused_result__;
#define PERL_ARGS_ASSERT_GROK_BSLASH_C
-PERL_CALLCONV bool Perl_grok_bslash_o(pTHX_ char** s, const char* const send, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool utf8)
+PERL_CALLCONV bool Perl_grok_bslash_o(pTHX_ char** s, const char* const send, UV* uv, const char** message, const bool output_warning, const bool strict, const bool utf8)
__attribute__warn_unused_result__;
#define PERL_ARGS_ASSERT_GROK_BSLASH_O \
- assert(s); assert(send); assert(uv); assert(error_msg)
+ assert(s); assert(send); assert(uv); assert(message)
-PERL_CALLCONV bool Perl_grok_bslash_x(pTHX_ char** s, const char* const send, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool utf8)
+PERL_CALLCONV bool Perl_grok_bslash_x(pTHX_ char** s, const char* const send, UV* uv, const char** message, const bool output_warning, const bool strict, const bool utf8)
__attribute__warn_unused_result__;
#define PERL_ARGS_ASSERT_GROK_BSLASH_X \
- assert(s); assert(send); assert(uv); assert(error_msg)
+ assert(s); assert(send); assert(uv); assert(message)
#ifndef PERL_NO_INLINE_FUNCTIONS
PERL_STATIC_INLINE I32 S_regcurly(const char *s)