diff options
author | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-25 21:58:48 +0000 |
---|---|---|
committer | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-25 21:58:48 +0000 |
commit | c03328857394bef36ffa9678d33079ad96e4a4e4 (patch) | |
tree | c0fb250db3b1bb996fc305bf56c2b74eb6d00935 /ext/sysvsem | |
parent | 158d34c9a57816326e141e88e1409d9f377dc2ea (diff) | |
download | php-git-c03328857394bef36ffa9678d33079ad96e4a4e4.tar.gz |
Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know.
Diffstat (limited to 'ext/sysvsem')
-rw-r--r-- | ext/sysvsem/sysvsem.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 879c58db52..5f9a2d8d65 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -176,16 +176,16 @@ PHP_FUNCTION(sem_get) RETURN_FALSE; } convert_to_long_ex(arg_key); - key = (int)(*arg_key)->value.lval; + key = (int)Z_LVAL_PP(arg_key); break; case 2: if (zend_get_parameters_ex(2, &arg_key, &arg_max_acquire)==FAILURE) { RETURN_FALSE; } convert_to_long_ex(arg_key); - key = (int)(*arg_key)->value.lval; + key = (int)Z_LVAL_PP(arg_key); convert_to_long_ex(arg_max_acquire); - max_acquire = (int)(*arg_max_acquire)->value.lval; + max_acquire = (int)Z_LVAL_PP(arg_max_acquire); break; case 3: if (zend_get_parameters_ex(3, &arg_key, &arg_max_acquire, &arg_perm)==FAILURE) { @@ -194,9 +194,9 @@ PHP_FUNCTION(sem_get) convert_to_long_ex(arg_key); convert_to_long_ex(arg_max_acquire); convert_to_long_ex(arg_perm); - key = (int)(*arg_key)->value.lval; - max_acquire = (int)(*arg_max_acquire)->value.lval; - perm = (int)(*arg_perm)->value.lval; + key = (int)Z_LVAL_PP(arg_key); + max_acquire = (int)Z_LVAL_PP(arg_max_acquire); + perm = (int)Z_LVAL_PP(arg_perm); break; default: WRONG_PARAM_COUNT; @@ -298,10 +298,10 @@ PHP_FUNCTION(sem_get) sem_ptr->semid = semid; sem_ptr->count = 0; - return_value->value.lval = zend_list_insert(sem_ptr, php_sysvsem_module.le_sem); - return_value->type = IS_LONG; + Z_LVAL_P(return_value) = zend_list_insert(sem_ptr, php_sysvsem_module.le_sem); + Z_TYPE_P(return_value) = IS_LONG; - sem_ptr->id = (int)return_value->value.lval; + sem_ptr->id = (int)Z_LVAL_P(return_value); } /* }}} */ @@ -320,7 +320,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire) RETURN_FALSE; } convert_to_long_ex(arg_id); - id = (int)(*arg_id)->value.lval; + id = (int)Z_LVAL_PP(arg_id); break; default: WRONG_PARAM_COUNT; @@ -392,7 +392,7 @@ PHP_FUNCTION(sem_remove) } convert_to_long_ex(arg_id); - id = (*arg_id)->value.lval; + id = Z_LVAL_PP(arg_id); sem_ptr = (sysvsem_sem *) zend_list_find(id, &type); |