Boolify PDO's set_attribute driver function

Girgias · Girgias · commit 43f69160cfac · 2021-01-06T10:20:59.000Z
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
@@ -241,8 +241,9 @@ typedef int (*pdo_dbh_quote_func)(pdo_dbh_t *dbh, const char *unquoted, size_t u
  * Return true if currently inside a transaction, false otherwise. */
 typedef bool (*pdo_dbh_txn_func)(pdo_dbh_t *dbh);
 
-/* setting of attributes */
-typedef int (*pdo_dbh_set_attr_func)(pdo_dbh_t *dbh, zend_long attr, zval *val);
+/* setting of attributes
+ * Return true on success and false in case of failure */
+typedef bool (*pdo_dbh_set_attr_func)(pdo_dbh_t *dbh, zend_long attr, zval *val);
 
 /* return last insert id.  NULL indicates error condition, otherwise, the return value
  * MUST be an emalloc'd NULL terminated string. */
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
@@ -269,28 +269,28 @@ char *dblib_handle_last_id(pdo_dbh_t *dbh, const char *name, size_t *len)
 	return id;
 }
 
-static int dblib_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
+static bool dblib_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 {
 	pdo_dblib_db_handle *H = (pdo_dblib_db_handle *)dbh->driver_data;
 
 	switch(attr) {
 		case PDO_ATTR_DEFAULT_STR_PARAM:
 			H->assume_national_character_set_strings = zval_get_long(val) == PDO_PARAM_STR_NATL ? 1 : 0;
-			return 1;
+			return true;
 		case PDO_ATTR_TIMEOUT:
 		case PDO_DBLIB_ATTR_QUERY_TIMEOUT:
-			return SUCCEED == dbsettime(zval_get_long(val)) ? 1 : 0;
+			return SUCCEED == dbsettime(zval_get_long(val));
 		case PDO_DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER:
 			H->stringify_uniqueidentifier = zval_get_long(val);
-			return 1;
+			return true;
 		case PDO_DBLIB_ATTR_SKIP_EMPTY_ROWSETS:
 			H->skip_empty_rowsets = zval_is_true(val);
-			return 1;
+			return true;
 		case PDO_DBLIB_ATTR_DATETIME_CONVERT:
 			H->datetime_convert = zval_get_long(val);
-			return 1;
+			return true;
 		default:
-			return 0;
+			return false;
 	}
 }
 
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -821,7 +821,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, size_t s
 /* }}} */
 
 /* called by PDO to set a driver-specific dbh attribute */
-static int firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
+static bool firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
@@ -837,7 +837,7 @@ static int firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 							/* turning on auto_commit with an open transaction is illegal, because
 							   we won't know what to do with it */
 							H->last_app_error = "Cannot enable auto-commit while a transaction is already open";
-							return 0;
+							return false;
 						} else {
 							/* close the transaction */
 							if (!firebird_handle_commit(dbh)) {
@@ -849,55 +849,55 @@ static int firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 					dbh->auto_commit = bval;
 				}
 			}
-			return 1;
+			return true;
 
 		case PDO_ATTR_FETCH_TABLE_NAMES:
 			H->fetch_table_names = zval_get_long(val)? 1 : 0;
-			return 1;
+			return true;
 
 		case PDO_FB_ATTR_DATE_FORMAT:
 			{
 				zend_string *str = zval_try_get_string(val);
 				if (UNEXPECTED(!str)) {
-					return 0;
+					return false;
 				}
 				if (H->date_format) {
 					efree(H->date_format);
 				}
 				spprintf(&H->date_format, 0, "%s", ZSTR_VAL(str));
 				zend_string_release_ex(str, 0);
 			}
-			return 1;
+			return true;
 
 		case PDO_FB_ATTR_TIME_FORMAT:
 			{
 				zend_string *str = zval_try_get_string(val);
 				if (UNEXPECTED(!str)) {
-					return 0;
+					return false;
 				}
 				if (H->time_format) {
 					efree(H->time_format);
 				}
 				spprintf(&H->time_format, 0, "%s", ZSTR_VAL(str));
 				zend_string_release_ex(str, 0);
 			}
-			return 1;
+			return true;
 
 		case PDO_FB_ATTR_TIMESTAMP_FORMAT:
 			{
 				zend_string *str = zval_try_get_string(val);
 				if (UNEXPECTED(!str)) {
-					return 0;
+					return false;
 				}
 				if (H->timestamp_format) {
 					efree(H->timestamp_format);
 				}
 				spprintf(&H->timestamp_format, 0, "%s", ZSTR_VAL(str));
 				zend_string_release_ex(str, 0);
 			}
