summaryrefslogtreecommitdiff
path: root/ext/standard/scanf.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2003-08-28 16:49:57 +0000
committerSascha Schumann <sas@php.net>2003-08-28 16:49:57 +0000
commit436a07176cd99736fb907f7ed94213a8fc0fa5bb (patch)
treeef7f75f0f0438bc59892e736263a287d8c7a2ec9 /ext/standard/scanf.c
parent341b7b5df1140a31198aa18200c039eecf8d4e11 (diff)
downloadphp-git-436a07176cd99736fb907f7ed94213a8fc0fa5bb.tar.gz
fix format strings
Diffstat (limited to 'ext/standard/scanf.c')
-rw-r--r--ext/standard/scanf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index 832272134e..ae3646da2a 100644
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -408,7 +408,7 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs)
gotSequential = 1;
if (gotXpg) {
mixedXPG:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot mix \"%\" and \"%n$\" conversion specifiers");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", "cannot mix \"%\" and \"%n$\" conversion specifiers");
goto error;
}
@@ -495,7 +495,7 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs)
goto error;
default:
{
- php_error_docref(NULL TSRMLS_CC, 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,7 +545,7 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs)
}
for (i = 0; i < numVars; i++) {
if (nassign[i] > 1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Variable is assigned by multiple \"%n$\" conversion specifiers");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", "Variable is assigned by multiple \"%n$\" conversion specifiers");
goto error;
} else if (!xpgSize && (nassign[i] == 0)) {
/*
@@ -564,7 +564,7 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs)
badIndex:
if (gotXpg) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "\"%n$\" argument index out of range");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", "\"%n$\" argument index out of range");
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Different numbers of variable names and field specifiers");
}