fmk Thu Jul 3 12:48:18 2003 EDT
Modified files:
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
Change fetch functions and protos so they make more sense.
fetch_row or fetch_assoc should not take the optional parameter
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.98 php-src/ext/fbsql/php_fbsql.c:1.99
--- php-src/ext/fbsql/php_fbsql.c:1.98 Sun Jun 15 11:27:13 2003
+++ php-src/ext/fbsql/php_fbsql.c Thu Jul 3 12:48:18 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.98 2003/06/15 15:27:13 andrey Exp $ */
+/* $Id: php_fbsql.c,v 1.99 2003/07/03 16:48:18 fmk Exp $ */
/* TODO:
*
@@ -358,14 +358,14 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN ("fbsql.allow_persistent", "1",
PHP_INI_SYSTEM, OnUpdateLong, allowPersistent, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0",
PHP_INI_SYSTEM, OnUpdateLong, generateWarnings, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN ("fbsql.autocommit",
"1", PHP_INI_SYSTEM, OnUpdateLong, autoCommit,
zend_fbsql_globals, fbsql_globals)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateLong, maxPersistent, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_links",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_connections", "128",
PHP_INI_SYSTEM, OnUpdateLong, maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_results",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxResults,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.batchSize",
"1000", PHP_INI_SYSTEM, OnUpdateLong, batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN ("fbsql.allow_persistent", "1",
PHP_INI_SYSTEM, OnUpdateBool, allowPersistent, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0",
PHP_INI_SYSTEM, OnUpdateBool, generateWarnings, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN ("fbsql.autocommit",
"1", PHP_INI_SYSTEM, OnUpdateBool, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateLong, maxPersistent, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_links",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxLinks, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_connections", "128",
PHP_INI_SYSTEM, OnUpdateLong, maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_results",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxResults, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.batchSize",
"1000", PHP_INI_SYSTEM, OnUpdateLong, batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY ("fbsql.default_host",
NULL, PHP_INI_SYSTEM, OnUpdateString, hostName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY ("fbsql.default_user",
"_SYSTEM", PHP_INI_SYSTEM, OnUpdateString, userName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY ("fbsql.default_password", "",
PHP_INI_SYSTEM, OnUpdateString, userPassword, zend_fbsql_globals,
fbsql_globals)
@@ -2706,7 +2706,7 @@
Fetch a row of data. Returns an indexed array */
PHP_FUNCTION(fbsql_fetch_row)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_NUM);
+ php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_NUM, 1);
}
/* }}} */
@@ -2714,7 +2714,7 @@
Detch a row of data. Returns an assoc array */
PHP_FUNCTION(fbsql_fetch_assoc)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);
+ php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC, 1);
}
/* }}} */
@@ -2722,7 +2722,7 @@
Fetch a row of data. Returns an object */
PHP_FUNCTION(fbsql_fetch_object)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);
+ php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC, 2);
if (Z_TYPE_P(return_value)==IS_ARRAY) {
object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR,
Z_ARRVAL_P(return_value));
}
@@ -2733,7 +2733,7 @@
Fetches a result row as an array (associative, numeric or both)*/
PHP_FUNCTION(fbsql_fetch_array)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_BOTH);
+ php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_BOTH, 2);
}
/* }}} */
@@ -2781,7 +2781,7 @@
}
}
-static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
+static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int
expected_args)
{
PHPFBResult* result = NULL;
@@ -2789,6 +2789,10 @@
int rowIndex;
int i;
void **row;
+
+ if (ZEND_NUM_ARGS() > expected_args) {
+ WRONG_PARAM_COUNT;
+ }
switch (ZEND_NUM_ARGS()) {
case 1:
Index: php-src/ext/fbsql/php_fbsql.h
diff -u php-src/ext/fbsql/php_fbsql.h:1.25 php-src/ext/fbsql/php_fbsql.h:1.26
--- php-src/ext/fbsql/php_fbsql.h:1.25 Fri Jun 13 23:33:56 2003
+++ php-src/ext/fbsql/php_fbsql.h Thu Jul 3 12:48:18 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.h,v 1.25 2003/06/14 03:33:56 fmk Exp $ */
+/* $Id: php_fbsql.h,v 1.26 2003/07/03 16:48:18 fmk Exp $ */
#define HAVE_FBSQL 1
@@ -101,7 +101,7 @@
PHP_FUNCTION(fbsql_get_autostart_info);
/* PHP_FUNCTION(fbsql_set_autostart_info); */
-static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type);
+static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int
expected_args);
static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
ZEND_BEGIN_MODULE_GLOBALS(fbsql)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