-			return 1;
+			return true;
 	}
-	return 0;
+	return false;
 }
 /* }}} */
 
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
@@ -390,7 +390,7 @@ static inline int mysql_handle_autocommit(pdo_dbh_t *dbh)
 /* }}} */
 
 /* {{{ pdo_mysql_set_attribute */
-static int pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
+static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 {
 	zend_long lval = zval_get_long(val);
 	zend_bool bval = lval ? 1 : 0;
@@ -403,29 +403,29 @@ static int pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 			if (dbh->auto_commit ^ bval) {
 				dbh->auto_commit = bval;
 				if (!mysql_handle_autocommit(dbh)) {
-					PDO_DBG_RETURN(0);
+					PDO_DBG_RETURN(false);
 				}
 			}
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 
 		case PDO_ATTR_DEFAULT_STR_PARAM:
 			((pdo_mysql_db_handle *)dbh->driver_data)->assume_national_character_set_strings = lval == PDO_PARAM_STR_NATL;
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 
 		case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
 			/* ignore if the new value equals the old one */
 			((pdo_mysql_db_handle *)dbh->driver_data)->buffered = bval;
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 
 		case PDO_MYSQL_ATTR_DIRECT_QUERY:
 		case PDO_ATTR_EMULATE_PREPARES:
 			/* ignore if the new value equals the old one */
 			((pdo_mysql_db_handle *)dbh->driver_data)->emulate_prepare = bval;
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 
 		case PDO_ATTR_FETCH_TABLE_NAMES:
 			((pdo_mysql_db_handle *)dbh->driver_data)->fetch_table_names = bval;
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 
 #ifndef PDO_USE_MYSQLND
 		case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
@@ -436,12 +436,12 @@ static int pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 			} else {
 				((pdo_mysql_db_handle *)dbh->driver_data)->max_buffer_size = lval;
 			}
-			PDO_DBG_RETURN(1);
+			PDO_DBG_RETURN(true);
 			break;
 #endif
 
 		default:
-			PDO_DBG_RETURN(0);
+			PDO_DBG_RETURN(false);
 	}
 }
 /* }}} */
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
@@ -426,7 +426,7 @@ static bool oci_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
 }
 /* }}} */
 
-static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
+static bool oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /* {{{ */
 {
 	zend_long lval = zval_get_long(val);
 	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
@@ -440,101 +440,101 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /
 
 				if (H->last_err) {
 					H->last_err = oci_drv_error("OCITransCommit");
-					return 0;
+					return false;
 				}
 				dbh->in_txn = false;
 			}
 
 			dbh->auto_commit = (unsigned int)lval? 1 : 0;
-			return 1;
+			return true;
 		}
 		case PDO_ATTR_PREFETCH:
 		{
 			H->prefetch = pdo_oci_sanitize_prefetch(lval);
-			return 1;
+			return true;
 		}
 		case PDO_OCI_ATTR_ACTION:
 		{
 #if (OCI_MAJOR_VERSION >= 10)
 			zend_string *action = zval_try_get_string(val);
 			if (UNEXPECTED(!action)) {
-				return 0;
+				return false;
 			}
 
 			H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
 				(dvoid *) ZSTR_VAL(action), (ub4) ZSTR_LEN(action),
 				OCI_ATTR_ACTION, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrSet: OCI_ATTR_ACTION");
-				return 0;
+				return false;
 			}
-			return 1;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return 0;
+			return false;
 #endif
 		}
 		case PDO_OCI_ATTR_CLIENT_INFO:
 		{
 #if (OCI_MAJOR_VERSION >= 10)
 			zend_string *client_info = zval_try_get_string(val);
 			if (UNEXPECTED(!client_info)) {
-				return 0;
+				return false;
 			}
 
 			H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
 				(dvoid *) ZSTR_VAL(client_info), (ub4) ZSTR_LEN(client_info),
 				OCI_ATTR_CLIENT_INFO, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_INFO");
-				return 0;
+				return false;
 			}
-			return 1;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return 0;
+			return false;
 #endif
 		}
 		case PDO_OCI_ATTR_CLIENT_IDENTIFIER:
 		{
 #if (OCI_MAJOR_VERSION >= 10)
 			zend_string *identifier = zval_try_get_string(val);
 			if (UNEXPECTED(!identifier)) {
-				return 0;
+				return false;
 			}
 
 			H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
 				(dvoid *) ZSTR_VAL(identifier), (ub4) ZSTR_LEN(identifier),
 				OCI_ATTR_CLIENT_IDENTIFIER, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrSet: OCI_ATTR_CLIENT_IDENTIFIER");
-				return 0;
+				return false;
 			}
