[PHP-CVS] cvs: php-src /ext/spl spl_directory.c

[Marcus Boerger]

helly           Sun Mar  6 20:00:30 2005 EDT

  Modified files:              
    /php-src/ext/spl    spl_directory.c 
  Log:
  - In File::fgetcsv() use max length from object
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.31 
php-src/ext/spl/spl_directory.c:1.32
--- php-src/ext/spl/spl_directory.c:1.31        Sun Mar  6 19:40:57 2005
+++ php-src/ext/spl/spl_directory.c     Sun Mar  6 20:00:29 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_directory.c,v 1.31 2005/03/07 00:40:57 helly Exp $ */
+/* $Id: spl_directory.c,v 1.32 2005/03/07 01:00:29 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1152,7 +1152,7 @@
        /* return NULL */
 } /* }}} */
 
-static int spl_file_object_call(INTERNAL_FUNCTION_PARAMETERS, spl_file_object 
*intern, zend_function *func_ptr) /* {{{ */
+static int spl_file_object_call(INTERNAL_FUNCTION_PARAMETERS, spl_file_object 
*intern, zend_function *func_ptr, zval *arg2) /* {{{ */
 {
        zend_fcall_info fci;
        zend_fcall_info_cache fcic;
@@ -1160,11 +1160,15 @@
        zval * zresource_ptr = &intern->zresource, *retval;
        int result;
 
-       zval ***params = (zval***)safe_emalloc(ZEND_NUM_ARGS(), sizeof(zval**), 
sizeof(zval**));
+       zval ***params = (zval***)safe_emalloc(ZEND_NUM_ARGS(), sizeof(zval**), 
(arg2 ? 2 : 1) * sizeof(zval**));
 
        params[0] = &zresource_ptr;
+       
+       if (arg2) {
+               params[1] = &arg2;
+       }
 
-       zend_get_parameters_array_ex(ZEND_NUM_ARGS(), params+1);
+       zend_get_parameters_array_ex(ZEND_NUM_ARGS(), params+(arg2 ? 2 : 1));
 
        ZVAL_STRING(&z_fname, func_ptr->common.function_name, 0);
 
@@ -1173,7 +1177,7 @@
        fci.object_pp = NULL;
        fci.function_name = &z_fname;
        fci.retval_ptr_ptr = &retval;
-       fci.param_count = ZEND_NUM_ARGS() + 1;
+       fci.param_count = ZEND_NUM_ARGS() + (arg2 ? 2 : 1);
        fci.params = params;
        fci.no_separation = 1;
        fci.symbol_table = NULL;
@@ -1191,20 +1195,33 @@
        return result;
 } /* }}} */
 
+#define FileFunctionCall(func_name, arg2) \
+       zend_function *func_ptr; \
+       zend_hash_find(EG(function_table), #func_name, sizeof(#func_name), 
(void **) &func_ptr); \
+       spl_file_object_call(INTERNAL_FUNCTION_PARAM_PASSTHRU, intern, 
func_ptr, arg2)
+
 /* {{{ FileFunction */
 #define FileFunction(func_name) \
 SPL_METHOD(File, func_name) \
 { \
        spl_file_object *intern = 
(spl_file_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \
-       zend_function *func_ptr; \
-       zend_hash_find(EG(function_table), #func_name, sizeof(#func_name), 
(void **) &func_ptr); \
-       spl_file_object_call(INTERNAL_FUNCTION_PARAM_PASSTHRU, intern, 
func_ptr); \
+       FileFunctionCall(func_name, NULL); \
 }
 /* }}} */
 
-/* {{{ proto array File::fgetcsv([int length [, string delimiter [, string 
enclosure]]])
+/* {{{ proto array File::fgetcsv([string delimiter [, string enclosure]])
    Return current line as csv */
-FileFunction(fgetcsv)
+SPL_METHOD(File, fgetcsv)
+{
+       spl_file_object *intern = 
(spl_file_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+       zval *arg2 = NULL;
+       MAKE_STD_ZVAL(arg2);
+       ZVAL_LONG(arg2, intern->max_line_len);
+
+       FileFunctionCall(fgetcsv, arg2);
+
+       zval_ptr_dtor(&arg2);
+}
 /* }}} */
 
 static
@@ -1227,7 +1244,6 @@
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetcsv, 0, 0, 0) 
-       ZEND_ARG_INFO(0, length)
        ZEND_ARG_INFO(0, delimiter)
        ZEND_ARG_INFO(0, enclosure)
 ZEND_END_ARG_INFO();

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php