Boolify PDO get_attribute handler

Girgias · Girgias · commit 010d3db7752f · 2020-12-23T16:41:15.000+01:00
This also removes some dead code
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -893,20 +893,13 @@ PHP_METHOD(PDO, getAttribute)
 		RETURN_FALSE;
 	}
 
-	switch (dbh->methods->get_attribute(dbh, attr, return_value)) {
-		case -1:
-			PDO_HANDLE_DBH_ERR();
-			RETURN_FALSE;
-
-		case 0:
-			pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support that attribute");
-			RETURN_FALSE;
-
-		default:
-			/* No error state, just return as the return_value has been assigned
-			 * by the get_attribute handler */
-			return;
+	if (dbh->methods->get_attribute(dbh, attr, return_value) == false) {
+		pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support that attribute");
+		RETURN_FALSE;
 	}
+	/* No error state, just return as the return_value has been assigned
+	 * by the get_attribute handler */
+	 return;
 }
 /* }}} */
 
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
@@ -258,9 +258,8 @@ typedef char *(*pdo_dbh_last_id_func)(pdo_dbh_t *dbh, const char *name, size_t *
 typedef	int (*pdo_dbh_fetch_error_func)(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info);
 
 /* fetching of attributes
- * TODO should this be a zend_result return value?
- */
-typedef int (*pdo_dbh_get_attr_func)(pdo_dbh_t *dbh, zend_long attr, zval *val);
+ * Return true on success and false in case of failure */
+typedef bool (*pdo_dbh_get_attr_func)(pdo_dbh_t *dbh, zend_long attr, zval *val);
 
 /* checking/pinging persistent connections; return SUCCESS if the connection
  * is still alive and ready to be used, FAILURE otherwise.
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
@@ -361,7 +361,7 @@ static void dblib_get_tds_version(zval *return_value, int tds)
 	}
 }
 
-static int dblib_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
+static bool dblib_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
 {
 	pdo_dblib_db_handle *H = (pdo_dblib_db_handle *)dbh->driver_data;
 
@@ -396,10 +396,10 @@ static int dblib_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_valu
 			break;
 
 		default:
-			return 0;
+			return false;
 	}
 
-	return 1;
+	return true;
 }
 
 static const struct pdo_dbh_methods dblib_methods = {
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -914,7 +914,7 @@ static void firebird_info_cb(void *arg, char const *s) /* {{{ */
 /* }}} */
 
 /* called by PDO to get a driver-specific dbh attribute */
-static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
+static bool firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
@@ -923,11 +923,11 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 
 		case PDO_ATTR_AUTOCOMMIT:
 			ZVAL_LONG(val,dbh->auto_commit);
-			return 1;
+			return true;
 
 		case PDO_ATTR_CONNECTION_STATUS:
 			ZVAL_BOOL(val, !isc_version(&H->db, firebird_info_cb, NULL));
-			return 1;
+			return true;
 
 		case PDO_ATTR_CLIENT_VERSION: {
 #if defined(__GNUC__) || defined(PHP_WIN32)
@@ -950,22 +950,23 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 			ZVAL_NULL(val);
 #endif
 			}
-			return 1;
+			return true;
 
 		case PDO_ATTR_SERVER_VERSION:
 		case PDO_ATTR_SERVER_INFO:
 			*tmp = 0;
 
 			if (!isc_version(&H->db, firebird_info_cb, (void*)tmp)) {
 				ZVAL_STRING(val, tmp);
-				return 1;
+				return true;
 			}
+			/* TODO missing break? */
 
 		case PDO_ATTR_FETCH_TABLE_NAMES:
 			ZVAL_BOOL(val, H->fetch_table_names);
-			return 1;
+			return true;
 	}
-	return 0;
+	return false;
 }
 /* }}} */
 
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
@@ -447,7 +447,7 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 /* }}} */
 
 /* {{{ pdo_mysql_get_attribute */
-static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
+static bool pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
 {
 	pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
 
@@ -512,10 +512,10 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
 			break;
 
 		default:
-			PDO_DBG_RETURN(0);
+			PDO_DBG_RETURN(false);
 	}
 
-	PDO_DBG_RETURN(1);
+	PDO_DBG_RETURN(true);
 }
 /* }}} */
 
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
@@ -562,7 +562,7 @@ static bool oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 }
 /* }}} */
 
-static int oci_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)  /* {{{ */
+static bool oci_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)  /* {{{ */
 {
 	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
@@ -591,7 +591,7 @@ static int oci_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return
 					ZVAL_STRING(return_value, verstr);
 				}
 			}
-			return TRUE;
+			return true;
 		}
 
 		case PDO_ATTR_CLIENT_VERSION:
@@ -608,20 +608,20 @@ static int oci_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return
 			/* Compile time client version */
 			ZVAL_STRING(return_value, PHP_PDO_OCI_CLIENT_VERSION);
 #else
-			return FALSE;
+			return false;
 
 #endif /* Check for OCIClientVersion() support */
 
