steinm          Thu Feb 13 05:56:51 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4       NEWS 
    /php4/ext/hwapi     hwapi.cpp 
  Log:
  - Some functions with objects as its parameters didn't recognize them
    as such
  
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.81 php4/NEWS:1.1247.2.82
--- php4/NEWS:1.1247.2.81       Thu Feb 13 02:19:15 2003
+++ php4/NEWS   Thu Feb 13 05:56:49 2003
@@ -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)
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.2 php4/ext/hwapi/hwapi.cpp:1.2.2.1
--- php4/ext/hwapi/hwapi.cpp:1.2        Thu Oct 24 09:14:36 2002
+++ php4/ext/hwapi/hwapi.cpp    Thu Feb 13 05:56:50 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: hwapi.cpp,v 1.2 2002/10/24 13:14:36 sas Exp $ */
+/* $Id: hwapi.cpp,v 1.2.2.1 2003/02/13 10:56:50 steinm Exp $ */
 
 #include <stdlib.h>
 #include <errno.h>
@@ -919,19 +919,19 @@
                                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 @@
                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 @@
                                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 @@
                                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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to