From 991af2d2f03fcc46ebe63cb007d2ef9c06daf9dd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Feb 2003 10:56:50 +0000 Subject: [PATCH] - Some functions with objects as its parameters didn't recognize them as such --- NEWS | 2 ++ ext/hwapi/hwapi.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 258c9d0cd8..6c34dc0800 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ? ? ??? 200?, Version 4.3.1 +- Fixed several errors in functions in hwapi extension. Passed objects + weren't handled properly. (Uwe) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. (Sebastian, Edin) - Improved dba extension (Marcus) diff --git a/ext/hwapi/hwapi.cpp b/ext/hwapi/hwapi.cpp index b08f9ae598..78eed38e8c 100644 --- a/ext/hwapi/hwapi.cpp +++ b/ext/hwapi/hwapi.cpp @@ -919,19 +919,19 @@ static HW_API_replace_In *make_HW_API_replace_In(zval *arg1) { break; case IS_OBJECT: if(!strcmp(key, "object")) { - if(!((*keydata)->value.obj.ce->name, "hw_api_object")) { + if(!strcmp((*keydata)->value.obj.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((*keydata)->value.obj.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((*keydata)->value.obj.ce->name, "hw_api_content")) { HW_API_Content *obj; obj = (HW_API_Content *) php_hwapi_get_object(*keydata, le_hwapi_contentp); in->setContent(*obj); @@ -1045,19 +1045,19 @@ static HW_API_insertDocument_In *make_HW_API_insertDocument_In(zval *arg1) { switch((*keydata)->type) { case IS_OBJECT: if(!strcmp(key, "object")) { - if(!((*keydata)->value.obj.ce->name, "HW_API_Object")) { + if(!strcmp((*keydata)->value.obj.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((*keydata)->value.obj.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((*keydata)->value.obj.ce->name, "hw_api_content")) { HW_API_Content *obj; obj = (HW_API_Content *) php_hwapi_get_object(*keydata, le_hwapi_contentp); in->setContent(*obj); @@ -1116,13 +1116,13 @@ static HW_API_insertCollection_In *make_HW_API_insertCollection_In(zval *arg1) { break; case IS_OBJECT: if(!strcmp(key, "object")) { - if(!((*keydata)->value.obj.ce->name, "HW_API_Object")) { + if(!strcmp((*keydata)->value.obj.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((*keydata)->value.obj.ce->name, "hw_api_object")) { HW_API_Object *obj; obj = (HW_API_Object *) php_hwapi_get_object(*keydata, le_hwapi_objectp); in->setParameters(*obj); @@ -1177,13 +1177,13 @@ static HW_API_insertAnchor_In *make_HW_API_insertAnchor_In(zval *arg1) { break; case IS_OBJECT: if(!strcmp(key, "object")) { - if(!((*keydata)->value.obj.ce->name, "HW_API_Object")) { + if(!strcmp((*keydata)->value.obj.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((*keydata)->value.obj.ce->name, "hw_api_object")) { HW_API_Object *obj; obj = (HW_API_Object *) php_hwapi_get_object(*keydata, le_hwapi_objectp); in->setParameters(*obj); -- 2.50.1