Fixed Jeroen's macrofication

diff --git a/ext/satellite/enum.c b/ext/satellite/enum.c
index 10abaa000447e9e52c24438b9192aba2b7623587..3d33fd745532ecff356dc99642516a26862f3bea 100644 (file)
--- 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 (ppPZ_TYPE_P(arameters[0]) != IS_STRING)
+       if (Z_TYPE_P(ppParameters[0]) != IS_STRING)
                goto error;
 
        /* find type information */
-       p_enum->mpEnumType = TypeManager_FindEnum(ppPZ_STRVAL_P(arameters[0]));
+       p_enum->mpEnumType = TypeManager_FindEnum(Z_STRVAL_P(ppParameters[0]));
        if (p_enum->mpEnumType == NULL)
        {
-               zend_error(E_WARNING, "(Satellite) unknown enum '%s'", ppPZ_STRVAL_P(arameters[0]));
+               zend_error(E_WARNING, "(Satellite) unknown enum '%s'", Z_STRVAL_P(ppParameters[0]));
                goto error;
        }
 

diff --git a/ext/satellite/namedvalue_to_zval.c b/ext/satellite/namedvalue_to_zval.c
index 6e55fd88c64ac8140cf2378450f09d117ac23f5e..74a0c47061ce3649b406178b7ff0a7930a0a339d 100644 (file)
--- a/ext/satellite/namedvalue_to_zval.c
+++ b/ext/satellite/namedvalue_to_zval.c
@@ -153,7 +153,7 @@ static zend_bool satellite_any_to_zval_sequence(
                /* add to hashtable */
                INIT_PZVAL(p_destination_item); /* testing! */
                zend_hash_next_index_insert(
-                       pDZ_ARRVAL_P(estination),
+                       Z_ARRVAL_P(pDestination),
                        &p_destination_item,
                        sizeof(zval *),
                        NULL);

diff --git a/ext/satellite/object.c b/ext/satellite/object.c
index ac12a60b5cc1528922b70225c04eb4d141b9a343..9c8dbe40b7bf3c0fa5c412685cd5de019ad6970e 100644 (file)
--- a/ext/satellite/object.c
+++ b/ext/satellite/object.c
@@ -148,12 +148,12 @@ static zend_bool OrbitObject_InitializeData(OrbitObject * pObject, const char *
 
        /* find type info */
        pObject->mpInterface = 
-               TypeManager_FindInterface(pObject->mCorbaOZ_TYPE_P(bject)_id);
+               TypeManager_FindInterface(pObject->mCorbaObject->type_id);
 
        if (pObject->mpInterface == NULL)
        {
                zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
-                               pObject->mCorbaOZ_TYPE_P(bject)_id);
+                               pObject->mCorbaObject->type_id);
                /* TODO: set exception */
                goto error;
        }
@@ -188,7 +188,7 @@ static void OrbitObject_Wakeup(INTERNAL_FUNCTION_PARAMETERS)
                goto error;
        }
 
-       if (Z_TYPE_PP(pp_ior) != IS_STRING)
+       if ((*pp_ior)->type != IS_STRING)
        {
                /* TODO: set exception */
                goto error;
@@ -197,7 +197,7 @@ static void OrbitObject_Wakeup(INTERNAL_FUNCTION_PARAMETERS)
        /* initialize data */
        if (!OrbitObject_InitializeData(
                                p_object, 
-                               Z_STRVAL_PP(pp_ior)))
+                               (*pp_ior)->value.str.val))
        {
                goto error;
        }
@@ -233,12 +233,12 @@ zend_bool OrbitObject_Create(CORBA_Object source, zval * pDestination)
        
        /* find type info */
        p_object->mpInterface = 
-               TypeManager_FindInterface(p_object->mCorbaOZ_TYPE_P(bject)_id);
+               TypeManager_FindInterface(p_object->mCorbaObject->type_id);
 
        if (p_object->mpInterface == NULL)
        {
                zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
-                               p_object->mCorbaOZ_TYPE_P(bject)_id);
+                               p_object->mCorbaObject->type_id);
                goto error;
        }
 
@@ -277,7 +277,7 @@ zend_bool  OrbitObject_Constructor(OrbitObject  ** ppObject,
        }
 
        /* validate parameter types */
