[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-05-14 Thread Felipe Pena 
felipe  Thu May 14 17:24:42 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - MFH: Improved fix for #42414
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.20r2=1.189.2.4.2.7.2.21diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.20 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.21
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.20  Thu May 14 01:26:39 2009
+++ php-src/ext/odbc/php_odbc.c Thu May 14 17:24:42 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.20 2009/05/14 01:26:39 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.21 2009/05/14 17:24:42 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3031,7 +3031,7 @@
int cat_len = 0, schema_len = 0, table_len = 0, type_len = 0;
RETCODE rc;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|, 
pv_conn, cat, cat_len, schema, schema_len, 
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|s!sss, 
pv_conn, cat, cat_len, schema, schema_len, 
table, table_len, type, type_len) == FAILURE) {
return;
}
@@ -3098,7 +3098,7 @@
int cat_len = 0, schema_len = 0, table_len = 0, column_len = 0;
RETCODE rc;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|, 
pv_conn, cat, cat_len, schema, schema_len,
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|s!sss, 
pv_conn, cat, cat_len, schema, schema_len,
table, table_len, column, column_len) == FAILURE) {
return;
}
@@ -3127,10 +3127,6 @@
schema = NULL;
}
 
-   if (cat  cat_len == 0) {
-   cat = NULL;
-   }
-
rc = SQLColumns(result-stmt, 
cat, (SQLSMALLINT) cat_len,
schema, (SQLSMALLINT) schema_len,
@@ -3168,11 +3164,11 @@
zval *pv_conn;
odbc_result *result = NULL;
odbc_connection *conn;
-   char *cat, *schema, *table, *column;
-   int cat_len, schema_len, table_len, column_len;
+   char *cat = NULL, *schema, *table, *column;
+   int cat_len = 0, schema_len, table_len, column_len;
RETCODE rc;

-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, pv_conn, 
cat, cat_len, schema, schema_len,
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs!sss, 
pv_conn, cat, cat_len, schema, schema_len,
table, table_len, column, column_len) == FAILURE) {
return;
}
@@ -3193,10 +3189,6 @@
efree(result);
RETURN_FALSE;
}
-   
-   if (cat_len == 0) {
-   cat = NULL;
-   }
 
rc = SQLColumnPrivileges(result-stmt, 
cat, SAFE_SQL_NTS(cat),
@@ -3236,11 +3228,11 @@
zval *pv_conn;
odbc_result *result = NULL;
odbc_connection *conn;
-   char *pcat, *pschema, *ptable, *fcat, *fschema, *ftable;
-   int pcat_len, pschema_len, ptable_len, fcat_len, fschema_len, 
ftable_len;
+   char *pcat = NULL, *pschema, *ptable, *fcat, *fschema, *ftable;
+   int pcat_len = 0, pschema_len, ptable_len, fcat_len, fschema_len, 
ftable_len;
RETCODE rc;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rss, 
pv_conn, pcat, pcat_len, pschema, pschema_len, 
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs!s, 
pv_conn, pcat, pcat_len, pschema, pschema_len, 
ptable, ptable_len, fcat, fcat_len, fschema, fschema_len, 
ftable, ftable_len) == FAILURE) {
return;
}
@@ -3273,10 +3265,6 @@
efree(result);
RETURN_FALSE;
}
-   
-   if (pcat_len == 0) {
-   pcat = NULL;
-   }
 
rc = SQLForeignKeys(result-stmt, 
pcat, SAFE_SQL_NTS(pcat), 
@@ -3377,10 +3365,10 @@
odbc_result   *result = NULL;
odbc_connection *conn;
char *cat = NULL, *schema = NULL, *table = NULL;
-   int cat_len, schema_len, table_len;
+   int cat_len = 0, schema_len, table_len;
RETCODE rc;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsss, pv_conn, 
cat, cat_len, schema, schema_len, table, table_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs!ss, pv_conn, 
cat, cat_len, schema, schema_len, table, table_len) == FAILURE) {
return;
}
 
