steinm Wed Feb 12 06:18:42 2003 EDT
Modified files:
/php4/ext/hwapi hwapi.cpp
Log:
- Fixed compile errors and some oddities like missing strcmp
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.5 php4/ext/hwapi/hwapi.cpp:1.6
--- php4/ext/hwapi/hwapi.cpp:1.5 Sat Jan 18 19:45:40 2003
+++ php4/ext/hwapi/hwapi.cpp Wed Feb 12 06:18:42 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.5 2003/01/19 00:45:40 iliaa Exp $ */
+/* $Id: hwapi.cpp,v 1.6 2003/02/12 11:18:42 steinm Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -913,21 +913,24 @@
if(!strcmp(key, "objectIdentifier"))
in->setObjectIdentifier((*keydata)->value.str.val);
break;
- case IS_OBJECT:
+ case IS_OBJECT: {
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*keydata);
if(!strcmp(key, "object")) {
- if(!((*keydata)->value.obj.ce->name,
"hw_api_object")) {
+// if(!((*keydata)->value.obj.ce->name,
+"hw_api_object")) {
+ if(!(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setObject(*obj);
}
} else if(!strcmp(key, "parameters")) {
- if(!((*keydata)->value.obj.ce->name,
"hw_api_object")) {
+ if(!(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setParameters(*obj);
}
} else if(!strcmp(key, "content")) {
- if(!((*keydata)->value.obj.ce->name,
"hw_api_content")) {
+ if(!(ce->name, "hw_api_content")) {
HW_API_Content *obj;
obj = (HW_API_Content *)
php_hwapi_get_object(*keydata, le_hwapi_contentp);
in->setContent(*obj);
@@ -935,6 +938,7 @@
}
/* FIXME: HW_API_Object and HW_API_Content needs to be
handelt */
break;
+ }
case IS_ARRAY: {
HW_API_StringArray *sarr;
@@ -976,21 +980,23 @@
zend_hash_get_current_data(lht, (void **) &keydata);
zend_hash_get_current_key(lht, &key, &ind, 0);
switch((*keydata)->type) {
- case IS_OBJECT:
+ case IS_OBJECT: {
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*keydata);
if(!strcmp(key, "object")) {
- if(!strcmp((*keydata)->value.obj.ce->name,
"hw_api_object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setObject(*obj);
}
} else if(!strcmp(key, "parameters")) {
- if(!strcmp((*keydata)->value.obj.ce->name,
"hw_api_object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setParameters(*obj);
}
} else if(!strcmp(key, "content")) {
- if(!strcmp((*keydata)->value.obj.ce->name,
"hw_api_content")) {
+ if(!strcmp(ce->name, "hw_api_content")) {
HW_API_Content *obj;
obj = (HW_API_Content *)
php_hwapi_get_object(*keydata, le_hwapi_contentp);
in->setContent(*obj);
@@ -998,6 +1004,7 @@
}
/* FIXME: HW_API_Object and HW_API_Content needs to be
handelt */
break;
+ }
case IS_ARRAY: {
HW_API_StringArray *sarr;
@@ -1039,21 +1046,23 @@
zend_hash_get_current_data(lht, (void **) &keydata);
zend_hash_get_current_key(lht, &key, &ind, 0);
switch((*keydata)->type) {
- case IS_OBJECT:
+ case IS_OBJECT: {
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*keydata);
if(!strcmp(key, "object")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setObject(*obj);
}
} else if(!strcmp(key, "parameters")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setParameters(*obj);
}
} else if(!strcmp(key, "content")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Content")) {
+ if(!strcmp(ce->name, "hw_api_content")) {
HW_API_Content *obj;
obj = (HW_API_Content *)
php_hwapi_get_object(*keydata, le_hwapi_contentp);
in->setContent(*obj);
@@ -1061,6 +1070,7 @@
}
/* FIXME: HW_API_Object and HW_API_Content needs to be
handelt */
break;
+ }
case IS_ARRAY: {
HW_API_StringArray *sarr;
@@ -1110,15 +1120,17 @@
if(!strcmp(key, "parentIdentifier"))
in->setParentIdentifier((*keydata)->value.str.val);
break;
- case IS_OBJECT:
+ case IS_OBJECT: {
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*keydata);
if(!strcmp(key, "object")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setObject(*obj);
}
} else if(!strcmp(key, "parameters")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setParameters(*obj);
@@ -1126,6 +1138,7 @@
}
/* FIXME: HW_API_Object and HW_API_Content needs to be
handelt */
break;
+ }
case IS_ARRAY: {
HW_API_StringArray *sarr;
@@ -1171,15 +1184,17 @@
else if(!strcmp(key, "hint"))
in->setHint((*keydata)->value.str.val);
break;
- case IS_OBJECT:
+ case IS_OBJECT: {
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*keydata);
if(!strcmp(key, "object")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setObject(*obj);
}
} else if(!strcmp(key, "parameters")) {
- if(!((*keydata)->value.obj.ce->name,
"HW_API_Object")) {
+ if(!strcmp(ce->name, "hw_api_object")) {
HW_API_Object *obj;
obj = (HW_API_Object *)
php_hwapi_get_object(*keydata, le_hwapi_objectp);
in->setParameters(*obj);
@@ -1187,6 +1202,7 @@
}
/* FIXME: HW_API_Object and HW_API_Content needs to be
handelt */
break;
+ }
case IS_ARRAY: {
HW_API_StringArray *sarr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
