Fix non standards conforming prototypes. (#2150)

michael-grunder · web-flow · commit b3ce0486690a · 2022-09-14T22:54:22.000-07:00
These now generate warnings with GCC 13
diff --git a/cluster_library.c b/cluster_library.c
@@ -359,7 +359,7 @@ static void cluster_dist_free_ht(zval *p) {
 }
 
 /* Spin up a HashTable that will contain distribution lists */
-HashTable *cluster_dist_create() {
+HashTable *cluster_dist_create(void) {
     HashTable *ret;
 
     ALLOC_HASHTABLE(ret);
@@ -375,7 +375,7 @@ void cluster_dist_free(HashTable *ht) {
 }
 
 /* Create a clusterDistList object */
-static clusterDistList *cluster_dl_create() {
+static clusterDistList *cluster_dl_create(void) {
     clusterDistList *dl;
 
     dl        = emalloc(sizeof(clusterDistList));
diff --git a/cluster_library.h b/cluster_library.h
@@ -336,7 +336,7 @@ clusterReply *cluster_read_sock_resp(RedisSock *redis_sock,
 void cluster_free_reply(clusterReply *reply, int free_data);
 
 /* Cluster distribution helpers for WATCH */
-HashTable *cluster_dist_create();
+HashTable *cluster_dist_create(void);
 void cluster_dist_free(HashTable *ht);
 int cluster_dist_add_key(redisCluster *c, HashTable *ht, char *key,
     size_t key_len, clusterKeyVal **kv);
@@ -354,7 +354,7 @@ unsigned short cluster_hash_key_zval(zval *key);
 unsigned short cluster_hash_key(const char *key, int len);
 
 /* Validate and sanitize cluster construction args */
-zend_string** cluster_validate_args(double timeout, double read_timeout, 
+zend_string** cluster_validate_args(double timeout, double read_timeout,
     HashTable *seeds, uint32_t *nseeds, char **errstr);
 
 void free_seed_array(zend_string **seeds, uint32_t nseeds);
diff --git a/redis_session.c b/redis_session.c
@@ -129,7 +129,7 @@ redis_pool_free(redis_pool *pool) {
 }
 
 /* Retreive session.gc_maxlifetime from php.ini protecting against an integer overflow */
-static int session_gc_maxlifetime() {
+static int session_gc_maxlifetime(void) {
     zend_long value = INI_INT("session.gc_maxlifetime");
     if (value > INT_MAX) {
         php_error_docref(NULL, E_NOTICE, "session.gc_maxlifetime overflows INT_MAX, truncating.");

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ static void cluster_dist_free_ht(zval *p) {`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`/* Spin up a HashTable that will contain distribution lists */`
`362`		`-HashTable *cluster_dist_create() {`
	`362`	`+HashTable *cluster_dist_create(void) {`
`363`	`363`	`HashTable *ret;`
`364`	`364`
`365`	`365`	`ALLOC_HASHTABLE(ret);`
`@@ -375,7 +375,7 @@ void cluster_dist_free(HashTable *ht) {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`/* Create a clusterDistList object */`
`378`		`-static clusterDistList *cluster_dl_create() {`
	`378`	`+static clusterDistList *cluster_dl_create(void) {`
`379`	`379`	`clusterDistList *dl;`
`380`	`380`
`381`	`381`	`dl = emalloc(sizeof(clusterDistList));`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ redis_pool_free(redis_pool *pool) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/* Retreive session.gc_maxlifetime from php.ini protecting against an integer overflow */`
`132`		`-static int session_gc_maxlifetime() {`
	`132`	`+static int session_gc_maxlifetime(void) {`
`133`	`133`	`zend_long value = INI_INT("session.gc_maxlifetime");`
`134`	`134`	`if (value > INT_MAX) {`
`135`	`135`	`php_error_docref(NULL, E_NOTICE, "session.gc_maxlifetime overflows INT_MAX, truncating.");`