-			return TRUE;
+			return true;
 		}
 
 		case PDO_ATTR_AUTOCOMMIT:
 			ZVAL_BOOL(return_value, dbh->auto_commit);
-			return TRUE;
+			return true;
 
 		case PDO_ATTR_PREFETCH:
 			ZVAL_LONG(return_value, H->prefetch);
-			return TRUE;
+			return true;
 		case PDO_OCI_ATTR_CALL_TIMEOUT:
 		{
 #if (OCI_MAJOR_VERSION >= 18)
@@ -632,21 +632,21 @@ static int oci_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return
 				OCI_ATTR_CALL_TIMEOUT, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrGet: OCI_ATTR_CALL_TIMEOUT");
-				return FALSE;
+				return false;
 			}
 
 			ZVAL_LONG(return_value, (zend_long) timeout);
-			return TRUE;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return FALSE;
+			return false;
 #endif
 		}
 		default:
-			return FALSE;
+			return false;
 
 	}
-	return FALSE;
+	return false;
 
 }
 /* }}} */
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
@@ -349,13 +349,13 @@ static bool odbc_handle_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 	}
 }
 
-static int odbc_handle_get_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
+static bool odbc_handle_get_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 {
 	pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
 	switch (attr) {
 		case PDO_ATTR_CLIENT_VERSION:
 			ZVAL_STRING(val, "ODBC-" PDO_ODBC_TYPE);
-			return 1;
+			return true;
 
 		case PDO_ATTR_SERVER_VERSION:
 		case PDO_ATTR_PREFETCH:
@@ -365,10 +365,10 @@ static int odbc_handle_get_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 			break;
 		case PDO_ODBC_ATTR_ASSUME_UTF8:
 			ZVAL_BOOL(val, H->assume_utf8 ? 1 : 0);
-			return 1;
+			return true;
 
 	}
-	return 0;
+	return false;
 }
 
 static const struct pdo_dbh_methods odbc_methods = {
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -393,7 +393,7 @@ void pdo_libpq_version(char *buf, size_t len)
 	}
 }
 
-static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
+static bool pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
 {
 	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
 
@@ -481,10 +481,10 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
 		}
 
 		default:
-			return 0;
+			return false;
 	}
 
-	return 1;
+	return true;
 }
 
 /* {{{ */
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
@@ -280,7 +280,7 @@ static bool sqlite_handle_rollback(pdo_dbh_t *dbh)
 	return true;
 }
 
-static int pdo_sqlite_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
+static bool pdo_sqlite_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_value)
 {
 	switch (attr) {
 		case PDO_ATTR_CLIENT_VERSION:
@@ -289,10 +289,10 @@ static int pdo_sqlite_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return
 			break;
 
 		default:
-			return 0;
+			return false;
 	}
 
-	return 1;
+	return true;
 }
 
 static bool pdo_sqlite_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ static void dblib_get_tds_version(zval *return_value, int tds)`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`-static int dblib_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
	`364`	`+static bool dblib_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
`365`	`365`	`{`
`366`	`366`	`pdo_dblib_db_handle H = (pdo_dblib_db_handle )dbh->driver_data;`
`367`	`367`
`@@ -396,10 +396,10 @@ static int dblib_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_valu`
`396`	`396`	`break;`
`397`	`397`
`398`	`398`	`default:`
`399`		`- return 0;`
	`399`	`+ return false;`
`400`	`400`	`}`
`401`	`401`
`402`		`- return 1;`
	`402`	`+ return true;`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`static const struct pdo_dbh_methods dblib_methods = {`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t dbh, zend_long attr, zval val)`
`447`	`447`	`/* }}} */`
`448`	`448`
`449`	`449`	`/* {{{ pdo_mysql_get_attribute */`
`450`		`-static int pdo_mysql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
	`450`	`+static bool pdo_mysql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
`451`	`451`	`{`
`452`	`452`	`pdo_mysql_db_handle H = (pdo_mysql_db_handle )dbh->driver_data;`
`453`	`453`
`@@ -512,10 +512,10 @@ static int pdo_mysql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_`
`512`	`512`	`break;`
`513`	`513`
`514`	`514`	`default:`
`515`		`- PDO_DBG_RETURN(0);`
	`515`	`+ PDO_DBG_RETURN(false);`
`516`	`516`	`}`
`517`	`517`
`518`		`- PDO_DBG_RETURN(1);`
	`518`	`+ PDO_DBG_RETURN(true);`
`519`	`519`	`}`
`520`	`520`	`/* }}} */`
`521`	`521`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ static bool oci_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval val)`
`562`	`562`	`}`
`563`	`563`	`/* }}} */`
`564`	`564`
`565`		`-static int oci_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value) /* {{{ */`
	`565`	`+static bool oci_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value) /* {{{ */`
`566`	`566`	`{`
`567`	`567`	`pdo_oci_db_handle H = (pdo_oci_db_handle )dbh->driver_data;`
`568`	`568`
`@@ -591,7 +591,7 @@ static int oci_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return`
`591`	`591`	`ZVAL_STRING(return_value, verstr);`
`592`	`592`	`}`
`593`	`593`	`}`
`594`		`- return TRUE;`
	`594`	`+ return true;`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`case PDO_ATTR_CLIENT_VERSION:`
`@@ -608,20 +608,20 @@ static int oci_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return`
`608`	`608`	`/* Compile time client version */`
`609`	`609`	`ZVAL_STRING(return_value, PHP_PDO_OCI_CLIENT_VERSION);`
`610`	`610`	`#else`
`611`		`- return FALSE;`
	`611`	`+ return false;`
