From: Felipe Pena Date: Wed, 24 Dec 2008 00:04:40 +0000 (+0000) Subject: - Standard X-Git-Tag: php-5.4.0alpha1~191^2~4763 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b110b1d78b322b14866fc3e923a0aff50e280d57;p=php - Standard --- diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 07cef04b44..8de315406b 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -153,7 +153,7 @@ PHP_FUNCTION(shm_attach) long shm_key, shm_id, shm_size = php_sysvshm.init_mem, shm_flag = 0666; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|ll", &shm_key, &shm_size, &shm_flag)) { - RETURN_FALSE; + return; } if (shm_size < 1) { @@ -209,7 +209,7 @@ PHP_FUNCTION(shm_detach) sysvshm_shm *shm_list_ptr; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &shm_id)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); RETURN_BOOL(SUCCESS == zend_list_delete(Z_LVAL_P(shm_id))); @@ -224,7 +224,7 @@ PHP_FUNCTION(shm_remove) sysvshm_shm *shm_list_ptr; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &shm_id)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); @@ -249,7 +249,7 @@ PHP_FUNCTION(shm_put_var) php_serialize_data_t var_hash; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &shm_id, &shm_key, &arg_var)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); @@ -285,7 +285,7 @@ PHP_FUNCTION(shm_get_var) php_unserialize_data_t var_hash; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &shm_id, &shm_key)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); @@ -318,7 +318,7 @@ PHP_FUNCTION(shm_has_var) sysvshm_shm *shm_list_ptr; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &shm_id, &shm_key)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); RETURN_BOOL(php_check_shm_data(shm_list_ptr->ptr, shm_key) >= 0); @@ -334,7 +334,7 @@ PHP_FUNCTION(shm_remove_var) sysvshm_shm *shm_list_ptr; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &shm_id, &shm_key)) { - RETURN_FALSE; + return; } SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt index 5d797da6c2..9f1502702e 100644 --- a/ext/sysvshm/tests/002.phpt +++ b/ext/sysvshm/tests/002.phpt @@ -34,10 +34,10 @@ echo "Done\n"; ?> --EXPECTF-- Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d -bool(false) +NULL Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d -bool(false) +NULL Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d bool(false) diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt index afcc649615..b02fcb6357 100644 --- a/ext/sysvshm/tests/003.phpt +++ b/ext/sysvshm/tests/003.phpt @@ -32,10 +32,10 @@ shm_remove($s); ?> --EXPECTF-- Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on line %d -bool(false) +NULL Warning: shm_detach() expects exactly 1 parameter, 2 given in %s003.php on line %d -bool(false) +NULL bool(true) Warning: shm_detach(): %d is not a valid sysvshm resource in %s003.php on line %d @@ -44,11 +44,11 @@ bool(false) Warning: shm_remove(): %d is not a valid sysvshm resource in %s003.php on line %d Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d -bool(false) +NULL Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d -bool(false) +NULL Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d -bool(false) +NULL Done diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt index ba25c81258..691e1b16ae 100644 --- a/ext/sysvshm/tests/004.phpt +++ b/ext/sysvshm/tests/004.phpt @@ -25,13 +25,13 @@ echo "Done\n"; --EXPECTF-- Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d -bool(false) +NULL Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d -bool(false) +NULL Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d -bool(false) +NULL bool(true) bool(true) bool(true) diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt index 9a40fc7421..510b87158b 100644 --- a/ext/sysvshm/tests/005.phpt +++ b/ext/sysvshm/tests/005.phpt @@ -40,10 +40,10 @@ echo "Done\n"; --EXPECTF-- Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d -bool(false) +NULL Warning: shm_get_var() expects parameter 1 to be resource, integer given in %s005.php on line %d -bool(false) +NULL Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d bool(false) @@ -52,7 +52,7 @@ Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line % bool(false) Warning: shm_get_var() expects parameter 2 to be long, array given in %s005.php on line %d -bool(false) +NULL unicode(11) "test string" object(stdClass)#%d (0) { } diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt index e0754693b1..637e1d7a68 100644 --- a/ext/sysvshm/tests/006.phpt +++ b/ext/sysvshm/tests/006.phpt @@ -28,10 +28,10 @@ echo "Done\n"; --EXPECTF-- Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d -bool(false) +NULL Warning: shm_remove_var() expects parameter 1 to be resource, integer given in %s006.php on line %d -bool(false) +NULL Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d bool(false) diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt index 2b6f00a1df..879eb14be2 100644 --- a/ext/sysvshm/tests/007.phpt +++ b/ext/sysvshm/tests/007.phpt @@ -24,16 +24,16 @@ echo "Done\n"; --EXPECTF-- Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d -bool(false) +NULL Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d -bool(false) +NULL Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d -bool(false) +NULL Warning: shm_remove() expects parameter 1 to be resource, Unicode string given in %s007.php on line %d -bool(false) +NULL bool(true) bool(true)