cvs: php4 /ext/satellite enum.c namedvalue_to_zval.c object.c struct.c typecode.c zval_to_namedvalue.c

eriksson Wed Sep 26 07:09:09 2001 EDT Modified files: /php4/ext/satellite enum.c namedvalue_to_zval.c object.c struct.c typecode.c zval_to_namedvalue.c Log: Fixed Jeroen's macrofication

Index: php4/ext/satellite/enum.c diff -u php4/ext/satellite/enum.c:1.6 php4/ext/satellite/enum.c:1.7 --- php4/ext/satellite/enum.c:1.6 Tue Sep 25 18:48:42 2001 +++ php4/ext/satellite/enum.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: enum.c,v 1.6 2001/09/25 22:48:42 jeroen Exp $ + * $Id: enum.c,v 1.7 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -96,14 +96,14 @@ } /* 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; } Index: php4/ext/satellite/namedvalue_to_zval.c diff -u php4/ext/satellite/namedvalue_to_zval.c:1.6 php4/ext/satellite/namedvalue_to_zval.c:1.7 --- php4/ext/satellite/namedvalue_to_zval.c:1.6 Tue Sep 25 17:58:18 2001 +++ php4/ext/satellite/namedvalue_to_zval.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: namedvalue_to_zval.c,v 1.6 2001/09/25 21:58:18 jeroen Exp $ + * $Id: namedvalue_to_zval.c,v 1.7 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -153,7 +153,7 @@ /* 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); Index: php4/ext/satellite/object.c diff -u php4/ext/satellite/object.c:1.10 php4/ext/satellite/object.c:1.11 --- php4/ext/satellite/object.c:1.10 Tue Sep 25 18:48:42 2001 +++ php4/ext/satellite/object.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: object.c,v 1.10 2001/09/25 22:48:42 jeroen Exp $ + * $Id: object.c,v 1.11 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -148,12 +148,12 @@ /* 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 @@ 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 @@ /* initialize data */ if (!OrbitObject_InitializeData( p_object, - Z_STRVAL_PP(pp_ior))) + (*pp_ior)->value.str.val)) { goto error; } @@ -233,12 +233,12 @@ /* 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 @@ } /* 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 @@ /* initialize data object */ if ( !OrbitObject_InitializeData( p_object, - ppPZ_STRVAL_P(arameters[0])) ) + Z_STRVAL_P(ppParameters[0])) ) { goto error; } @@ -511,7 +511,7 @@ { /* 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 @@ /*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 @@ /*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; } Index: php4/ext/satellite/struct.c diff -u php4/ext/satellite/struct.c:1.8 php4/ext/satellite/struct.c:1.9 --- php4/ext/satellite/struct.c:1.8 Tue Sep 25 18:48:42 2001 +++ php4/ext/satellite/struct.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: struct.c,v 1.8 2001/09/25 22:48:42 jeroen Exp $ + * $Id: struct.c,v 1.9 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -240,11 +240,11 @@ } /* 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; Index: php4/ext/satellite/typecode.c diff -u php4/ext/satellite/typecode.c:1.6 php4/ext/satellite/typecode.c:1.7 --- php4/ext/satellite/typecode.c:1.6 Wed Sep 26 04:35:43 2001 +++ php4/ext/satellite/typecode.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: typecode.c,v 1.6 2001/09/26 08:35:43 jeroen Exp $ + * $Id: typecode.c,v 1.7 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -141,9 +141,9 @@ 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)); Index: php4/ext/satellite/zval_to_namedvalue.c diff -u php4/ext/satellite/zval_to_namedvalue.c:1.6 php4/ext/satellite/zval_to_namedvalue.c:1.7 --- php4/ext/satellite/zval_to_namedvalue.c:1.6 Tue Sep 25 17:58:19 2001 +++ php4/ext/satellite/zval_to_namedvalue.c Wed Sep 26 07:09:09 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: zval_to_namedvalue.c,v 1.6 2001/09/25 21:58:19 jeroen Exp $ + * $Id: zval_to_namedvalue.c,v 1.7 2001/09/26 11:09:09 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -49,10 +49,10 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #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 @@ 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 */