diff options
Diffstat (limited to 'ext/standard/pack.c')
| -rw-r--r-- | ext/standard/pack.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 0523253ee4..60e8648713 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -161,7 +161,7 @@ PHP_FUNCTION(pack) /* Never uses any args */ case 'x': case 'X': case '@': { if (arg < 0) { - php3_error(E_WARNING, "pack type %c: '*' ignored", code); + php_error(E_WARNING, "pack type %c: '*' ignored", code); arg = 1; } break; @@ -173,7 +173,7 @@ PHP_FUNCTION(pack) efree(argv); efree(formatcodes); efree(formatargs); - php3_error(E_ERROR, "pack type %c: not enough arguments", code); + php_error(E_ERROR, "pack type %c: not enough arguments", code); RETURN_FALSE; } @@ -199,14 +199,14 @@ PHP_FUNCTION(pack) efree(argv); efree(formatcodes); efree(formatargs); - php3_error(E_ERROR, "pack type %c: too few arguments", code); + php_error(E_ERROR, "pack type %c: too few arguments", code); RETURN_FALSE; } break; } default: { - php3_error(E_ERROR, "pack type %c: unknown format code", code); + php_error(E_ERROR, "pack type %c: unknown format code", code); RETURN_FALSE; } } @@ -216,7 +216,7 @@ PHP_FUNCTION(pack) } if (currentarg < argc) { - php3_error(E_WARNING, "pack %d arguments unused", (argc - currentarg)); + php_error(E_WARNING, "pack %d arguments unused", (argc - currentarg)); } /* Calculate output length and upper bound while processing*/ @@ -266,7 +266,7 @@ PHP_FUNCTION(pack) outputpos -= arg; if (outputpos < 0) { - php3_error(E_WARNING, "pack type %c: outside of string", code); + php_error(E_WARNING, "pack type %c: outside of string", code); outputpos = 0; } break; @@ -324,7 +324,7 @@ PHP_FUNCTION(pack) } else if ((n >= 'a') && (n <= 'f')) { n -= ('a' - 10); } else { - php3_error(E_WARNING, "pack type %c: illegal hex digit %c", code, n); + php_error(E_WARNING, "pack type %c: illegal hex digit %c", code, n); n = 0; } @@ -759,7 +759,7 @@ PHP_FUNCTION(unpack) i = arg - 1; /* Break out of for loop */ if (arg >= 0) { - php3_error(E_WARNING, "pack type %c: outside of string", type); + php_error(E_WARNING, "pack type %c: outside of string", type); } } break; @@ -769,7 +769,7 @@ PHP_FUNCTION(unpack) if (arg <= inputlen) { inputpos = arg; } else { - php3_error(E_WARNING, "pack type %c: outside of string", type); + php_error(E_WARNING, "pack type %c: outside of string", type); } i = arg - 1; /* Done, break out of for loop */ @@ -782,7 +782,7 @@ PHP_FUNCTION(unpack) /* Reached end of input for '*' repeater */ break; } else { - php3_error(E_ERROR, "pack type %c: not enough input, need %d, have %d", type, size, inputlen - inputpos); + php_error(E_ERROR, "pack type %c: not enough input, need %d, have %d", type, size, inputlen - inputpos); RETURN_FALSE; } } |