ext/sysvshm: voidify php_remove_shm_data()

Girgias · Girgias · commit 4844c7a92fc2 · 2025-07-28T15:33:22.000+01:00
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
@@ -92,7 +92,7 @@ sysvshm_module php_sysvshm;
 
 static int php_put_shm_data(sysvshm_chunk_head *ptr, zend_long key, const char *data, zend_long len);
 static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key);
-static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos);
+static void php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos);
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(sysvshm)
@@ -423,8 +423,7 @@ static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key)
 }
 /* }}} */
 
-/* {{{ php_remove_shm_data */
-static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)
+static void php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)
 {
 	sysvshm_chunk *chunk_ptr, *next_chunk_ptr;
 	zend_long memcpy_len;
@@ -440,8 +439,6 @@ static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)
 	if (memcpy_len > 0) {
 		memmove(chunk_ptr, next_chunk_ptr, memcpy_len);
 	}
-	return 0;
 }
-/* }}} */
 
 #endif /* HAVE_SYSVSHM */

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ sysvshm_module php_sysvshm;`
`92`	`92`
`93`	`93`	`static int php_put_shm_data(sysvshm_chunk_head ptr, zend_long key, const char data, zend_long len);`
`94`	`94`	`static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key);`
`95`		`-static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos);`
	`95`	`+static void php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos);`
`96`	`96`
`97`	`97`	`/* {{{ PHP_MINIT_FUNCTION */`
`98`	`98`	`PHP_MINIT_FUNCTION(sysvshm)`
`@@ -423,8 +423,7 @@ static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key)`
`423`	`423`	`}`
`424`	`424`	`/* }}} */`
`425`	`425`
`426`		`-/* {{{ php_remove_shm_data */`
`427`		`-static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)`
	`426`	`+static void php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)`
`428`	`427`	`{`
`429`	`428`	`sysvshm_chunk chunk_ptr, next_chunk_ptr;`
`430`	`429`	`zend_long memcpy_len;`
`@@ -440,8 +439,6 @@ static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos)`
`440`	`439`	`if (memcpy_len > 0) {`
`441`	`440`	`memmove(chunk_ptr, next_chunk_ptr, memcpy_len);`
`442`	`441`	`}`
`443`		`- return 0;`
`444`	`442`	`}`
`445`		`-/* }}} */`
`446`	`443`
`447`	`444`	`#endif /* HAVE_SYSVSHM */`