-			return 1;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return 0;
+			return false;
 #endif
 		}
 		case PDO_OCI_ATTR_MODULE:
 		{
 #if (OCI_MAJOR_VERSION >= 10)
 			zend_string *module = zval_try_get_string(val);
 			if (UNEXPECTED(!module)) {
-				return 0;
+				return false;
 			}
 
 			H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
 				(dvoid *) ZSTR_VAL(module), (ub4) ZSTR_LEN(module),
 				OCI_ATTR_MODULE, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrSet: OCI_ATTR_MODULE");
-				return 0;
+				return false;
 			}
-			return 1;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return 0;
+			return false;
 #endif
 		}
 		case PDO_OCI_ATTR_CALL_TIMEOUT:
@@ -547,16 +547,16 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /
 				OCI_ATTR_CALL_TIMEOUT, H->err);
 			if (H->last_err) {
 				oci_drv_error("OCIAttrSet: OCI_ATTR_CALL_TIMEOUT");
-				return 0;
+				return false;
 			}
-			return 1;
+			return true;
 #else
 			oci_drv_error("Unsupported attribute type");
-			return 0;
+			return false;
 #endif
 		}
 		default:
-			return 0;
+			return false;
 	}
 
 }
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
@@ -334,18 +334,18 @@ static bool odbc_handle_rollback(pdo_dbh_t *dbh)
 	return true;
 }
 
-static int odbc_handle_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
+static bool odbc_handle_set_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_ODBC_ATTR_ASSUME_UTF8:
 			H->assume_utf8 = zval_is_true(val);
-			return 1;
+			return true;
 		default:
 			strcpy(H->einfo.last_err_msg, "Unknown Attribute");
 			H->einfo.what = "setAttribute";
 			strcpy(H->einfo.last_state, "IM001");
-			return 0;
+			return false;
 	}
 }
 
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -1149,20 +1149,20 @@ static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, i
 	}
 }
 
