cvs: php-src(PHP_5_1) /ext/pdo pdo.c pdo_dbh.c

wez Sun Sep 18 10:13:10 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo pdo.c pdo_dbh.c Log: move pdo_drivers -> PDO::getAvailableDrivers as part of namespacing sweep. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.4&r2=1.57.2.5&ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.4 php-src/ext/pdo/pdo.c:1.57.2.5 --- php-src/ext/pdo/pdo.c:1.57.2.4 Sun Sep 11 15:44:26 2005 +++ php-src/ext/pdo/pdo.c Sun Sep 18 10:13:08 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.57.2.4 2005/09/11 19:44:26 wez Exp $ */ +/* $Id: pdo.c,v 1.57.2.5 2005/09/18 14:13:08 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,26 +62,8 @@ zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce; -/* proto array pdo_drivers() - Return array of available PDO drivers */ -PHP_FUNCTION(pdo_drivers) -{ - HashPosition pos; - pdo_driver_t **pdriver; - - array_init(return_value); - - zend_hash_internal_pointer_reset_ex(&pdo_driver_hash, &pos); - while (SUCCESS == zend_hash_get_current_data_ex(&pdo_driver_hash, (void**)&pdriver, &pos)) { - add_next_index_stringl(return_value, (char*)(*pdriver)->driver_name, (*pdriver)->driver_name_len, 1); - zend_hash_move_forward_ex(&pdo_driver_hash, &pos); - } -} -/* }}} */ - /* {{{ pdo_functions[] */ function_entry pdo_functions[] = { - PHP_FE(pdo_drivers, NULL) {NULL, NULL, NULL} }; /* }}} */ http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.1&r2=1.82.2.2&ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.1 php-src/ext/pdo/pdo_dbh.c:1.82.2.2 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.1 Sat Sep 10 13:48:43 2005 +++ php-src/ext/pdo/pdo_dbh.c Sun Sep 18 10:13:08 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.82.2.1 2005/09/10 17:48:43 wez Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.2 2005/09/18 14:13:08 wez Exp $ */ /* The PDO Database Handle Class */ @@ -976,6 +976,23 @@ } /* }}} */ +/* {{{ proto array pdo_drivers() + Return array of available PDO drivers */ +static PHP_METHOD(PDO, getAvailableDrivers) +{ + HashPosition pos; + pdo_driver_t **pdriver; + + array_init(return_value); + + zend_hash_internal_pointer_reset_ex(&pdo_driver_hash, &pos); + while (SUCCESS == zend_hash_get_current_data_ex(&pdo_driver_hash, (void**)&pdriver, &pos)) { + add_next_index_stringl(return_value, (char*)(*pdriver)->driver_name, (*pdriver)->driver_name_len, 1); + zend_hash_move_forward_ex(&pdo_driver_hash, &pos); + } +} +/* }}} */ + function_entry pdo_dbh_functions[] = { PHP_ME_MAPPING(__construct, dbh_constructor, NULL) @@ -993,6 +1010,7 @@ 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) {NULL, NULL, NULL} };