cvs: php4 /ext/fbsql php_fbsql.c
| From: | Frank M. Kromann | Date: | Mon, 30 Jul 2001 17:26:56 +0000 |
| Subject: | cvs: php4 /ext/fbsql php_fbsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6417@lists.php.net to get a copy of this message | ||
fmk Mon Jul 30 13:26:56 2001 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
Log:
Fixing build after implementing the new TSRM structure!
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.40 php4/ext/fbsql/php_fbsql.c:1.41
--- php4/ext/fbsql/php_fbsql.c:1.40 Mon Jul 30 04:24:26 2001
+++ php4/ext/fbsql/php_fbsql.c Mon Jul 30 13:26:55 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.40 2001/07/30 08:24:26 zeev Exp $ */
+/* $Id: php_fbsql.c,v 1.41 2001/07/30 17:26:55 fmk Exp $ */
/* TODO:
*
@@ -316,7 +316,7 @@
zend_list_addref(id);
}
-static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC)
+static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
if (FB_SQL_G(linkIndex)==-1) { /* no link opened yet, implicitly open one */
ht = 0;
@@ -627,7 +627,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -788,7 +788,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -825,7 +825,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -1033,11 +1033,11 @@
switch (ZEND_NUM_ARGS()) {
case 0:
name = FB_SQL_G(databaseName);
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &dbname)==FAILURE) {
RETURN_FALSE;
@@ -1089,14 +1089,14 @@
switch (ZEND_NUM_ARGS()) {
case 2:
name = FB_SQL_G(databaseName);
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &user, &password)==FAILURE) {
RETURN_FALSE;
}
break;
case 3:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(3, &user, &password, &database)==FAILURE) {
RETURN_FALSE;
@@ -1147,7 +1147,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1217,7 +1217,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1288,7 +1288,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1363,7 +1363,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1420,7 +1420,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1583,7 +1583,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &query)==FAILURE) {
RETURN_FALSE;
@@ -1617,7 +1617,7 @@
switch (ZEND_NUM_ARGS()) {
case 2:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &dbname, &query)==FAILURE) {
RETURN_FALSE;
@@ -1646,7 +1646,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_list_dbs([resource link_identifier])
+/* {{{ proto resource fbsql_list_dbs([resource link_identifier])
*/
PHP_FUNCTION(fbsql_list_dbs)
{
@@ -1657,7 +1657,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -1691,7 +1691,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_list_tables(string database, int [link_identifier]);
+/* {{{ proto resource fbsql_list_tables(string database, int [link_identifier]);
*/
PHP_FUNCTION(fbsql_list_tables)
{
@@ -1703,7 +1703,7 @@
switch (ZEND_NUM_ARGS()) {
case 1:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(1, &database_name)==FAILURE) {
RETURN_FALSE;
@@ -1734,7 +1734,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_list_fields(string database_name, string table_name [, resource
link_identifier])
+/* {{{ proto resource fbsql_list_fields(string database_name, string table_name [, resource
link_identifier])
*/
PHP_FUNCTION(fbsql_list_fields)
{
@@ -1746,7 +1746,7 @@
switch (ZEND_NUM_ARGS()) {
case 2:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
if (zend_get_parameters_ex(2, &database_name, &table_name)==FAILURE) {
RETURN_FALSE;
@@ -1789,7 +1789,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -1823,7 +1823,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -1870,7 +1870,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -1899,7 +1899,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1:
@@ -2989,7 +2989,7 @@
switch (ZEND_NUM_ARGS()) {
case 0:
- id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC);
+ id = php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 1: