cvs: php4 /ext/satellite class.c object.c struct.c zval_to_namedvalue.c

eriksson Sun Aug 12 05:48:02 2001 EDT Modified files: /php4/ext/satellite class.c object.c struct.c zval_to_namedvalue.c Log: adjusted Satellite for Zend 2 Index: php4/ext/satellite/class.c diff -u php4/ext/satellite/class.c:1.5 php4/ext/satellite/class.c:1.6 --- php4/ext/satellite/class.c:1.5 Thu Aug 9 17:56:02 2001 +++ php4/ext/satellite/class.c Sun Aug 12 05:48:01 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: class.c,v 1.5 2001/08/09 21:56:02 eriksson Exp $ + * $Id: class.c,v 1.6 2001/08/12 09:48:01 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -138,7 +138,7 @@ INIT_PZVAL(orbit_data_handle); /* set reference count */ zend_hash_index_update( - php_object->value.obj.properties, /* hashtable */ + Z_OBJPROP_P(php_object), /* hashtable */ 0, /* hash??? */ &orbit_data_handle, /* data */ sizeof(pval *), /* data size */ @@ -160,7 +160,7 @@ /* get handle to corba data */ zend_hash_index_find( - php_object->value.obj.properties, /* hash table */ + Z_OBJPROP_P(php_object), /* hash table */ 0, /* hash??? */ (void **)&orbit_data_handle /* data */ ); Index: php4/ext/satellite/object.c diff -u php4/ext/satellite/object.c:1.7 php4/ext/satellite/object.c:1.8 --- php4/ext/satellite/object.c:1.7 Thu Aug 9 17:55:09 2001 +++ php4/ext/satellite/object.c Sun Aug 12 05:48:01 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: object.c,v 1.7 2001/08/09 21:55:09 eriksson Exp $ + * $Id: object.c,v 1.8 2001/08/12 09:48:01 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -179,7 +179,7 @@ /* find IOR property */ if (zend_hash_find( - this_ptr->value.obj.properties, + Z_OBJPROP_P(this_ptr), IOR_PROPERTY_KEY, sizeof(IOR_PROPERTY_KEY), (void**)&pp_ior) != SUCCESS) @@ -242,20 +242,7 @@ goto error; } - /* set zval members */ - pDestination->type = IS_OBJECT; - pDestination->is_ref = 1; - pDestination->refcount = 1; - - pDestination->value.obj.ce = &OrbitObject_class_entry; - pDestination->value.obj.properties = orbit_new(HashTable); - - zend_hash_init( - pDestination->value.obj.properties, /* hash table */ - 0, /* size */ - NULL, /* hash function */ - ZVAL_PTR_DTOR, /* destructor */ - 0); /* persistent */ + object_init_ex(pDestination, &OrbitObject_class_entry); /* save orbit data */ OrbitObject_SaveData(pDestination, p_object); Index: php4/ext/satellite/struct.c diff -u php4/ext/satellite/struct.c:1.6 php4/ext/satellite/struct.c:1.7 --- php4/ext/satellite/struct.c:1.6 Thu Aug 9 17:57:56 2001 +++ php4/ext/satellite/struct.c Sun Aug 12 05:48:02 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: struct.c,v 1.6 2001/08/09 21:57:56 eriksson Exp $ + * $Id: struct.c,v 1.7 2001/08/12 09:48:02 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -209,20 +209,7 @@ if (!OrbitStruct_Initialize(pId, p_struct)) goto error; - /* set zval members */ - pDestination->type = IS_OBJECT; - pDestination->is_ref = 1; - pDestination->refcount = 1; - - pDestination->value.obj.ce = &OrbitStruct_class_entry; - pDestination->value.obj.properties = orbit_new(HashTable); - - zend_hash_init( - pDestination->value.obj.properties, /* hash table */ - 0, /* size */ - NULL, /* hash function */ - ZVAL_PTR_DTOR, /* destructor */ - 0); /* persistent */ + object_init_ex(pDestination, &OrbitStruct_class_entry); /* save orbit data */ OrbitStruct_SaveData(pDestination, p_struct); Index: php4/ext/satellite/zval_to_namedvalue.c diff -u php4/ext/satellite/zval_to_namedvalue.c:1.4 php4/ext/satellite/zval_to_namedvalue.c:1.5 --- php4/ext/satellite/zval_to_namedvalue.c:1.4 Thu Aug 9 17:59:26 2001 +++ php4/ext/satellite/zval_to_namedvalue.c Sun Aug 12 05:48:02 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: zval_to_namedvalue.c,v 1.4 2001/08/09 21:59:26 eriksson Exp $ + * $Id: zval_to_namedvalue.c,v 1.5 2001/08/12 09:48:02 eriksson Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -145,7 +145,7 @@ goto error; /* see that it's a corba object */ - if (strcmp(pSource->value.obj.ce->name, "OrbitObject") != 0) + if (strcmp(Z_OBJCE_P(pSource)->name, "OrbitObject") != 0) goto error; /* bad class type */ pObject = OrbitObject_RetrieveData(pSource); @@ -308,7 +308,7 @@ goto error; /* bad source type */ /* see that it's a structure object */ - if (strcmp(pSource->value.obj.ce->name, "OrbitStruct") != 0) + if (strcmp(Z_OBJCE_P(pSource)->name, "OrbitStruct") != 0) goto error; /* bad class type */ /* get struct info */