php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

ext/standard/pack: Inline constant single use variables

Browse Source 
They serve no purpose and are just confusing
This commit is contained in:
Gina Peter Banyard
2025-06-10 13:09:49 +01:00
parent dbabbe180b
commit 2a77e282f8
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/pack.c
+6 -8
View File
@@ -919,7 +919,6 @@ PHP_FUNCTION(unpack)
}
case 'A': {
/* A will strip any trailing whitespace */
char padn = '\0'; char pads = ' '; char padt = '\t'; char padc = '\r'; char padl = '\n';
zend_long len = inputlen - inputpos; /* Remaining string */
/* If size was given take minimum of len and size */
@@ -931,11 +930,11 @@ PHP_FUNCTION(unpack)
/* Remove trailing white space and nulls chars from unpacked data */
while (--len >= 0) {
if (input[inputpos + len] != padn
&& input[inputpos + len] != pads
&& input[inputpos + len] != padt
&& input[inputpos + len] != padc
&& input[inputpos + len] != padl
if (input[inputpos + len] != '\0'
&& input[inputpos + len] != ' '
&& input[inputpos + len] != '\t'
&& input[inputpos + len] != '\r'
&& input[inputpos + len] != '\n'
)
break;
}
@@ -946,7 +945,6 @@ PHP_FUNCTION(unpack)
/* New option added for Z to remain in-line with the Perl implementation */
case 'Z': {
/* Z will strip everything after the first null character */
char pad = '\0';
zend_long s,
len = inputlen - inputpos; /* Remaining string */
@@ -959,7 +957,7 @@ PHP_FUNCTION(unpack)
/* Remove everything after the first null */
for (s=0 ; s < len ; s++) {
if (input[inputpos + s] == pad)
if (input[inputpos + s] == '\0')
break;
}
len = s;