Use RETURN_THROWS() after zend_fetch_resource*()

1 files changed, 37 insertions, 37 deletions

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6fdee0f225..790d253359 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -665,7 +665,7 @@ void php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (mode) {
@@ -803,7 +803,7 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	rc = SQLTransact(conn->henv, conn->hdbc, (SQLUSMALLINT)((type)?SQL_COMMIT:SQL_ROLLBACK));
@@ -850,7 +850,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -945,7 +945,7 @@ PHP_FUNCTION(odbc_prepare)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -1052,7 +1052,7 @@ PHP_FUNCTION(odbc_execute)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	/* XXX check for already bound parameters*/
@@ -1258,7 +1258,7 @@ PHP_FUNCTION(odbc_cursor)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	rc = SQLGetInfo(result->conn_ptr->hdbc,SQL_MAX_CURSOR_NAME_LEN, (void *)&max_len,sizeof(max_len),&len);
@@ -1324,7 +1324,7 @@ PHP_FUNCTION(odbc_data_source)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(zv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	/* now we have the "connection" lets call the DataSource object */
@@ -1382,7 +1382,7 @@ PHP_FUNCTION(odbc_exec)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -1478,7 +1478,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 #endif
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -1630,7 +1630,7 @@ PHP_FUNCTION(odbc_fetch_into)
 #endif /* HAVE_SQL_EXTENDED_FETCH */
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -1736,7 +1736,7 @@ PHP_FUNCTION(solid_fetch_prev)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 	if (result->numcols == 0) {
 		php_error_docref(NULL, E_WARNING, "No tuples available at this result index");
@@ -1778,7 +1778,7 @@ PHP_FUNCTION(odbc_fetch_row)
 	rownum = pv_row;
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -1844,7 +1844,7 @@ PHP_FUNCTION(odbc_result)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if ((result->numcols == 0)) {
@@ -2023,7 +2023,7 @@ PHP_FUNCTION(odbc_result_all)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -2140,7 +2140,7 @@ PHP_FUNCTION(odbc_free_result)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->values) {
@@ -2439,7 +2439,7 @@ PHP_FUNCTION(odbc_close)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (Z_RES_P(pv_conn)->type == le_pconn) {
@@ -2476,7 +2476,7 @@ PHP_FUNCTION(odbc_num_rows)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	SQLRowCount(result->stmt, &rows);
@@ -2498,7 +2498,7 @@ PHP_FUNCTION(odbc_next_result)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->values) {
@@ -2549,7 +2549,7 @@ PHP_FUNCTION(odbc_num_fields)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	RETURN_LONG(result->numcols);
@@ -2569,7 +2569,7 @@ PHP_FUNCTION(odbc_field_name)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -2606,7 +2606,7 @@ PHP_FUNCTION(odbc_field_type)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -2659,7 +2659,7 @@ PHP_FUNCTION(odbc_field_num)
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (result->numcols == 0) {
@@ -2696,7 +2696,7 @@ PHP_FUNCTION(odbc_autocommit)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (ZEND_NUM_ARGS() > 1) {
@@ -2748,7 +2748,7 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
 
 	if (ZEND_NUM_ARGS() == 1) {
 		if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_handle), "ODBC-Link", le_conn, le_pconn))) {
-			return;
+			RETURN_THROWS();
 		}
 		if (mode == 0) {
 			ret = conn->laststate;
@@ -2806,7 +2806,7 @@ PHP_FUNCTION(odbc_setoption)
 	switch (pv_which) {
 		case 1:		/* SQLSetConnectOption */
 			if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_handle), "ODBC-Link", le_conn, le_pconn))) {
-				return;
+				RETURN_THROWS();
 			}
 
 			if (conn->persistent) {
@@ -2821,7 +2821,7 @@ PHP_FUNCTION(odbc_setoption)
 			break;
 		case 2:		/* SQLSetStmtOption */
 			if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_handle), "ODBC result", le_result)) == NULL) {
-				return;
+				RETURN_THROWS();
 			}
 
 			rc = SQLSetStmtOption(result->stmt, (unsigned short) pv_opt, pv_val);
@@ -2862,7 +2862,7 @@ PHP_FUNCTION(odbc_tables)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -2931,7 +2931,7 @@ PHP_FUNCTION(odbc_columns)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3003,7 +3003,7 @@ PHP_FUNCTION(odbc_columnprivileges)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3081,7 +3081,7 @@ PHP_FUNCTION(odbc_foreignkeys)
 #endif
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3149,7 +3149,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
 	data_type = (SQLSMALLINT) pv_data_type;
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3208,7 +3208,7 @@ PHP_FUNCTION(odbc_primarykeys)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3276,7 +3276,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3345,7 +3345,7 @@ PHP_FUNCTION(odbc_procedures)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3415,7 +3415,7 @@ PHP_FUNCTION(odbc_specialcolumns)
 	nullable = (SQLUSMALLINT) vnullable;
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3486,7 +3486,7 @@ PHP_FUNCTION(odbc_statistics)
 	reserved = (SQLUSMALLINT) vreserved;
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
@@ -3551,7 +3551,7 @@ PHP_FUNCTION(odbc_tableprivileges)
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
-		return;
+		RETURN_THROWS();
 	}
 
 	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));