Clean up unnecessary ternary expressions and simplify some returns

carusogabriel · petk · commit 31a499404432 · 2018-12-03T01:22:14.000+01:00
- Simplify conditions
- Use ZEND_HASH_APPLY_* instead of hard-coded booleans
- Use ZEND_NORMALIZE_BOOL
- Drop sign in favor of ZEND_NORMALIZE_BOOL
diff --git a/interbase.c b/interbase.c
@@ -869,7 +869,7 @@ int _php_ibase_attach_db(char **args, size_t *len, zend_long *largs, isc_db_hand
 		buf_len -= dpb_len;
 	}
 	if (largs[SYNC] && buf_len > 0) {
-		dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0);
+		dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync);
 		dpb += dpb_len;
 		buf_len -= dpb_len;
 	}

Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@ int _php_ibase_attach_db(char *args, size_t len, zend_long *largs, isc_db_hand`
`869`	`869`	`buf_len -= dpb_len;`
`870`	`870`	`}`
`871`	`871`	`if (largs[SYNC] && buf_len > 0) {`
`872`		`- dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0);`
	`872`	`+ dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync);`
`873`	`873`	`dpb += dpb_len;`
`874`	`874`	`buf_len -= dpb_len;`
`875`	`875`	`}`