summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2021-01-13 20:24:33 -0700
committerKarl Williamson <khw@cpan.org>2021-01-20 06:51:49 -0700
commitfa2251a9e60c97eaa6070019b9da01efb26262dd (patch)
tree2d9e9659b4cd261b8c2e4244146f4c1a55100d10
parent6fab1cd3d01b1727683adef1fd9c531f4e7d4d62 (diff)
downloadperl-fa2251a9e60c97eaa6070019b9da01efb26262dd.tar.gz
dquote.c: Change variable name
A future commit will need it to represent just the meaning of the new name
-rw-r--r--dquote.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/dquote.c b/dquote.c
index 8fc4e689fb..c1d31c2f03 100644
--- a/dquote.c
+++ b/dquote.c
@@ -117,7 +117,7 @@ Perl_form_alien_digit_msg(pTHX_
/* It also isn't a UTF-8 invariant character, so no display shortcuts
* are available. Use \\x{...} */
- Perl_sv_setpvf(aTHX_ display_char, "\\x{%02x}", *first_bad);
+ Perl_sv_setpvf(aTHX_ display_char, "\\x{%02x}", *first_bad);
}
/* Ready to start building the message */
@@ -267,7 +267,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
* UV_MAX, which is normally illegal, reserved for internal use.
* UTF is true iff the string *s is encoded in UTF-8.
*/
- char* e;
+ char * rbrace;
STRLEN numbers_len;
I32 flags = PERL_SCAN_ALLOW_UNDERSCORES
| PERL_SCAN_DISALLOW_PREFIX
@@ -286,27 +286,27 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
(*s)++;
if (send <= *s || **s != '{') {
- *message = "Missing braces on \\o{}";
- return FALSE;
+ *message = "Missing braces on \\o{}";
+ return FALSE;
}
- e = (char *) memchr(*s, '}', send - *s);
- if (!e) {
+ rbrace = (char *) memchr(*s, '}', send - *s);
+ if (!rbrace) {
(*s)++; /* Move past the '{' */
while (isOCTAL(**s)) { /* Position beyond the legal digits */
(*s)++;
}
*message = "Missing right brace on \\o{}";
- return FALSE;
+ return FALSE;
}
(*s)++; /* Point to expected first digit (could be first byte of utf8
sequence if not a digit) */
- numbers_len = e - *s;
+ numbers_len = rbrace - *s;
if (numbers_len == 0) {
(*s)++; /* Move past the '}' */
- *message = "Empty \\o{}";
- return FALSE;
+ *message = "Empty \\o{}";
+ return FALSE;
}
*uv = grok_oct(*s, &numbers_len, &flags, NULL);
@@ -314,13 +314,13 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
|| (! allow_UV_MAX && *uv == UV_MAX)))
{
*message = form_cp_too_large_msg(8, *s, numbers_len, 0);
- *s = e + 1;
+ *s = rbrace + 1;
return FALSE;
}
/* Note that if has non-octal, will ignore everything starting with that up
* to the '}' */
- if (numbers_len != (STRLEN) (e - *s)) {
+ if (numbers_len != (STRLEN) (rbrace - *s)) {
*s += numbers_len;
if (strict) {
*s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
@@ -342,7 +342,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv,
}
/* Return past the '}' */
- *s = e + 1;
+ *s = rbrace + 1;
return TRUE;
}
@@ -390,7 +390,7 @@ Perl_grok_bslash_x(pTHX_ char ** s, const char * const send, UV *uv,
* UV_MAX, which is normally illegal, reserved for internal use.
* UTF is true iff the string *s is encoded in UTF-8.
*/
- char* e;
+ char * rbrace;
STRLEN numbers_len;
I32 flags = PERL_SCAN_DISALLOW_PREFIX
| PERL_SCAN_SILENT_ILLDIGIT
@@ -423,8 +423,8 @@ Perl_grok_bslash_x(pTHX_ char ** s, const char * const send, UV *uv,
if (**s != '{') {
numbers_len = (strict) ? 3 : 2;
- *uv = grok_hex(*s, &numbers_len, &flags, NULL);
- *s += numbers_len;
+ *uv = grok_hex(*s, &numbers_len, &flags, NULL);
+ *s += numbers_len;
if (numbers_len != 2 && (strict || (flags & PERL_SCAN_NOTIFY_ILLDIGIT))) {
if (numbers_len == 3) { /* numbers_len 3 only happens with strict */
@@ -449,29 +449,29 @@ Perl_grok_bslash_x(pTHX_ char ** s, const char * const send, UV *uv,
}
}
}
- return TRUE;
+ return TRUE;
}
- e = (char *) memchr(*s, '}', send - *s);
- if (!e) {
+ rbrace = (char *) memchr(*s, '}', send - *s);
+ if (!rbrace) {
(*s)++; /* Move past the '{' */
while (*s < send && isXDIGIT(**s)) { /* Position beyond legal digits */
(*s)++;
}
- *message = "Missing right brace on \\x{}";
- return FALSE;
+ *message = "Missing right brace on \\x{}";
+ return FALSE;
}
(*s)++; /* Point to expected first digit (could be first byte of utf8
sequence if not a digit) */
- numbers_len = e - *s;
+ numbers_len = rbrace - *s;
if (numbers_len == 0) {
if (strict) {
(*s)++; /* Move past the } */
*message = "Empty \\x{}";
return FALSE;
}
- *s = e + 1;
+ *s = rbrace + 1;
*uv = 0;
return TRUE;
}
@@ -483,11 +483,11 @@ Perl_grok_bslash_x(pTHX_ char ** s, const char * const send, UV *uv,
|| (! allow_UV_MAX && *uv == UV_MAX)))
{
*message = form_cp_too_large_msg(16, *s, numbers_len, 0);
- *s = e + 1;
+ *s = rbrace + 1;
return FALSE;
}
- if (numbers_len != (STRLEN) (e - *s)) {
+ if (numbers_len != (STRLEN) (rbrace - *s)) {
*s += numbers_len;
if (strict) {
*s += (UTF) ? UTF8_SAFE_SKIP(*s, send) : 1;
@@ -509,7 +509,7 @@ Perl_grok_bslash_x(pTHX_ char ** s, const char * const send, UV *uv,
}
/* Return past the '}' */
- *s = e + 1;
+ *s = rbrace + 1;
return TRUE;
}