From: Wez Furlong <wez@php.net>
Date: Sun, 18 Sep 2005 14:13:08 +0000 (+0000)
Subject: move pdo_drivers -> PDO::getAvailableDrivers as part of namespacing sweep.
X-Git-Tag: php-5.1.0RC2~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e762989e700d4adf72867cc10c99195a4681950;p=php

move pdo_drivers -> PDO::getAvailableDrivers as part of namespacing sweep.
---

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index fd38a56cc5..6cbc92175e 100755
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -62,26 +62,8 @@ PDO_API zend_class_entry *php_pdo_get_exception(void)
 
 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}
 };
 /* }}} */
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index c03de78e2c..dae5691ff6 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -976,6 +976,23 @@ static PHP_METHOD(PDO, __sleep)
 }
 /* }}} */
 
+/* {{{ 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 @@ function_entry pdo_dbh_functions[] = {
 	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}
 };