@@ -3400,10 +3388,6 @@
efree(result);
RETURN_FALSE;
}
-   
-   if (cat_len == 0) {
-   cat = NULL;
-   }
 
rc = SQLPrimaryKeys(result-stmt, 
cat, SAFE_SQL_NTS(cat), 
@@ -3449,7 +3433,7 @@
WRONG_PARAM_COUNT;
}
 
-

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-05-13 Thread Felipe Pena 
felipe  Thu May 14 01:26:39 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFH:
  - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
driver)
patch by: jhml at gmx dot net
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.19r2=1.189.2.4.2.7.2.20diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.19 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.20
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.19  Fri May  1 03:02:46 2009
+++ php-src/ext/odbc/php_odbc.c Thu May 14 01:26:39 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.19 2009/05/01 03:02:46 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.20 2009/05/14 01:26:39 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3127,6 +3127,10 @@
schema = NULL;
}
 
+   if (cat  cat_len == 0) {
+   cat = NULL;
+   }
+
rc = SQLColumns(result-stmt, 
cat, (SQLSMALLINT) cat_len,
schema, (SQLSMALLINT) schema_len,
@@ -3189,6 +3193,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLColumnPrivileges(result-stmt, 
cat, SAFE_SQL_NTS(cat),
@@ -3265,6 +3273,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (pcat_len == 0) {
+   pcat = NULL;
+   }
 
rc = SQLForeignKeys(result-stmt, 
pcat, SAFE_SQL_NTS(pcat), 
@@ -3388,6 +3400,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLPrimaryKeys(result-stmt, 
cat, SAFE_SQL_NTS(cat), 
@@ -3589,6 +3605,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLSpecialColumns(result-stmt, 
type,
@@ -3658,6 +3678,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLStatistics(result-stmt, 
cat, SAFE_SQL_NTS(cat),
@@ -3721,6 +3745,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLTablePrivileges(result-stmt, 
cat, SAFE_SQL_NTS(cat), 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-04-30 Thread Felipe Pena 
felipe  Fri May  1 03:02:47 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - MFH: Fixed bug #48038 (odbc_execute changes variables used to form params 
array)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.18r2=1.189.2.4.2.7.2.19diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.18 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.19
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.18  Mon Mar 30 14:25:54 2009
+++ php-src/ext/odbc/php_odbc.c Fri May  1 03:02:46 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.18 2009/03/30 14:25:54 kalle Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.19 2009/05/01 03:02:46 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1274,7 +1274,7 @@
}
 
otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING,Error converting parameter);
SQLFreeStmt(result-stmt, SQL_RESET_PARAMS);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-30 Thread Kalle Sommer Nielsen 
kalle   Mon Mar 30 14:25:54 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  Nuke unused variable (only in this branch)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.17r2=1.189.2.4.2.7.2.18diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.17 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.18
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.17  Tue Mar 24 09:44:16 2009
+++ php-src/ext/odbc/php_odbc.c Mon Mar 30 14:25:54 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.17 2009/03/24 09:44:16 pajoye Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.18 2009/03/30 14:25:54 kalle Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3367,7 +3367,6 @@
char *cat = NULL, *schema = NULL, *table = NULL;
int cat_len, schema_len, table_len;
RETCODE rc;
-   int argc;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsss, pv_conn, 
cat, cat_len, schema, schema_len, table, table_len) == FAILURE) {
return;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-24 Thread Pierre-Alain Joye 
pajoye  Tue Mar 24 09:24:35 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.15r2=1.189.2.4.2.7.2.16diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.15 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.16
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.15  Mon Mar 23 22:30:56 2009
+++ php-src/ext/odbc/php_odbc.c Tue Mar 24 09:24:35 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.15 2009/03/23 22:30:56 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.16 2009/03/24 09:24:35 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1631,7 +1631,7 @@
SQLUSMALLINT RowStatus[1];
SQLLEN rownum;
zval *pv_res, *tmp;
-   long pv_row - 1;
+   long pv_row = 1;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, pv_res, 
pv_row) == FAILURE) {
return;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-24 Thread Pierre-Alain Joye 
pajoye  Tue Mar 24 09:44:16 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - fix logic after my build fix, thx to Hannes for the head up!
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.16r2=1.189.2.4.2.7.2.17diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.16 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.17
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.16  Tue Mar 24 09:24:35 2009
+++ php-src/ext/odbc/php_odbc.c Tue Mar 24 09:44:16 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.16 2009/03/24 09:24:35 pajoye Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.17 2009/03/24 09:44:16 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1631,7 +1631,7 @@
SQLUSMALLINT RowStatus[1];
SQLLEN rownum;
zval *pv_res, *tmp;
-   long pv_row = 1;
+   long pv_row = -1;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, pv_res, 
pv_row) == FAILURE) {
return;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-24 Thread Ilia Alshanetsky 

Bah silly typo, looks like pierre already fixed it.


Ilia Alshanetsky




On 23-Mar-09, at 9:04 PM, Matt Wilmas wrote:


Hi Ilia,

- Original Message -
From: Ilia Alshanetsky
Sent: Monday, March 23, 2009


iliaa Mon Mar 23 22:30:56 2009 UTC

Modified files:  (Branch: PHP_5_3)
  /php-src/ext/odbc php_odbc.c
Log:

Improved parameter handling

http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.14r2=1.189.2.4.2.7.2.15diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14 php-src/ext/ 
odbc/php_odbc.c:1.189.2.4.2.7.2.15
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14 Tue Feb 17  
12:38:21 2009

+++ php-src/ext/odbc/php_odbc.c Mon Mar 23 22:30:56 2009
@@ -20,7 +20,7 @@
+ 
--+

*/

-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.14 2009/02/17 12:38:21 felipe  
Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.15 2009/03/23 22:30:56 iliaa  
Exp $ */


#ifdef HAVE_CONFIG_H
#include config.h
@@ -1629,17 +1629,15 @@
#ifdef HAVE_SQL_EXTENDED_FETCH
SQLULEN crow;
SQLUSMALLINT RowStatus[1];
- SQLLEN rownum = -1;
+ SQLLEN rownum;
zval *pv_res, *tmp;
- long pv_row;
+ long pv_row - 1;


That last line doesn't look right. :-)

- Matt

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-23 Thread Ilia Alshanetsky 
iliaa   Mon Mar 23 22:30:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  
  Improved parameter handling
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.14r2=1.189.2.4.2.7.2.15diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.15
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14  Tue Feb 17 12:38:21 2009
+++ php-src/ext/odbc/php_odbc.c Mon Mar 23 22:30:56 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.14 2009/02/17 12:38:21 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.15 2009/03/23 22:30:56 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1629,17 +1629,15 @@
 #ifdef HAVE_SQL_EXTENDED_FETCH
SQLULEN crow;
SQLUSMALLINT RowStatus[1];
-   SQLLEN rownum = -1;
+   SQLLEN rownum;
zval *pv_res, *tmp;
-   long pv_row;
+   long pv_row - 1;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, pv_res, 
pv_row) == FAILURE) {
return;
}

