[srm-cvs] CVS Update: - Fix warnings

Date: Sat Jan 18 23:39:31 CET 2003
User: Derick Rethans
Directory: php_srm

Log Message:
 [0.25]
 - Fix warnings
 
Modified files:
           php_srm/srm.c (version: 1.44)
           php_srm/srm_util.c (version: 1.15)
           php_srm/srm_util.h (version: 1.5)

[FILE: /php_srm/srm.c]

--- php_srm/srm.c:1.43 Mon Jan 13 08:19:23 2003 GMT
+++ php_srm/srm.c Sat Jan 18 21:39:31 2003 GMT
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.43 2003/01/13 09:19:23 derick Exp $ */
+/* $Id: cvstemp,v 1.44 2003/01/18 22:39:31 derick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,6 +59,9 @@
 #define FETCH_CONN_ID(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type) \
         rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type);
 
+#define SRM_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type) \
+ rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type);
+
 
 /* {{{ Helper functions for Object Overloading */
 /* {{{ get_properry_name (list, nr)
@@ -197,8 +200,6 @@
                         result = srmval_to_zval(ret_val, 1 TSRMLS_CC);
                         *return_value = *result;
 
-#warning fixme!
-// efree(result);
                         zval_dtor(&function_name->element);
                 }
         } else {
@@ -449,7 +450,6 @@
         srm_value *ret_val;
         zval **conn_id;
         zval **handle;
- zval *return_value; /* dummy for ZEND_FETCH_RESOURCE */
         srm_llist* params_ll;
         struct srm_value* params;
         int return_val = FALSE;
@@ -485,7 +485,10 @@
         }
 
         /* Get connection data */
- ZEND_FETCH_RESOURCE(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
+ SRM_FETCH_RESOURCE(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
+ if (!connect_data) {
+ goto ret;
+ }
 
         /* Build request */
         SRM_LIST_INIT(params);
@@ -525,7 +528,6 @@
         srm_value *ret_val;
         zval **conn_id;
         zval **handle;
- zval *return_value; /* dummy for ZEND_FETCH_RESOURCE */
         srm_llist* params_ll;
         struct srm_value* params;
 
@@ -560,7 +562,10 @@
         }
 
         /* Get connection data */
- ZEND_FETCH_RESOURCE(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
+ SRM_FETCH_RESOURCE(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
+ if (!connect_data) {
+ goto ret;
+ }
 
         /* Build request */
         SRM_LIST_INIT(params);

[FILE: /php_srm/srm_util.c]

--- php_srm/srm_util.c:1.14 Wed Aug 28 01:42:38 2002 GMT
+++ php_srm/srm_util.c Sat Jan 18 21:39:31 2003 GMT
@@ -13,16 +13,16 @@
    | license@php.net so we can mail you a copy immediately. |
    +----------------------------------------------------------------------+
    | Authors: |
- | Mathieu Kooiman <mathieu@vl-srm.net> |
+ | Mathieu Kooiman <mathieu@vl-srm.net> |
    | Derick Rethans <derick@vl-srm.net> |
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.14 2002/08/28 03:42:38 sniper Exp $ */
+/* $Id: cvstemp,v 1.15 2003/01/18 22:39:31 derick Exp $ */
 
 #include "php.h"
-#include "srm_util.h"
 #include <srm_client.h>
+#include "srm_util.h"
 
 srm_value *zval_to_srmval (zval *value)
 {

[FILE: /php_srm/srm_util.h]

--- php_srm/srm_util.h:1.4 Wed Jun 19 23:17:47 2002 GMT
+++ php_srm/srm_util.h Sat Jan 18 21:39:31 2003 GMT
@@ -13,12 +13,12 @@
    | license@php.net so we can mail you a copy immediately. |
    +----------------------------------------------------------------------+
    | Authors: |
- | Mathieu Kooiman <mathieu@vl-srm.net> |
+ | Mathieu Kooiman <mathieu@vl-srm.net> |
    | Derick Rethans <derick@vl-srm.net> |
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.4 2002/06/20 01:17:47 sniper Exp $ */
+/* $Id: cvstemp,v 1.5 2003/01/18 22:39:31 derick Exp $ */
 
 #ifndef __SRM_UTIL_H__
 #define __SRM_UTIL_H__
@@ -28,5 +28,8 @@
                 (x)->type ^= SRM_VALUE_ERROR; \
         else if ( ((x)->type & SRM_VALUE_WARNING) == SRM_VALUE_WARNING) \
                 (x)->type ^= SRM_VALUE_WARNING;
+
+srm_value *zval_to_srmval (zval *value);
+zval *srmval_to_zval (srm_value *value, int alloc TSRMLS_DC);
 
 #endif
Received on Sat Jan 18 23:39:35 2003