Skip to content

Commit 27eba18

Browse files
NattyNarwhalNattyNarwhal
committed
Just call SQLAllocHandle directly
Again, no need for the version specific wrapper
1 parent 844a4e5 commit 27eba18

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

‎ext/odbc/php_odbc.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ PHP_FUNCTION(odbc_prepare)
903903
result->numparams = 0;
904904
result->param_info = NULL;
905905

906-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
906+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
907907
if (rc == SQL_INVALID_HANDLE) {
908908
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
909909
zval_ptr_dtor(return_value);
@@ -1290,7 +1290,7 @@ PHP_FUNCTION(odbc_exec)
12901290
object_init_ex(return_value, odbc_result_ce);
12911291
result = Z_ODBC_RESULT_P(return_value);
12921292

1293-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
1293+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
12941294
if (rc == SQL_INVALID_HANDLE) {
12951295
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
12961296
zval_ptr_dtor(return_value);
@@ -2812,7 +2812,7 @@ PHP_FUNCTION(odbc_tables)
28122812
object_init_ex(return_value, odbc_result_ce);
28132813
result = Z_ODBC_RESULT_P(return_value);
28142814

2815-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
2815+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
28162816
if (rc == SQL_INVALID_HANDLE) {
28172817
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
28182818
zval_ptr_dtor(return_value);
@@ -2877,7 +2877,7 @@ PHP_FUNCTION(odbc_columns)
28772877
object_init_ex(return_value, odbc_result_ce);
28782878
result = Z_ODBC_RESULT_P(return_value);
28792879

2880-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
2880+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
28812881
if (rc == SQL_INVALID_HANDLE) {
28822882
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
28832883
zval_ptr_dtor(return_value);
@@ -2945,7 +2945,7 @@ PHP_FUNCTION(odbc_columnprivileges)
29452945
object_init_ex(return_value, odbc_result_ce);
29462946
result = Z_ODBC_RESULT_P(return_value);
29472947

2948-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
2948+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
29492949
if (rc == SQL_INVALID_HANDLE) {
29502950
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
29512951
zval_ptr_dtor(return_value);
@@ -3019,7 +3019,7 @@ PHP_FUNCTION(odbc_foreignkeys)
30193019
object_init_ex(return_value, odbc_result_ce);
30203020
result = Z_ODBC_RESULT_P(return_value);
30213021

3022-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3022+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
30233023
if (rc == SQL_INVALID_HANDLE) {
30243024
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
30253025
zval_ptr_dtor(return_value);
@@ -3083,7 +3083,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
30833083
object_init_ex(return_value, odbc_result_ce);
30843084
result = Z_ODBC_RESULT_P(return_value);
30853085

3086-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3086+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
30873087
if (rc == SQL_INVALID_HANDLE) {
30883088
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
30893089
zval_ptr_dtor(return_value);
@@ -3138,7 +3138,7 @@ PHP_FUNCTION(odbc_primarykeys)
31383138
object_init_ex(return_value, odbc_result_ce);
31393139
result = Z_ODBC_RESULT_P(return_value);
31403140

3141-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3141+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
31423142
if (rc == SQL_INVALID_HANDLE) {
31433143
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
31443144
zval_ptr_dtor(return_value);
@@ -3198,7 +3198,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
31983198
object_init_ex(return_value, odbc_result_ce);
31993199
result = Z_ODBC_RESULT_P(return_value);
32003200

3201-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3201+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
32023202
if (rc == SQL_INVALID_HANDLE) {
32033203
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
32043204
zval_ptr_dtor(return_value);
@@ -3259,7 +3259,7 @@ PHP_FUNCTION(odbc_procedures)
32593259
object_init_ex(return_value, odbc_result_ce);
32603260
result = Z_ODBC_RESULT_P(return_value);
32613261

3262-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3262+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
32633263
if (rc == SQL_INVALID_HANDLE) {
32643264
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
32653265
zval_ptr_dtor(return_value);
@@ -3325,7 +3325,7 @@ PHP_FUNCTION(odbc_specialcolumns)
33253325
object_init_ex(return_value, odbc_result_ce);
33263326
result = Z_ODBC_RESULT_P(return_value);
33273327

3328-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3328+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
33293329
if (rc == SQL_INVALID_HANDLE) {
33303330
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
33313331
zval_ptr_dtor(return_value);
@@ -3391,7 +3391,7 @@ PHP_FUNCTION(odbc_statistics)
33913391
object_init_ex(return_value, odbc_result_ce);
33923392
result = Z_ODBC_RESULT_P(return_value);
33933393

3394-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3394+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
33953395
if (rc == SQL_INVALID_HANDLE) {
33963396
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
33973397
zval_ptr_dtor(return_value);
@@ -3452,7 +3452,7 @@ PHP_FUNCTION(odbc_tableprivileges)
34523452
object_init_ex(return_value, odbc_result_ce);
34533453
result = Z_ODBC_RESULT_P(return_value);
34543454

3455-
rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
3455+
rc = SQLAllocHandle(SQL_HANDLE_STMT, conn->hdbc, &(result->stmt));
34563456
if (rc == SQL_INVALID_HANDLE) {
34573457
php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
34583458
zval_ptr_dtor(return_value);

‎ext/odbc/php_odbc_includes.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
264264

265265
#define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR || x == SQL_WLONGVARCHAR)
266266

267-
#define PHP_ODBC_SQLALLOCSTMT(hdbc, phstmt) SQLAllocHandle(SQL_HANDLE_STMT, hdbc, phstmt)
268-
269267
#define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
270268

271269
PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)

0 commit comments

Comments
 (0)