-   if (ZEND_NUM_ARGS()  1) {
-   rownum = pv_row;
-   }
+   rownum = pv_row;
 #else
zval *pv_res, *tmp;
 
@@ -1928,11 +1926,11 @@
Fetch a row */
 PHP_FUNCTION(odbc_fetch_row)
 {
-   SQLLEN rownum = 1;
+   SQLLEN rownum;
odbc_result *result;
RETCODE rc;
zval *pv_res;
-   long pv_row;
+   long pv_row = 1;
 #ifdef HAVE_SQL_EXTENDED_FETCH
SQLULEN crow;
SQLUSMALLINT RowStatus[1];
@@ -1942,9 +1940,7 @@
return;
}

-   if (ZEND_NUM_ARGS()  1){
-   rownum = pv_row;
-   }
+   rownum = pv_row;

ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, ODBC result, 
le_result);

@@ -3307,19 +3303,17 @@
 PHP_FUNCTION(odbc_gettypeinfo)
 {
zval *pv_conn;
-   long pv_data_type;
+   long pv_data_type = SQL_ALL_TYPES;
odbc_result *result = NULL;
odbc_connection *conn;
RETCODE rc;
-   SQLSMALLINT data_type = SQL_ALL_TYPES;
+   SQLSMALLINT data_type;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, pv_conn, 
pv_data_type) == FAILURE) {
return;
}

