diff options
| author | Marcus Boerger <helly@php.net> | 2002-12-05 20:59:49 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-12-05 20:59:49 +0000 |
| commit | 49a99a98f4ce898c891cfa6fa313570de58a40db (patch) | |
| tree | 3bfeac68dd836842177840e3c7b67e8e1235e0dc /ext/standard/scanf.c | |
| parent | 3cf581b1b3dbd992669ae3c8f80f71db576a2a9d (diff) | |
| download | php-git-49a99a98f4ce898c891cfa6fa313570de58a40db.tar.gz | |
-php_error -> php_error_docref
-removed some cases where emalloc result was tested
Diffstat (limited to 'ext/standard/scanf.c')
| -rw-r--r-- | ext/standard/scanf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index 137a16ce14..94aa9a21b0 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -461,7 +461,7 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs) /* problem - cc */ /* if (flags & SCAN_WIDTH) { - php_error(E_WARNING, "field width may not be specified in %c conversion"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field width may not be specified in %c conversion"); goto error; } */ @@ -491,11 +491,11 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs) } break; badSet: - php_error(E_WARNING, "unmatched [ in format string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unmatched [ in format string"); goto error; default: { - php_error(E_WARNING, "bad scan conversion character \"%c\"", ch); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad scan conversion character \"%c\"", ch); goto error; } } @@ -545,14 +545,14 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs) } for (i = 0; i < numVars; i++) { if (nassign[i] > 1) { - php_error(E_WARNING, "variable is assigned by multiple \"%n$\" conversion specifiers"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Variable is assigned by multiple \"%n$\" conversion specifiers"); goto error; } else if (!xpgSize && (nassign[i] == 0)) { /* * If the space is empty, and xpgSize is 0 (means XPG wasn't * used, and/or numVars != 0), then too many vars were given */ - php_error(E_WARNING, "variable is not assigned by any conversion specifiers"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Variable is not assigned by any conversion specifiers"); goto error; } } @@ -564,9 +564,9 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs) badIndex: if (gotXpg) { - php_error(E_WARNING, "\"%n$\" argument index out of range"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "\"%n$\" argument index out of range"); } else { - php_error(E_WARNING, "different numbers of variable names and field specifiers"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Different numbers of variable names and field specifiers"); } error: |