cvs: php-src /ext/pdo pdo_dbh.c

felipe Fri Feb 13 12:54:20 2009 UTC Modified files: /php-src/ext/pdo pdo_dbh.c Log: - Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.160&r2=1.161&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.160 php-src/ext/pdo/pdo_dbh.c:1.161 --- php-src/ext/pdo/pdo_dbh.c:1.160 Fri Feb 13 02:18:04 2009 +++ php-src/ext/pdo/pdo_dbh.c Fri Feb 13 12:54:20 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.160 2009/02/13 02:18:04 felipe Exp $ */ +/* $Id: pdo_dbh.c,v 1.161 2009/02/13 12:54:20 felipe Exp $ */ /* The PDO Database Handle Class */ @@ -610,6 +610,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (dbh->in_txn) { @@ -640,6 +643,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh->in_txn) { @@ -663,6 +669,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh->in_txn) { @@ -1191,23 +1200,62 @@ } /* }}} */ +/* {{{ arginfo */ +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo___construct, 0, 0, 3) + ZEND_ARG_INFO(0, dsn) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, passwd) + ZEND_ARG_INFO(0, options) /* array */ +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_prepare, 0, 0, 1) + ZEND_ARG_INFO(0, statment) + ZEND_ARG_INFO(0, options) /* array */ +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_setattribute, 0) + ZEND_ARG_INFO(0, attribute) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_getattribute, 0) + ZEND_ARG_INFO(0, attribute) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_exec, 0) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_lastinsertid, 0, 0, 0) + ZEND_ARG_INFO(0, seqname) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_quote, 0, 0, 1) + ZEND_ARG_INFO(0, string) + ZEND_ARG_INFO(0, paramtype) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo__void, 0) +ZEND_END_ARG_INFO() +/* }}} */ + const zend_function_entry pdo_dbh_functions[] = { - ZEND_MALIAS(PDO, __construct, dbh_constructor, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, prepare, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, beginTransaction, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, commit, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, rollBack, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, setAttribute, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, exec, NULL, ZEND_ACC_PUBLIC) + ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_pdo___construct, ZEND_ACC_PUBLIC) + PHP_ME(PDO, prepare, arginfo_pdo_prepare, ZEND_ACC_PUBLIC) + PHP_ME(PDO, beginTransaction, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, commit, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, rollBack, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, setAttribute, arginfo_pdo_setattribute, ZEND_ACC_PUBLIC) + PHP_ME(PDO, exec, arginfo_pdo_exec, ZEND_ACC_PUBLIC) PHP_ME(PDO, query, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, lastInsertId, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorInfo, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, getAttribute, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, quote, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, __sleep, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, getAvailableDrivers, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + PHP_ME(PDO, lastInsertId, arginfo_pdo_lastinsertid, ZEND_ACC_PUBLIC) + PHP_ME(PDO, errorCode, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, errorInfo, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, getAttribute, arginfo_pdo_getattribute, ZEND_ACC_PUBLIC) + PHP_ME(PDO, quote, arginfo_pdo_quote, ZEND_ACC_PUBLIC) + PHP_ME(PDO, __wakeup, arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + PHP_ME(PDO, __sleep, arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + PHP_ME(PDO, getAvailableDrivers, arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) {NULL, NULL, NULL} };