com php-src: Merge branch 'PHP-5.6': ext/odbc/php_odbc.c ext/odbc/php_odbc_includes.h

From: Date: Fri, 17 Apr 2015 15:14:18 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/odbc/php_odbc.c ext/odbc/php_odbc_includes.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86352@lists.php.net to get a copy of this message
Commit: 8192d645dbd0a8bf40b537196109a2fe94a2eee2 Author: Anatol Belski <ab@php.net> Fri, 17 Apr 2015 17:14:18 +0200 Parents: 9340c5b347b84ca3201b2cb5b113250b988d30f0 042fa25896a4ff04bf004d6f21c84a3aa30a4e91 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8192d645dbd0a8bf40b537196109a2fe94a2eee2 Log: Merge branch 'PHP-5.6' * PHP-5.6: fix column name attribute with ODBC 3.0 migrate SQLAllocStmt for ODBC 3.0 compliance Changed paths: MM ext/odbc/php_odbc.c MM ext/odbc/php_odbc_includes.h Diff: diff --cc ext/odbc/php_odbc.c index 322ec95,231e814..b37ba94 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@@ -1172,10 -1181,10 +1172,10 @@@ PHP_FUNCTION(odbc_prepare result->numparams = 0; - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -1609,9 -1609,9 +1609,9 @@@ PHP_FUNCTION(odbc_exec result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); efree(result); RETURN_FALSE; } @@@ -3141,10 -3110,10 +3141,10 @@@ PHP_FUNCTION(odbc_tables result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3210,10 -3177,10 +3210,10 @@@ PHP_FUNCTION(odbc_columns result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3282,10 -3247,10 +3282,10 @@@ PHP_FUNCTION(odbc_columnprivileges result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3360,10 -3323,10 +3360,10 @@@ PHP_FUNCTION(odbc_foreignkeys result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3428,10 -3389,10 +3428,10 @@@ PHP_FUNCTION(odbc_gettypeinfo result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3487,10 -3446,10 +3487,10 @@@ PHP_FUNCTION(odbc_primarykeys result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3555,10 -3512,10 +3555,10 @@@ PHP_FUNCTION(odbc_procedurecolumns result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3624,10 -3579,10 +3624,10 @@@ PHP_FUNCTION(odbc_procedures result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3694,10 -3647,10 +3694,10 @@@ PHP_FUNCTION(odbc_specialcolumns result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3765,10 -3716,10 +3765,10 @@@ PHP_FUNCTION(odbc_statistics result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; } @@@ -3830,10 -3779,10 +3830,10 @@@ PHP_FUNCTION(odbc_tableprivileges result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - rc = SQLAllocStmt(conn->hdbc, &(result->stmt)); + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); + php_error_docref(NULL, E_WARNING, "SQLAllocStmt error 'Invalid Handle'"); RETURN_FALSE; }

« previous php.cvs (#86352) next »