sas Thu Aug 28 11:54:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard exec.c
Log:
fix format strings
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.84.2.11 php-src/ext/standard/exec.c:1.84.2.12
--- php-src/ext/standard/exec.c:1.84.2.11 Thu Aug 7 11:50:18 2003
+++ php-src/ext/standard/exec.c Thu Aug 28 11:54:35 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.84.2.11 2003/08/07 15:50:18 zeev Exp $ */
+/* $Id: exec.c,v 1.84.2.12 2003/08/28 15:54:35 sas Exp $ */
#include <stdio.h>
#include "php.h"
@@ -752,13 +752,13 @@
#ifdef PHP_WIN32
descriptors[ndesc].childend = dup_fd_as_handle(fd);
if (descriptors[ndesc].childend == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
dup File-Handle for descriptor %d", nindex);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
dup File-Handle for descriptor %lu", nindex);
goto exit_fail;
}
#else
descriptors[ndesc].childend = dup(fd);
if (descriptors[ndesc].childend < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
dup File-Handle for descriptor %d - %s", nindex, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
dup File-Handle for descriptor %lu - %s", nindex, strerror(errno));
goto exit_fail;
}
#endif
@@ -783,7 +783,7 @@
if (zend_hash_index_find(Z_ARRVAL_PP(descitem), 1,
(void **)&zmode) == SUCCESS) {
convert_to_string_ex(zmode);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing mode parameter for 'pipe'", Z_STRVAL_PP(ztype));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing mode parameter for 'pipe'");
goto exit_fail;
}
@@ -825,14 +825,14 @@
if (zend_hash_index_find(Z_ARRVAL_PP(descitem), 1,
(void **)&zfile) == SUCCESS) {
convert_to_string_ex(zfile);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing file name parameter for 'file'", Z_STRVAL_PP(ztype));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing file name parameter for 'file'");
goto exit_fail;
}
if (zend_hash_index_find(Z_ARRVAL_PP(descitem), 2,
(void **)&zmode) == SUCCESS) {
convert_to_string_ex(zmode);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing mode parameter for 'file'", Z_STRVAL_PP(ztype));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Missing mode parameter for 'file'");
goto exit_fail;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php