cvs: php4 /ext/ftp php_ftp.c
| From: | Markus Fischer | Date: | Thu, 03 Jan 2002 14:32:37 +0000 |
| Subject: | cvs: php4 /ext/ftp php_ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8920@lists.php.net to get a copy of this message | ||
mfischer Thu Jan 3 09:32:37 2002 EDT
Modified files:
/php4/ext/ftp php_ftp.c
Log:
- Now use ZE's builtin zend_zval_type_name().
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.51 php4/ext/ftp/php_ftp.c:1.52
--- php4/ext/ftp/php_ftp.c:1.51 Thu Jan 3 02:57:58 2002
+++ php4/ext/ftp/php_ftp.c Thu Jan 3 09:32:36 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.51 2002/01/03 07:57:58 mfischer Exp $ */
+/* $Id: php_ftp.c,v 1.52 2002/01/03 14:32:36 mfischer Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -708,40 +708,6 @@
}
/* }}} */
-/* Temporarely copied over from zend_API.c until it gets exposed */
-static char *ze_zval_type_name(zval *arg)
-{
- switch (Z_TYPE_P(arg)) {
- case IS_NULL:
- return "null";
-
- case IS_LONG:
- return "integer";
-
- case IS_DOUBLE:
- return "double";
-
- case IS_STRING:
- return "string";
-
- case IS_ARRAY:
- return "array";
-
- case IS_OBJECT:
- return "object";
-
- case IS_BOOL:
- return "boolean";
-
- case IS_RESOURCE:
- return "resource";
-
- default:
- return "unknown";
- }
-}
-
-
/* {{{ proto bool ftp_set_option(resource stream, int option, mixed value)
Sets an FTP option */
PHP_FUNCTION(ftp_set_option)
@@ -760,7 +726,7 @@
case PHP_FTP_OPT_TIMEOUT_SEC:
if (Z_TYPE_P(z_value) != IS_LONG) {
php_error(E_WARNING, "%s(): option TIMEOUT_SEC expects value of type long, %s given",
- get_active_function_name(TSRMLS_C), ze_zval_type_name(z_value));
+ get_active_function_name(TSRMLS_C), zend_zval_type_name(z_value));
RETURN_FALSE;
}
if (Z_LVAL_P(z_value) <= 0) {