diff options
| author | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-25 22:49:04 +0000 |
|---|---|---|
| committer | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-25 22:49:04 +0000 |
| commit | 6cfba2a3ea0c59f63b8c225b2a0ff85194f432f5 (patch) | |
| tree | b2660d658d42d90c170552b76c11815afd03aed3 /ext/satellite | |
| parent | 0ddd124d1d58f5f1094c8287e0f3905e6ab45d40 (diff) | |
| download | php-git-6cfba2a3ea0c59f63b8c225b2a0ff85194f432f5.tar.gz | |
2nd phase in back-substitution those macro's
I've got pretty much everything now...
Diffstat (limited to 'ext/satellite')
| -rw-r--r-- | ext/satellite/enum.c | 6 | ||||
| -rw-r--r-- | ext/satellite/object.c | 4 | ||||
| -rw-r--r-- | ext/satellite/struct.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/satellite/enum.c b/ext/satellite/enum.c index 197d1e2c5a..10abaa0004 100644 --- a/ext/satellite/enum.c +++ b/ext/satellite/enum.c @@ -96,14 +96,14 @@ zend_bool OrbitEnum_Constructor(OrbitEnum ** ppEnum, int parameterCount, } /* validate parameter types */ - if (ppParameters[0]->type != IS_STRING) + if (ppPZ_TYPE_P(arameters[0]) != IS_STRING) goto error; /* find type information */ - p_enum->mpEnumType = TypeManager_FindEnum(ppParameters[0]->value.str.val); + p_enum->mpEnumType = TypeManager_FindEnum(ppPZ_STRVAL_P(arameters[0])); if (p_enum->mpEnumType == NULL) { - zend_error(E_WARNING, "(Satellite) unknown enum '%s'", ppParameters[0]->value.str.val); + zend_error(E_WARNING, "(Satellite) unknown enum '%s'", ppPZ_STRVAL_P(arameters[0])); goto error; } diff --git a/ext/satellite/object.c b/ext/satellite/object.c index 45aac9ecaf..ac12a60b5c 100644 --- a/ext/satellite/object.c +++ b/ext/satellite/object.c @@ -277,7 +277,7 @@ zend_bool OrbitObject_Constructor(OrbitObject ** ppObject, } /* validate parameter types */ - if (ppParameters[0]->type != IS_STRING) + if (ppPZ_TYPE_P(arameters[0]) != IS_STRING) { zend_error(E_WARNING, "(Satellite) IOR is not a string"); goto error; @@ -286,7 +286,7 @@ zend_bool OrbitObject_Constructor(OrbitObject ** ppObject, /* initialize data object */ if ( !OrbitObject_InitializeData( p_object, - ppParameters[0]->value.str.val) ) + ppPZ_STRVAL_P(arameters[0])) ) { goto error; } diff --git a/ext/satellite/struct.c b/ext/satellite/struct.c index e7ffbf7daa..6c85af2d0a 100644 --- a/ext/satellite/struct.c +++ b/ext/satellite/struct.c @@ -240,11 +240,11 @@ zend_bool OrbitStruct_Constructor(OrbitStruct ** ppStruct, } /* validate parameter types */ - if (ppParameters[0]->type != IS_STRING) + if (ppPZ_TYPE_P(arameters[0]) != IS_STRING) goto error; /* initialize struct */ - if (!OrbitStruct_Initialize(ppParameters[0]->value.str.val, p_struct)) + if (!OrbitStruct_Initialize(ppPZ_STRVAL_P(arameters[0]), p_struct)) goto error; *ppStruct = p_struct; |