-   if (ZEND_NUM_ARGS()  1) {
-   data_type = (SQLSMALLINT) pv_data_type;
-   }
+   data_type = (SQLSMALLINT) pv_data_type;
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, 
ODBC-Link, le_conn, le_pconn);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-03-23 Thread Matt Wilmas 

Hi Ilia,

- Original Message -
From: Ilia Alshanetsky
Sent: Monday, March 23, 2009


iliaa Mon Mar 23 22:30:56 2009 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/odbc php_odbc.c
 Log:

 Improved parameter handling

http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.14r2=1.189.2.4.2.7.2.15diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.15
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.14 Tue Feb 17 12:38:21 
2009

+++ php-src/ext/odbc/php_odbc.c Mon Mar 23 22:30:56 2009
@@ -20,7 +20,7 @@

+--+
*/

-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.14 2009/02/17 12:38:21 felipe Exp $ 
*/
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.15 2009/03/23 22:30:56 iliaa Exp $ 
*/


#ifdef HAVE_CONFIG_H
#include config.h
@@ -1629,17 +1629,15 @@
#ifdef HAVE_SQL_EXTENDED_FETCH
 SQLULEN crow;
 SQLUSMALLINT RowStatus[1];
- SQLLEN rownum = -1;
+ SQLLEN rownum;
 zval *pv_res, *tmp;
- long pv_row;
+ long pv_row - 1;


That last line doesn't look right. :-)

- Matt 



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2009-02-17 Thread Felipe Pena 
felipe  Tue Feb 17 12:03:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - MFH: Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.12r2=1.189.2.4.2.7.2.13diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.12 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.13
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.12  Wed Dec 31 11:15:40 2008
+++ php-src/ext/odbc/php_odbc.c Tue Feb 17 12:03:55 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.12 2008/12/31 11:15:40 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.13 2009/02/17 12:03:55 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -121,7 +121,7 @@
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
ZEND_ARG_INFO(0, result_id)
-   ZEND_ARG_INFO(0, result_array)
+   ZEND_ARG_INFO(1, result_array)
ZEND_ARG_INFO(0, rownumber)
 ZEND_END_ARG_INFO()
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc_includes.h

2008-09-10 Thread Patrick van Kleef 

Hi Hannes,



iodbc   Fri Aug 29 19:16:58 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/odbc   php_odbc.c php_odbc_includes.h
 Log:
 - MFH: Added odbc.default_cursortype to control the ODBC cursormodel
   (bug #43668)


It would greatly simplify things for those of us without odbc setup if
you could mention which constant is the default value =)



Apologies, i thought the default was stated in the bug report.

The code defaults to a static cursor.

I will add a comment in CVS about this too.


Patrick

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc_includes.h

2008-09-09 Thread Hannes Magnusson 
On Fri, Aug 29, 2008 at 21:16, Patrick van Kleef [EMAIL PROTECTED] wrote:
 iodbc   Fri Aug 29 19:16:58 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c php_odbc_includes.h
  Log:
  - MFH: Added odbc.default_cursortype to control the ODBC cursormodel
(bug #43668)

It would greatly simplify things for those of us without odbc setup if
you could mention which constant is the default value =)