-       if (ppPZ_TYPE_P(arameters[0]) != IS_STRING)
+       if (Z_TYPE_P(ppParameters[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,
-                       ppPZ_STRVAL_P(arameters[0])) )
+                       Z_STRVAL_P(ppParameters[0])) )
        {
                goto error;
        }
@@ -511,7 +511,7 @@ zend_bool  OrbitObject_CallFunction(OrbitObject  * pObject,
        {
                /* no such operation */
                zend_error(E_WARNING, "(Satellite) unknown operation name '%s' in interface '%s'",
-                               pFunctionName, pObject->mCorbaOZ_TYPE_P(bject)_id);
+                               pFunctionName, pObject->mCorbaObject->type_id);
                goto error;
        }
 
@@ -660,7 +660,7 @@ zend_bool  OrbitObject_PutProperty(OrbitObject  * pObject,
                /*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
                /* no such atttribute */
                zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface '%s'",
-                               pPropertyName, pObject->mCorbaOZ_TYPE_P(bject)_id);
+                               pPropertyName, pObject->mCorbaObject->type_id);
                goto OrbitObject_PutProperty_error;
        }
 
@@ -776,7 +776,7 @@ zend_bool  OrbitObject_GetProperty(OrbitObject  * pObject,
                /*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
                /* no such atttribute */
                zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface '%s'",
-                               pPropertyName, pObject->mCorbaOZ_TYPE_P(bject)_id);
+                               pPropertyName, pObject->mCorbaObject->type_id);
                goto OrbitObject_GetProperty_error;
        }
 

diff --git a/ext/satellite/struct.c b/ext/satellite/struct.c
index 6c85af2d0a856850ac3d50141483113637f2da69..1bf3e3bfc22e1219530b9190ca6d629d9e05fe0d 100644 (file)
--- a/ext/satellite/struct.c
+++ b/ext/satellite/struct.c
@@ -240,11 +240,11 @@ zend_bool  OrbitStruct_Constructor(OrbitStruct  ** ppStruct,
        }
 
        /* validate parameter types */
-       if (ppPZ_TYPE_P(arameters[0]) != IS_STRING)
+       if (Z_TYPE_P(ppParameters[0]) != IS_STRING)
                goto error;
        
        /* initialize struct */
-       if (!OrbitStruct_Initialize(ppPZ_STRVAL_P(arameters[0]), p_struct))
+       if (!OrbitStruct_Initialize(Z_STRVAL_P(ppParameters[0]), p_struct))
                goto error;
        
        *ppStruct = p_struct;

diff --git a/ext/satellite/typecode.c b/ext/satellite/typecode.c
index 056da4f9d4041e3900a5209173514e2ab76f3e81..7a3544e5675223d4acf3dd7cd43436393ce5bdb5 100644 (file)
--- a/ext/satellite/typecode.c
+++ b/ext/satellite/typecode.c
@@ -141,9 +141,9 @@ static CORBA_StructMemberSeq * orbit_create_member_sequence(IDL_tree member_list
                        char * p_name = IDL_IDENT(IDL_LIST(declaration).data).str;
 
                        p_members->_buffer[i].name = CORBA_string_dup(p_name);
-                       Z_TYPE(p_members->_buffer[i]) = (CORBA_TypeCode)
+                       p_members->_buffer[i].type = (CORBA_TypeCode)
                                CORBA_Object_duplicate((CORBA_Object)type_code, orbit_get_environment());
-                       Z_TYPE(p_members->_buffer[i])_def = NULL; /* XXX */
+                       p_members->_buffer[i].type_def = NULL; /* XXX */
 
                        i++;
                } while ((declaration = IDL_LIST(declaration).next));

diff --git a/ext/satellite/zval_to_namedvalue.c b/ext/satellite/zval_to_namedvalue.c
index 887f4b0eac1e858f93cf1d736580ee01ac3c30b5..8fd35d157ba0a415a9cb3cdd50b888dd6d84c4c2 100644 (file)
--- a/ext/satellite/zval_to_namedvalue.c
+++ b/ext/satellite/zval_to_namedvalue.c
@@ -49,10 +49,10 @@ static zend_bool satellite_zval_to_namedvalue_boolean(const zval * pSource,
        if (pSource == NULL)
                return TRUE;
                
-       if (pSZ_TYPE_P(ource) != IS_BOOL && pSZ_TYPE_P(ource) != IS_LONG)
+       if (Z_TYPE_P(pSource) != IS_BOOL && Z_TYPE_P(pSource) != IS_LONG)
                return FALSE;
 
-       *p_value = pSZ_LVAL_P(ource) != 0;
+       *p_value = Z_LVAL_P(pSource) != 0;
 
        return TRUE;
 }
