felipe          Sat Jan  3 22:07:22 2009 UTC

  Modified files:              
    /php-src/ext/sqlite3        sqlite3.c 
  Log:
  - Removed unnecessary repeated arginfos
  - Changed sqlite3stmt and sqlite3result to ZEND_ACC_PRIVATE to avoid 
reflection instantiation
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.25 php-src/ext/sqlite3/sqlite3.c:1.26
--- php-src/ext/sqlite3/sqlite3.c:1.25  Wed Dec 31 11:12:36 2008
+++ php-src/ext/sqlite3/sqlite3.c       Sat Jan  3 22:07:22 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite3.c,v 1.25 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: sqlite3.c,v 1.26 2009/01/03 22:07:22 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1439,40 +1439,14 @@
        ZEND_ARG_INFO(0, encryption_key)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_close, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_exec, 0)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_version, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lastinsertrowid, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrorcode, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrormsg, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0)
        ZEND_ARG_INFO(0, shared_library)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_changes, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_prepare, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
@@ -1495,21 +1469,6 @@
        ZEND_ARG_INFO(0, argument_count)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_paramcount, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_close, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_reset, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_clear, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_execute, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3stmt_bindparam, 0, 0, 2)
        ZEND_ARG_INFO(0, param_number)
        ZEND_ARG_INFO(1, param)
@@ -1526,9 +1485,6 @@
        ZEND_ARG_INFO(0, sqlite3)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_numcolumns, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columnname, 0, 0, 1)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
@@ -1541,29 +1497,23 @@
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_reset, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_finalize, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_construct, 0)
+ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_void, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ php_sqlite3_class_methods */
 static zend_function_entry php_sqlite3_class_methods[] = {
        PHP_ME(sqlite3,         open,                           
arginfo_sqlite3_open, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         close,                          
arginfo_sqlite3_close, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         exec,                           
arginfo_sqlite3_exec, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         version,                        
arginfo_sqlite3_version, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-       PHP_ME(sqlite3,         lastInsertRowID,        
arginfo_sqlite3_lastinsertrowid, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         lastErrorCode,          
arginfo_sqlite3_lasterrorcode, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         lastErrorMsg,           
arginfo_sqlite3_lasterrormsg, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         close,                          
arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         exec,                           
arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         version,                        
arginfo_sqlite3_void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+       PHP_ME(sqlite3,         lastInsertRowID,        arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         lastErrorCode,          arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         lastErrorMsg,           arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         loadExtension,          
arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3,         changes,                        
arginfo_sqlite3_changes, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         changes,                        
arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         escapeString,           
arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-       PHP_ME(sqlite3,         prepare,                        
arginfo_sqlite3_prepare, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3,         prepare,                        
arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         query,                          
arginfo_sqlite3_query, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         querySingle,            
arginfo_sqlite3_querysingle, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3,         createFunction,         
arginfo_sqlite3_createfunction, ZEND_ACC_PUBLIC)
@@ -1576,27 +1526,27 @@
 
 /* {{{ php_sqlite3_stmt_class_methods */
 static zend_function_entry php_sqlite3_stmt_class_methods[] = {
-       PHP_ME(sqlite3stmt, paramCount,         arginfo_sqlite3stmt_paramcount, 
ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3stmt, close,                      
arginfo_sqlite3stmt_close, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3stmt, reset,                      
arginfo_sqlite3stmt_reset, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3stmt, clear,                      
arginfo_sqlite3stmt_clear, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3stmt, paramCount,         arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3stmt, close,                      arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3stmt, reset,                      arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3stmt, clear,                      arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3stmt, execute,            arginfo_sqlite3stmt_execute, 
ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3stmt, bindParam,          arginfo_sqlite3stmt_bindparam, 
ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3stmt, bindValue,          arginfo_sqlite3stmt_bindvalue, 
ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3stmt, __construct,        arginfo_sqlite3stmt_construct, 
ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(sqlite3stmt, __construct,        arginfo_sqlite3stmt_construct, 
ZEND_ACC_PRIVATE|ZEND_ACC_CTOR)
        {NULL, NULL, NULL}
 };
 /* }}} */
 
 /* {{{ php_sqlite3_result_class_methods */
 static zend_function_entry php_sqlite3_result_class_methods[] = {
-       PHP_ME(sqlite3result, numColumns,               
arginfo_sqlite3result_numcolumns, ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3result, numColumns,               arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3result, columnName,               
arginfo_sqlite3result_columnname, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3result, columnType,               
arginfo_sqlite3result_columntype, ZEND_ACC_PUBLIC)
        PHP_ME(sqlite3result, fetchArray,               
arginfo_sqlite3result_fetcharray, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3result, reset,                    
arginfo_sqlite3result_reset, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3result, finalize,                 
arginfo_sqlite3result_finalize, ZEND_ACC_PUBLIC)
-       PHP_ME(sqlite3result, __construct,              
arginfo_sqlite3result_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(sqlite3result, reset,                    arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3result, finalize,                 arginfo_sqlite3_void, 
ZEND_ACC_PUBLIC)
+       PHP_ME(sqlite3result, __construct,              arginfo_sqlite3_void, 
ZEND_ACC_PRIVATE|ZEND_ACC_CTOR)
        {NULL, NULL, NULL}
 };
 /* }}} */



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

Reply via email to