`612`	`612`
`613`	`613`	`#endif /* Check for OCIClientVersion() support */`
`614`	`614`
`615`		`- return TRUE;`
	`615`	`+ return true;`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`case PDO_ATTR_AUTOCOMMIT:`
`619`	`619`	`ZVAL_BOOL(return_value, dbh->auto_commit);`
`620`		`- return TRUE;`
	`620`	`+ return true;`
`621`	`621`
`622`	`622`	`case PDO_ATTR_PREFETCH:`
`623`	`623`	`ZVAL_LONG(return_value, H->prefetch);`
`624`		`- return TRUE;`
	`624`	`+ return true;`
`625`	`625`	`case PDO_OCI_ATTR_CALL_TIMEOUT:`
`626`	`626`	`{`
`627`	`627`	`#if (OCI_MAJOR_VERSION >= 18)`
`@@ -632,21 +632,21 @@ static int oci_handle_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return`
`632`	`632`	`OCI_ATTR_CALL_TIMEOUT, H->err);`
`633`	`633`	`if (H->last_err) {`
`634`	`634`	`oci_drv_error("OCIAttrGet: OCI_ATTR_CALL_TIMEOUT");`
`635`		`- return FALSE;`
	`635`	`+ return false;`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`ZVAL_LONG(return_value, (zend_long) timeout);`
`639`		`- return TRUE;`
	`639`	`+ return true;`
`640`	`640`	`#else`
`641`	`641`	`oci_drv_error("Unsupported attribute type");`
`642`		`- return FALSE;`
	`642`	`+ return false;`
`643`	`643`	`#endif`
`644`	`644`	`}`
`645`	`645`	`default:`
`646`		`- return FALSE;`
	`646`	`+ return false;`
`647`	`647`
`648`	`648`	`}`
`649`		`- return FALSE;`
	`649`	`+ return false;`
`650`	`650`
`651`	`651`	`}`
`652`	`652`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -349,13 +349,13 @@ static bool odbc_handle_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
`352`		`-static int odbc_handle_get_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
	`352`	`+static bool odbc_handle_get_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
`353`	`353`	`{`
`354`	`354`	`pdo_odbc_db_handle H = (pdo_odbc_db_handle )dbh->driver_data;`
`355`	`355`	`switch (attr) {`
`356`	`356`	`case PDO_ATTR_CLIENT_VERSION:`
`357`	`357`	`ZVAL_STRING(val, "ODBC-" PDO_ODBC_TYPE);`
`358`		`- return 1;`
	`358`	`+ return true;`
`359`	`359`
`360`	`360`	`case PDO_ATTR_SERVER_VERSION:`
`361`	`361`	`case PDO_ATTR_PREFETCH:`
`@@ -365,10 +365,10 @@ static int odbc_handle_get_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
`365`	`365`	`break;`
`366`	`366`	`case PDO_ODBC_ATTR_ASSUME_UTF8:`
`367`	`367`	`ZVAL_BOOL(val, H->assume_utf8 ? 1 : 0);`
`368`		`- return 1;`
	`368`	`+ return true;`
`369`	`369`
`370`	`370`	`}`
`371`		`- return 0;`
	`371`	`+ return false;`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`static const struct pdo_dbh_methods odbc_methods = {`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ void pdo_libpq_version(char *buf, size_t len)`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`-static int pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
	`396`	`+static bool pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
`397`	`397`	`{`
`398`	`398`	`pdo_pgsql_db_handle H = (pdo_pgsql_db_handle )dbh->driver_data;`
`399`	`399`
`@@ -481,10 +481,10 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`default:`
`484`		`- return 0;`
	`484`	`+ return false;`
`485`	`485`	`}`
`486`	`486`
`487`		`- return 1;`
	`487`	`+ return true;`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`/* {{{ */`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ static bool sqlite_handle_rollback(pdo_dbh_t *dbh)`
`280`	`280`	`return true;`
`281`	`281`	`}`
`282`	`282`
`283`		`-static int pdo_sqlite_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
	`283`	`+static bool pdo_sqlite_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_value)`
`284`	`284`	`{`
`285`	`285`	`switch (attr) {`
`286`	`286`	`case PDO_ATTR_CLIENT_VERSION:`
`@@ -289,10 +289,10 @@ static int pdo_sqlite_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return`
`289`	`289`	`break;`
`290`	`290`
`291`	`291`	`default:`
`292`		`- return 0;`
	`292`	`+ return false;`
`293`	`293`	`}`
`294`	`294`
`295`		`- return 1;`
	`295`	`+ return true;`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`static bool pdo_sqlite_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`