fmk Wed Mar 21 13:53:45 2001 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
Log:
setting right params to zend_get_parameters_ex
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.4 php4/ext/fbsql/php_fbsql.c:1.5
--- php4/ext/fbsql/php_fbsql.c:1.4 Wed Mar 21 11:56:33 2001
+++ php4/ext/fbsql/php_fbsql.c Wed Mar 21 13:53:45 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.4 2001/03/21 19:56:33 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.5 2001/03/21 21:53:45 fmk Exp $ */
/* TODO:
*
@@ -584,7 +584,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 3)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE)
+RETURN_FALSE;
if (argc >= 1)
{
convert_to_string_ex(argv[0]);
@@ -672,7 +672,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
convert_to_long_ex(argv[0]);
@@ -851,7 +851,7 @@
FBSQLLS_FETCH();
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_long_ex(argv[0]);
phpLink = phpfbGetLink((*argv[0])->value.lval);
@@ -887,7 +887,7 @@
link = FB_SQL_G(linkIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
@@ -923,7 +923,7 @@
link = FB_SQL_G(linkIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
@@ -955,7 +955,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
phpfbestrdup(FB_SQL_G(hostName), &return_value->value.str.len,
&return_value->value.str.val);
return_value->type = IS_STRING;
@@ -978,7 +978,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
phpfbestrdup(FB_SQL_G(databaseName), &return_value->value.str.len,
&return_value->value.str.val);
return_value->type = IS_STRING;
@@ -1001,7 +1001,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -1022,7 +1022,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
phpfbestrdup(FB_SQL_G(userName), &return_value->value.str.len,
&return_value->value.str.val);
return_value->type = IS_STRING;
@@ -1045,7 +1045,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
convert_to_string_ex(argv[0]);
@@ -1070,7 +1070,7 @@
name = FB_SQL_G(databaseName);
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -1124,7 +1124,7 @@
databaseName = FB_SQL_G(databaseName);
if ((argc < 2) || (argc > 4)) WRONG_PARAM_COUNT;
- if
(zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2],&argv[3])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2],&argv[3])==FAILURE)
+RETURN_FALSE;
convert_to_string_ex(argv[0]);
userName = (*argv[0])->value.str.val;
@@ -1177,7 +1177,7 @@
hostName = FB_SQL_G(hostName);
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_string_ex(argv[0]);
databaseName = (*argv[0])->value.str.val;
@@ -1247,7 +1247,7 @@
FBSQLLS_FETCH();
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE)
+RETURN_FALSE;
convert_to_string_ex(argv[0]);
databaseName = (*argv[0])->value.str.val;
@@ -1326,7 +1326,7 @@
link = FB_SQL_G(linkIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE)
+RETURN_FALSE;
convert_to_string_ex(argv[0]);
databaseName = (*argv[0])->value.str.val;
@@ -1401,7 +1401,7 @@
hostName = FB_SQL_G(hostName);
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_string_ex(argv[0]);
databaseName = (*argv[0])->value.str.val;
@@ -1623,7 +1623,7 @@
FBSQLLS_FETCH();
if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_string_ex(argv[0]);
sql = (*argv[0])->value.str.val;
@@ -1671,7 +1671,7 @@
FBSQLLS_FETCH();
if ((argc < 2) || (argc > 3)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE)
+RETURN_FALSE;
convert_to_string_ex(argv[0]);
databaseName = (*argv[0])->value.str.val;
@@ -1719,7 +1719,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
convert_to_long_ex(argv[0]);
@@ -1788,7 +1788,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -1848,7 +1848,7 @@
FBSQLLS_FETCH();
if ((argc < 2) || (argc > 3)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -1904,7 +1904,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
convert_to_long_ex(argv[0]);
@@ -1935,7 +1935,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
convert_to_long_ex(argv[0]);
@@ -1964,7 +1964,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
return_value->value.lval = FB_SQL_G(generateWarnings);
return_value->type = IS_LONG;
if (argc >= 1)
@@ -1989,7 +1989,7 @@
link = FB_SQL_G(linkIndex);
if (argc > 1) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
@@ -2015,7 +2015,7 @@
FBSQLLS_FETCH();
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
if (argc == 1)
{
convert_to_long_ex(argv[0]);
@@ -2324,7 +2324,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 3)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1],&argv[2])==FAILURE)
RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1],&argv[2])==FAILURE)
+RETURN_FALSE;
if (argc >= 1)
{
@@ -2392,7 +2392,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
convert_to_long_ex(argv[0]);
result = phpfbGetResult((*argv[0])->value.lval);
@@ -2439,7 +2439,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2474,7 +2474,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2523,7 +2523,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1) {
convert_to_long_ex(argv[0]);
@@ -2587,7 +2587,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2680,7 +2680,7 @@
FBSQLLS_FETCH();
if (argc != 2) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_long_ex(argv[0]);
resultIndex = (*argv[0])->value.lval;
@@ -2718,7 +2718,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2756,7 +2756,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2818,7 +2818,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2866,7 +2866,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2923,7 +2923,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -2971,7 +2971,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -3033,7 +3033,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -3092,7 +3092,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 2)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
if (argc >= 1)
{
@@ -3141,7 +3141,7 @@
resultIndex = FB_SQL_G(resultIndex);
if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(ht,argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
if (argc >= 1) {
convert_to_long_ex(argv[0]);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
