Changeset 247 for trunk/ext

Timestamp:

03/04/2007 08:26:02 (21 months ago)

Author:

indeyets

Message:

removed merge-class (it was unused), added dtor to eliminate one of memleaks, added comments

Files:

• trunk/ext/php/phpext.c (modified) (10 diffs)

trunk/ext/php/phpext.c

@@ -1 +1 @@
 /**
  * phpext.c
- * 
+ *
  * $Author$
  * $Date$
- * 
+ *
  * Copyright (C) 2003 why the lucky stiff
  * Copyright © 2007 Alexey Zakhlestin <indeyets@gmail.com>
- * 
+ *
 **/
 #ifdef HAVE_CONFIG_H
@@ -51 +51 @@
 
 
-static double zero()    { return 0.0; }
-static double one()             { return 1.0; }
-static double inf()             { return one() / zero(); }
-static double nanphp()  { return zero() / zero(); }
+static double inline zero()             { return 0.0; }
+static double inline one()              { return 1.0; }
+static double inline inf()              { return one() / zero(); }
+static double inline nanphp()   { return zero() / zero(); }
 
 
@@ -99 +99 @@
  * "Merge" class
 **/
-static int le_mergekeyp;
+/*static int le_mergekeyp;
 zend_class_entry *merge_key_entry;
 
@@ -115 +115 @@
 {
 }
-
+*/
 
 /**
@@ -130 +130 @@
         syck_exception_entry = zend_register_internal_class_ex(&ce, php_syck_get_exception_base(TSRMLS_CC), PHP_SYCK_EXCEPTION_PARENT TSRMLS_CC);
 
-        le_mergekeyp = zend_register_list_destructors_ex(destroy_MergeKey_resource, NULL, "MergeKey", module_number);
+/*      le_mergekeyp = zend_register_list_destructors_ex(destroy_MergeKey_resource, NULL, "MergeKey", module_number);
         INIT_CLASS_ENTRY(ce, "mergekey", mergekey_functions);
         merge_key_entry = zend_register_internal_class(&ce TSRMLS_CC);
-
+*/
         return SUCCESS;
 }
@@ -194 +194 @@
                                 ZVAL_DOUBLE(o, -inf());
                         } else if (strcmp(n->type_id, "merge") == 0) {
-                                TSRMLS_FETCH();
-                                MAKE_STD_ZVAL(o);
+/* This thing doesn't work, anyway */
+/*                              TSRMLS_FETCH();
                                 object_init_ex(o, merge_key_entry);
-                        } else {
+*/                      } else {
                                 ZVAL_STRINGL(o, n->data.str->ptr, n->data.str->len, 1);
                         }
@@ -206 +206 @@
                         for (i = 0; i < n->data.list->idx; i++) {
                                 oid = syck_seq_read(n, i);
-                                syck_lookup_sym(p, oid, (char **) &o2);
+                                syck_lookup_sym(p, oid, (char **) &o2); /* retrieving child-node */
+
                                 add_index_zval(o, i, o2);
                         }
@@ -215 +216 @@
                         for (i = 0; i < n->data.pairs->idx; i++) {
                                 oid = syck_map_read(n, map_key, i);
-                                syck_lookup_sym(p, oid, (char **) &o2);
+                                syck_lookup_sym(p, oid, (char **) &o2); /* retrieving key-node */
+
                                 oid = syck_map_read(n, map_value, i);
-                                syck_lookup_sym(p, oid, (char **) &o3);
+                                syck_lookup_sym(p, oid, (char **) &o3); /* retrieving value-node */
+
                                 if (o2->type == IS_STRING) {
                                         add_assoc_zval(o, o2->value.str.val, o3);
@@ -225 +228 @@
         }
 
-        oid = syck_add_sym(p, (char *)o);
-        return oid;
+        return syck_add_sym(p, (char *)o); /* storing node */
 }
 
@@ -268 +270 @@
                 *return_value = *obj;
                 zval_copy_ctor(return_value);
+
+                zval_dtor(obj);
+                efree(obj);
         }