@@ -72,10 +72,10 @@ static zend_bool satellite_zval_to_namedvalue_double(const zval * pSource,
                return TRUE;
                
        /*convert_to_double(pSource);*/
-       if (pSZ_TYPE_P(ource) != IS_DOUBLE)
+       if (Z_TYPE_P(pSource) != IS_DOUBLE)
                return FALSE;
 
-       *p_value = pSZ_DVAL_P(ource);
+       *p_value = Z_DVAL_P(pSource);
 
        return TRUE;
 }
@@ -93,10 +93,10 @@ static zend_bool satellite_zval_to_namedvalue_long(const zval * pSource,
                return TRUE;
        
        convert_to_long((zval*)pSource);        /* so long "const" */
-       if (pSZ_TYPE_P(ource) != IS_LONG)
+       if (Z_TYPE_P(pSource) != IS_LONG)
                return FALSE;
 
-       *p_value = pSZ_LVAL_P(ource);
+       *p_value = Z_LVAL_P(pSource);
 
        return TRUE;
 }
@@ -114,13 +114,13 @@ static zend_bool satellite_zval_to_namedvalue_short(const zval * pSource,
                return TRUE;
        
 /*     convert_to_long((zval *)pSource);*/     /* discard const */;
-       if (pSZ_TYPE_P(ource) != IS_LONG)
+       if (Z_TYPE_P(pSource) != IS_LONG)
        {
-/*             printf("source value type is %i in satellite_zval_to_namedvalue_short\n", pSZ_TYPE_P(ource));*/
+/*             printf("source value type is %i in satellite_zval_to_namedvalue_short\n", Z_TYPE_P(pSource));*/
                return FALSE;
        }
 
-       *p_value = pSZ_LVAL_P(ource);
+       *p_value = Z_LVAL_P(pSource);
 
        return TRUE;
 }
@@ -141,7 +141,7 @@ static zend_bool satellite_zval_to_namedvalue_objref(const zval * pSource,
        if (pSource == NULL)
                return TRUE; /* nothing else to do */
 
-       if (pSZ_TYPE_P(ource) != IS_OBJECT)
+       if (Z_TYPE_P(pSource) != IS_OBJECT)
                goto error;
 
        /* see that it's a corba object */
@@ -187,10 +187,10 @@ static zend_bool satellite_zval_to_namedvalue_sequence(const zval * pSource,
        if (pSource == NULL)
                return TRUE;    /* nothing to do */
 
-       if (pSZ_TYPE_P(ource) != IS_ARRAY)
+       if (Z_TYPE_P(pSource) != IS_ARRAY)
                goto error;     /* bad source type */
 
-       p_hashtable = pSZ_ARRVAL_P(ource);
+       p_hashtable = Z_ARRVAL_P(pSource);
        member_count = zend_hash_num_elements(p_hashtable);
 
        /* prepare sequence octet */
@@ -268,14 +268,14 @@ static zend_bool satellite_zval_to_namedvalue_string(const zval * pSource,
 
 #if 0
        convert_to_string((zval *)pSource);     /* discard const */
-       if (pSZ_TYPE_P(ource) == IS_NULL)
+       if (Z_TYPE_P(pSource) == IS_NULL)
                return TRUE;    /* do nothing */
 #endif
        
-       if (pSZ_TYPE_P(ource) != IS_STRING)
+       if (Z_TYPE_P(pSource) != IS_STRING)
                goto error;
 
-       *p_value                                                = CORBA_string_dup(pSZ_STRVAL_P(ource));
+       *p_value                                                = CORBA_string_dup(Z_STRVAL_P(pSource));
        pDestination->len               = strlen(*p_value);
 
        return TRUE;
@@ -304,7 +304,7 @@ static zend_bool satellite_zval_to_namedvalue_struct(const zval * pSource,
                return TRUE;
 
        /* see that it's an object */
-       if (pSZ_TYPE_P(ource) != IS_OBJECT)
+       if (Z_TYPE_P(pSource) != IS_OBJECT)
                goto error; /* bad source type */
 
        /* see that it's a structure object */