-static int pdo_pgsql_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
+static bool pdo_pgsql_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 {
 	zend_bool bval = zval_get_long(val)? 1 : 0;
 	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
 
 	switch (attr) {
 		case PDO_ATTR_EMULATE_PREPARES:
 			H->emulate_prepares = bval;
-			return 1;
+			return true;
 		case PDO_PGSQL_ATTR_DISABLE_PREPARES:
 			H->disable_prepares = bval;
-			return 1;
+			return true;
 		default:
-			return 0;
+			return false;
 	}
 }
 
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c

Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t dbh, const char sql, size_t s`
`821`	`821`	`/* }}} */`
`822`	`822`
`823`	`823`	`/* called by PDO to set a driver-specific dbh attribute */`
`824`		`-static int firebird_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval val) /* {{{ */`
	`824`	`+static bool firebird_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval val) /* {{{ */`
`825`	`825`	`{`
`826`	`826`	`pdo_firebird_db_handle H = (pdo_firebird_db_handle )dbh->driver_data;`
`827`	`827`
`@@ -837,7 +837,7 @@ static int firebird_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval v`
`837`	`837`	`/* turning on auto_commit with an open transaction is illegal, because`
`838`	`838`	`we won't know what to do with it */`
`839`	`839`	`H->last_app_error = "Cannot enable auto-commit while a transaction is already open";`
`840`		`- return 0;`
	`840`	`+ return false;`
`841`	`841`	`} else {`
`842`	`842`	`/* close the transaction */`
`843`	`843`	`if (!firebird_handle_commit(dbh)) {`
`@@ -849,55 +849,55 @@ static int firebird_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval v`
`849`	`849`	`dbh->auto_commit = bval;`
`850`	`850`	`}`
`851`	`851`	`}`
`852`		`- return 1;`
	`852`	`+ return true;`
`853`	`853`
`854`	`854`	`case PDO_ATTR_FETCH_TABLE_NAMES:`
`855`	`855`	`H->fetch_table_names = zval_get_long(val)? 1 : 0;`
`856`		`- return 1;`
	`856`	`+ return true;`
`857`	`857`
`858`	`858`	`case PDO_FB_ATTR_DATE_FORMAT:`
`859`	`859`	`{`
`860`	`860`	`zend_string *str = zval_try_get_string(val);`
`861`	`861`	`if (UNEXPECTED(!str)) {`
`862`		`- return 0;`
	`862`	`+ return false;`
`863`	`863`	`}`
`864`	`864`	`if (H->date_format) {`
`865`	`865`	`efree(H->date_format);`
`866`	`866`	`}`
`867`	`867`	`spprintf(&H->date_format, 0, "%s", ZSTR_VAL(str));`
`868`	`868`	`zend_string_release_ex(str, 0);`
`869`	`869`	`}`
`870`		`- return 1;`
	`870`	`+ return true;`
`871`	`871`
`872`	`872`	`case PDO_FB_ATTR_TIME_FORMAT:`
`873`	`873`	`{`
`874`	`874`	`zend_string *str = zval_try_get_string(val);`
`875`	`875`	`if (UNEXPECTED(!str)) {`
`876`		`- return 0;`
	`876`	`+ return false;`
`877`	`877`	`}`
`878`	`878`	`if (H->time_format) {`
`879`	`879`	`efree(H->time_format);`
`880`	`880`	`}`
`881`	`881`	`spprintf(&H->time_format, 0, "%s", ZSTR_VAL(str));`
`882`	`882`	`zend_string_release_ex(str, 0);`
`883`	`883`	`}`
`884`		`- return 1;`
	`884`	`+ return true;`
`885`	`885`
`886`	`886`	`case PDO_FB_ATTR_TIMESTAMP_FORMAT:`
`887`	`887`	`{`
`888`	`888`	`zend_string *str = zval_try_get_string(val);`
`889`	`889`	`if (UNEXPECTED(!str)) {`
`890`		`- return 0;`
	`890`	`+ return false;`
`891`	`891`	`}`
`892`	`892`	`if (H->timestamp_format) {`
`893`	`893`	`efree(H->timestamp_format);`
`894`	`894`	`}`
`895`	`895`	`spprintf(&H->timestamp_format, 0, "%s", ZSTR_VAL(str));`
`896`	`896`	`zend_string_release_ex(str, 0);`
`897`	`897`	`}`
`898`		`- return 1;`
	`898`	`+ return true;`
`899`	`899`	`}`
`900`		`- return 0;`
	`900`	`+ return false;`
`901`	`901`	`}`
`902`	`902`	`/* }}} */`
`903`	`903`
Original file line number	Diff line number	Diff line change
`@@ -334,18 +334,18 @@ static bool odbc_handle_rollback(pdo_dbh_t *dbh)`
`334`	`334`	`return true;`
`335`	`335`	`}`
`336`	`336`
`337`		`-static int odbc_handle_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
	`337`	`+static bool odbc_handle_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
`338`	`338`	`{`
`339`	`339`	`pdo_odbc_db_handle H = (pdo_odbc_db_handle )dbh->driver_data;`
`340`	`340`	`switch (attr) {`
`341`	`341`	`case PDO_ODBC_ATTR_ASSUME_UTF8:`
`342`	`342`	`H->assume_utf8 = zval_is_true(val);`
`343`		`- return 1;`
	`343`	`+ return true;`
`344`	`344`	`default:`
`345`	`345`	`strcpy(H->einfo.last_err_msg, "Unknown Attribute");`
`346`	`346`	`H->einfo.what = "setAttribute";`
`347`	`347`	`strcpy(H->einfo.last_state, "IM001");`
`348`		`- return 0;`
	`348`	`+ return false;`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -1149,20 +1149,20 @@ static const zend_function_entry pdo_pgsql_get_driver_methods(pdo_dbh_t dbh, i`
`1149`	`1149`	`}`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`		`-static int pdo_pgsql_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
	`1152`	`+static bool pdo_pgsql_set_attr(pdo_dbh_t dbh, zend_long attr, zval val)`
`1153`	`1153`	`{`
`1154`	`1154`	`zend_bool bval = zval_get_long(val)? 1 : 0;`
`1155`	`1155`	`pdo_pgsql_db_handle H = (pdo_pgsql_db_handle )dbh->driver_data;`
`1156`	`1156`
`1157`	`1157`	`switch (attr) {`
`1158`	`1158`	`case PDO_ATTR_EMULATE_PREPARES:`
`1159`	`1159`	`H->emulate_prepares = bval;`
`1160`		`- return 1;`
	`1160`	`+ return true;`
`1161`	`1161`	`case PDO_PGSQL_ATTR_DISABLE_PREPARES:`
`1162`	`1162`	`H->disable_prepares = bval;`
`1163`		`- return 1;`
	`1163`	`+ return true;`
`1164`	`1164`	`default:`
`1165`		`- return 0;`
	`1165`	`+ return false;`
`1166`	`1166`	`}`
`1167`	`1167`	`}`
`1168`	`1168`