-Hannes

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc.h php_odbc_includes.h

2008-08-30 Thread Jani Taskinen 

Bug fixes should also go to PHP_5_2 branch. And don't forget to update NEWS.

--Jani


Patrick van Kleef kirjoitti:

iodbc   Fri Aug 29 16:44:29 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc	php_odbc.c php_odbc.h php_odbc_includes.h 
  Log:

  - MFH: Fixed code to use ODBC 3.52 datatypes for 64bit systems (bug #43666)
  
  




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc.h php_odbc_includes.h

2008-08-29 Thread Patrick van Kleef 
iodbc   Fri Aug 29 16:44:29 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c php_odbc.h php_odbc_includes.h 
  Log:
  - MFH: Fixed code to use ODBC 3.52 datatypes for 64bit systems (bug #43666)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.6r2=1.189.2.4.2.7.2.7diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.6 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.7
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.6   Sun Aug 24 20:50:41 2008
+++ php-src/ext/odbc/php_odbc.c Fri Aug 29 16:44:29 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.6 2008/08/24 20:50:41 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.7 2008/08/29 16:44:29 iodbc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -64,7 +64,7 @@
 
 static int le_result, le_conn, le_pconn;
 
-#define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0))
+#define SAFE_SQL_NTS(n) ((SQLSMALLINT) ((n)?(SQL_NTS):0))
 
 /* {{{ arginfo */
 static
@@ -477,7 +477,7 @@
if (res-stmt) {
 #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
SQLTransact(res-conn_ptr-henv, res-conn_ptr-hdbc,
-   (UWORD)SQL_COMMIT);
+   (SQLUSMALLINT) SQL_COMMIT);
 #endif
rc = SQLFreeStmt(res-stmt,SQL_DROP);
/* We don't want the connection to be closed after the 
last statment has been closed
@@ -861,10 +861,10 @@
 /* {{{ odbc_sql_error */
 void odbc_sql_error(ODBC_SQL_ERROR_PARAMS)
 {
-   charstate[6];
-   SDWORD  error;/* Not used */
-   charerrormsg[SQL_MAX_MESSAGE_LENGTH];
-   SWORD   errormsgsize; /* Not used */
+   charstate[6];
+   SQLINTEGER  error;/* Not used */
+   charerrormsg[SQL_MAX_MESSAGE_LENGTH];
+   SQLSMALLINT errormsgsize; /* Not used */
RETCODE rc;
ODBC_SQL_ENV_T henv;
ODBC_SQL_CONN_T conn;
@@ -940,8 +940,8 @@
 {
RETCODE rc;
int i;
-   SWORD   colnamelen; /* Not used */
-   SDWORD  displaysize;
+   SQLSMALLINT colnamelen; /* Not used */
+   SQLLEN  displaysize;
 
result-values = (odbc_result_value *) 
safe_emalloc(sizeof(odbc_result_value), result-numcols, 0);
 
@@ -949,9 +949,9 @@
result-binmode = ODBCG(defaultbinmode);
 
for(i = 0; i  result-numcols; i++) {
-   rc = SQLColAttributes(result-stmt, (UWORD)(i+1), 
SQL_COLUMN_NAME, 
+   rc = SQLColAttributes(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_COLUMN_NAME, 
result-values[i].name, 
sizeof(result-values[i].name), colnamelen, 0);
-   rc = SQLColAttributes(result-stmt, (UWORD)(i+1), 
SQL_COLUMN_TYPE, 
+   rc = SQLColAttributes(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_COLUMN_TYPE, 
NULL, 0, NULL, result-values[i].coltype);

/* Don't bind LONG / BINARY columns, so that fetch behaviour can
@@ -969,17 +969,17 @@
 #ifdef HAVE_ADABAS
case SQL_TIMESTAMP:
result-values[i].value = (char *)emalloc(27);
-   SQLBindCol(result-stmt, (UWORD)(i+1), 
SQL_C_CHAR, result-values[i].value,
+   SQLBindCol(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_C_CHAR, result-values[i].value,
27, 
result-values[i].vallen);
break;
 #endif /* HAVE_ADABAS */
default:
-   rc = SQLColAttributes(result-stmt, 
(UWORD)(i+1), SQL_COLUMN_DISPLAY_SIZE,
+   rc = SQLColAttributes(result-stmt, 
(SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE,
NULL, 
0, NULL, displaysize);
displaysize = displaysize = 
result-longreadlen ? displaysize : 

result-longreadlen;
result-values[i].value = (char 
*)emalloc(displaysize + 1);
-   rc = SQLBindCol(result-stmt, (UWORD)(i+1), 
SQL_C_CHAR, result-values[i].value,
+   rc = SQLBindCol(result-stmt, 
(SQLUSMALLINT)(i+1), SQL_C_CHAR, result-values[i].value,
displaysize + 1, 
result-values[i].vallen);
break;
}
@@ -1001,7 +1001,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, 
ODBC-Link, le_conn, le_pconn);

-   rc = SQLTransact(conn-henv, conn-hdbc,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc_includes.h

2008-08-29 Thread Patrick van Kleef 
iodbc   Fri Aug 29 19:16:58 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c php_odbc_includes.h 
  Log:
  - MFH: Added odbc.default_cursortype to control the ODBC cursormodel 
(bug #43668)
  #[DOC]
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.7r2=1.189.2.4.2.7.2.8diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.7 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.8
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.7   Fri Aug 29 16:44:29 2008
+++ php-src/ext/odbc/php_odbc.c Fri Aug 29 19:16:58 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.7 2008/08/29 16:44:29 iodbc Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.8 2008/08/29 19:16:58 iodbc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -677,6 +677,50 @@
 }
 /* }}} */
 
+
+/* {{{ PHP_INI_DISP(display_cursortype)
+ */
+static PHP_INI_DISP(display_cursortype)
+{
+   char *value;
+   TSRMLS_FETCH();
+
+   if (type == PHP_INI_DISPLAY_ORIG  ini_entry-modified) {
+   value = ini_entry-orig_value;
+   } else if (ini_entry-value) {
+   value = ini_entry-value;
+   } else {
+   value = NULL;
+   }
+
+   if (value) {
+   switch (atoi (value))
+ {
+   case SQL_CURSOR_FORWARD_ONLY:
+   PUTS (Forward Only cursor);
+   break;
+
+   case SQL_CURSOR_STATIC:
+   PUTS (Static cursor);
+   break;
+
+   case SQL_CURSOR_KEYSET_DRIVEN:
+   PUTS (Keyset driven cursor);
+   break;
+
+   case SQL_CURSOR_DYNAMIC:
+   PUTS (Dynamic cursor);
+   break;
+
+   default:
+   php_printf(Unknown cursor model %s, value);
+   break;
+ }
+   }
+}
+
+/* }}} */
+
 /* {{{ PHP_INI_BEGIN 
  */
 PHP_INI_BEGIN()
@@ -698,6 +742,8 @@
defaultbinmode, zend_odbc_globals, odbc_globals, 
display_binmode)
STD_PHP_INI_BOOLEAN(odbc.check_persistent, 1, PHP_INI_SYSTEM, 
OnUpdateLong,
check_persistent, zend_odbc_globals, odbc_globals)
+   STD_PHP_INI_ENTRY_EX(odbc.default_cursortype, 3, PHP_INI_ALL, 
OnUpdateLong, 
+   default_cursortype, zend_odbc_globals, odbc_globals, 
display_cursortype)
 PHP_INI_END()
 /* }}} */
 
@@ -1173,7 +1219,8 @@
/* Try to set CURSOR_TYPE to dynamic. Driver will 
replace this with other
   type if not possible.
*/
-   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
SQL_CURSOR_DYNAMIC) == SQL_ERROR) {
+   int cursortype = ODBCG(default_cursortype);
+   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
cursortype) == SQL_ERROR) {
odbc_sql_error(conn, result-stmt,  
SQLSetStmtOption);
SQLFreeStmt(result-stmt, SQL_DROP);
efree(result);
@@ -1568,7 +1615,8 @@
/* Try to set CURSOR_TYPE to dynamic. Driver will 
replace this with other
   type if not possible.
 */
-   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
SQL_CURSOR_DYNAMIC) == SQL_ERROR) {
+   int cursortype = ODBCG(default_cursortype);
+   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
cursortype) == SQL_ERROR) {
odbc_sql_error(conn, result-stmt,  
SQLSetStmtOption);
SQLFreeStmt(result-stmt, SQL_DROP);
efree(result);
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc_includes.h?r1=1.12.2.1.2.4.2.2r2=1.12.2.1.2.4.2.3diff_format=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.12.2.1.2.4.2.2 
php-src/ext/odbc/php_odbc_includes.h:1.12.2.1.2.4.2.3
--- php-src/ext/odbc/php_odbc_includes.h:1.12.2.1.2.4.2.2   Fri Aug 29 
16:44:29 2008
+++ php-src/ext/odbc/php_odbc_includes.hFri Aug 29 19:16:58 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_odbc_includes.h,v 1.12.2.1.2.4.2.2 2008/08/29 16:44:29 iodbc Exp $ 
*/
+/* $Id: php_odbc_includes.h,v 1.12.2.1.2.4.2.3 2008/08/29 19:16:58 iodbc Exp $ 
*/
 
 #ifndef PHP_ODBC_INCLUDES_H
 #define PHP_ODBC_INCLUDES_H
@@ -265,6 +265,7 @@
int defConn;
 long defaultlrl;
 long defaultbinmode;
+long

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2008-07-05 Thread Felipe Pena 
felipe  Sat Jul  5 22:35:14 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  - Added arginfo
  - Removed #include zend_arg_defs.c
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.4r2=1.189.2.4.2.7.2.5diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.4 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.5
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.4   Mon Mar 10 22:12:35 2008
+++ php-src/ext/odbc/php_odbc.c Sat Jul  5 22:35:14 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.4 2008/03/10 22:12:35 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.5 2008/07/05 22:35:14 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -66,66 +66,366 @@
 
 #define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0))
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_odbc_close_all, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_binmode, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_longreadlen, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_execute, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, parameters_array)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_cursor, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#ifdef HAVE_SQLDATASOURCES
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_data_source, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, query)
+   ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1)
+   ZEND_ARG_INFO(0, result)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_array, 0, 0, 1)
+   ZEND_ARG_INFO(0, result)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, result_array)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_row, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, row_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result_all, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, format)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_free_result, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
+   ZEND_ARG_INFO(0, dsn)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3)
+   ZEND_ARG_INFO(0, dsn)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_rows, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#if !defined(HAVE_SOLID)  !defined(HAVE_SOLID_30)
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_next_result, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_fields, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_name, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_type, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_len, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_scale, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2007-10-10 Thread Andrey Hristov 
andrey  Wed Oct 10 14:29:27 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fix ODBC, the GC patch missed this one leading to compilation failure.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.1r2=1.189.2.4.2.7.2.2diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.1 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.2
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.1   Thu Sep 27 18:00:41 2007
+++ php-src/ext/odbc/php_odbc.c Wed Oct 10 14:29:27 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.1 2007/09/27 18:00:41 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.2 2007/10/10 14:29:27 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1573,8 +1573,7 @@
result-fetched++;
 
for(i = 0; i  result-numcols; i++) {
-   ALLOC_ZVAL(tmp);
-   tmp-refcount = 1;
+   MAKE_STD_ZVAL(tmp);
Z_TYPE_P(tmp) = IS_STRING;
Z_STRLEN_P(tmp) = 0;
sql_c_type = SQL_C_CHAR;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php