php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

- New parameter parsing API

Browse Source
This commit is contained in:
Felipe Pena
2008-06-27 00:22:18 +00:00
parent 019fd806a0
commit 424b5b2929
8 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
ext/sysvshm/sysvshm.c
View File

@@ -107,7 +107,7 @@ PHP_MINIT_FUNCTION(sysvshm)
Creates or open a shared memory segment */
PHP_FUNCTION(shm_attach)
{
zval **arg_key, **arg_size, **arg_flag;
long arg_key, arg_size, arg_flag;
long shm_size, shm_flag;
sysvshm_shm *shm_list_ptr;
char *shm_ptr;
@@ -118,21 +118,18 @@ PHP_FUNCTION(shm_attach)
shm_flag = 0666;
shm_size = php_sysvshm.init_mem;
if (ac < 1 || ac > 3 || zend_get_parameters_ex(ac, &arg_key, &arg_size, &arg_flag) == FAILURE) {
WRONG_PARAM_COUNT;
}
switch (ac) {
case 3:
convert_to_long_ex(arg_flag);
shm_flag = Z_LVAL_PP(arg_flag);
case 2:
convert_to_long_ex(arg_size);
shm_size= Z_LVAL_PP(arg_size);
case 1:
convert_to_long_ex(arg_key);
shm_key = Z_LVAL_PP(arg_key);
if (zend_parse_parameters(ac TSRMLS_CC, "l|ll", &arg_key, &arg_size, &arg_flag) == FAILURE) {
return;
}
shm_key = arg_key;
if (ac > 1) {
shm_size = arg_size;
if (ac > 2) {
shm_flag = arg_flag;
}
}
if (shm_size < 1) {
@@ -184,22 +181,21 @@ PHP_FUNCTION(shm_attach)
Disconnects from shared memory segment */
PHP_FUNCTION(shm_detach)
{
zval **arg_id;
long arg_id;
int type;
sysvshm_shm *shm_list_ptr;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg_id) == FAILURE) {
return;
}
convert_to_long_ex(arg_id);
shm_list_ptr = (sysvshm_shm *) zend_list_find(Z_LVAL_PP(arg_id), &type);
shm_list_ptr = (sysvshm_shm *) zend_list_find(arg_id, &type);
if (!shm_list_ptr || type != php_sysvshm.le_shm) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The parameter is not a valid shm_identifier");
RETURN_FALSE;
}
zend_list_delete(Z_LVAL_PP(arg_id));
zend_list_delete(arg_id);
RETURN_TRUE;
}
@@ -209,17 +205,16 @@ PHP_FUNCTION(shm_detach)
Removes shared memory from Unix systems */
PHP_FUNCTION(shm_remove)
{
zval **arg_id;
long arg_id;
long id;
int type;
sysvshm_shm *shm_list_ptr;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg_id) == FAILURE) {
return;
}
convert_to_long_ex(arg_id);
id = Z_LVAL_PP(arg_id);
id = arg_id;
shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
if (!shm_list_ptr || type != php_sysvshm.le_shm) {
@@ -240,7 +235,8 @@ PHP_FUNCTION(shm_remove)
Inserts or updates a variable in shared memory */
PHP_FUNCTION(shm_put_var)
{
zval **arg_id, **arg_key, **arg_var;
long arg_id, arg_key;
zval **arg_var;
long key, id;
sysvshm_shm *shm_list_ptr;
int type;
@@ -248,14 +244,12 @@ PHP_FUNCTION(shm_put_var)
int ret;
php_serialize_data_t var_hash;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &arg_id, &arg_key, &arg_var) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "llZ", &arg_id, &arg_key, &arg_var) == FAILURE) {
return;
}
convert_to_long_ex(arg_id);
id = Z_LVAL_PP(arg_id);
convert_to_long_ex(arg_key);
key = Z_LVAL_PP(arg_key);
id = arg_id;
key = arg_key;
shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
if (!shm_list_ptr || type != php_sysvshm.le_shm) {
@@ -286,7 +280,7 @@ PHP_FUNCTION(shm_put_var)
Returns a variable from shared memory */
PHP_FUNCTION(shm_get_var)
{
zval **arg_id, **arg_key;
long arg_id, arg_key;
long key, id;
sysvshm_shm *shm_list_ptr;
int type;
@@ -294,15 +288,13 @@ PHP_FUNCTION(shm_get_var)
long shm_varpos;
sysvshm_chunk *shm_var;
php_unserialize_data_t var_hash;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &arg_id, &arg_key) == FAILURE) {
return;
}
convert_to_long_ex(arg_id);
id = Z_LVAL_PP(arg_id);
convert_to_long_ex(arg_key);
key = Z_LVAL_PP(arg_key);
id = arg_id;
key = arg_key;
shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
if (!shm_list_ptr || type != php_sysvshm.le_shm) {
@@ -335,20 +327,18 @@ PHP_FUNCTION(shm_get_var)
Removes variable from shared memory */
PHP_FUNCTION(shm_remove_var)
{
zval **arg_id, **arg_key;
long arg_id, arg_key;
long key, id;
sysvshm_shm *shm_list_ptr;
int type;
long shm_varpos;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) {
WRONG_PARAM_COUNT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &arg_id, &arg_key) == FAILURE) {
return;
}
convert_to_long_ex(arg_id);
id = Z_LVAL_PP(arg_id);
convert_to_long_ex(arg_key);
key = Z_LVAL_PP(arg_key);
id = arg_id;
key = arg_key;
shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
if (!shm_list_ptr || type != php_sysvshm.le_shm) {

8
ext/sysvshm/tests/001.phpt
View File

@@ -18,13 +18,13 @@ var_dump(ftok(__FILE__,"q"));
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for ftok() in %s on line %d
Warning: ftok() expects exactly 2 parameters, 0 given in %s on line %d
NULL
Warning: Wrong parameter count for ftok() in %s on line %d
Warning: ftok() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Warning: Wrong parameter count for ftok() in %s on line %d
Warning: ftok() expects exactly 2 parameters, 3 given in %s on line %d
NULL
Warning: ftok(): Pathname is invalid in %s on line %d
@@ -38,5 +38,5 @@ int(-1)
Warning: ftok(): ftok() failed - No such file or directory in %s on line %d
int(-1)
int(%d)
int(1895944710)
Done

32
ext/sysvshm/tests/002.phpt
View File

@@ -33,35 +33,35 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for shm_attach() in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d
NULL
Warning: Wrong parameter count for shm_attach() in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d
NULL
Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s/sysvshm/tests/002.php on line %d
Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d
bool(false)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
int(%d)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
int(4)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s/sysvshm/tests/002.php on line %d
int(%d)
int(%d)
int(%d)
int(%d)
Done
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
int(5)
int(6)
int(7)
int(8)
Done

4
ext/sysvshm/tests/003.phpt
View File

@@ -31,10 +31,10 @@ shm_remove($s);
?>
--EXPECTF--
Warning: Wrong parameter count for shm_detach() in %s on line %d
Warning: shm_detach() expects exactly 1 parameter, 0 given in %s on line %d
NULL
Warning: Wrong parameter count for shm_detach() in %s on line %d
Warning: shm_detach() expects exactly 1 parameter, 2 given in %s on line %d
NULL
bool(true)

2
ext/sysvshm/tests/004.phpt
View File

@@ -23,7 +23,7 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for shm_put_var() in %s on line %d
Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s on line %d
NULL
Warning: shm_put_var(): -1 is not a SysV shared memory index in %s on line %d

9
ext/sysvshm/tests/005.phpt
View File

@@ -38,7 +38,7 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for shm_get_var() in %s on line %d
Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s on line %d
NULL
Warning: shm_get_var(): -1 is not a SysV shared memory index in %s on line %d
@@ -49,10 +49,11 @@ bool(false)
Warning: shm_get_var(): variable key -10000 doesn't exist in %s on line %d
bool(false)
object(stdClass)#%d (0) {
}
Warning: shm_get_var() expects parameter 2 to be long, array given in %s on line %d
NULL
string(11) "test string"
object(stdClass)#%d (0) {
object(stdClass)#1 (0) {
}
array(3) {
[0]=>

2
ext/sysvshm/tests/006.phpt
View File

@@ -26,7 +26,7 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for shm_remove_var() in %s on line %d
Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s on line %d
NULL
Warning: shm_remove_var(): -1 is not a SysV shared memory index in %s on line %d

6
ext/sysvshm/tests/007.phpt
View File

@@ -22,7 +22,7 @@ var_dump(shm_remove($s));
echo "Done\n";
?>
--EXPECTF--
Warning: Wrong parameter count for shm_remove() in %s on line %d
Warning: shm_remove() expects exactly 1 parameter, 0 given in %s on line %d
NULL
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
@@ -31,8 +31,8 @@ bool(false)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
bool(false)
Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
bool(false)
Warning: shm_remove() expects parameter 1 to be long, string given in %s on line %d
NULL
bool(true)
bool(true)