code cleaning

Author: Frederick888

bdict.cc

@@ -18,12 +18,12 @@ bdict::bdict(const bdict *that) : bitem() {
     for(zend_hash_internal_pointer_reset(that->_data);
             zend_hash_has_more_elements(that->_data) == SUCCESS;
             zend_hash_move_forward(that->_data)) {
-        zval temp;
-        ZVAL_OBJ(&temp, zend_container::bnode_object_clone(zend_hash_get_current_data(that->_data)));
+        zval tmp;
+        ZVAL_OBJ(&tmp, zend_container::bnode_object_clone(zend_hash_get_current_data(that->_data)));
         zend_string *_str_index;
         zend_ulong _num_index;
         zend_hash_get_current_key(that->_data, &_str_index, &_num_index);
-        zend_hash_add(_data, _str_index, &temp);
+        zend_hash_add(_data, _str_index, &tmp);
     }
 }
 
@@ -55,9 +55,9 @@ bool bdict::has(const std::string &key) const {
 }
 
 void bdict::set(const std::string &key, zval *value) {
-    //zval temp;
-    //temp = *value;
-    //zval_copy_ctor(&temp);
+    //zval tmp;
+    //tmp = *value;
+    //zval_copy_ctor(&tmp);
     std::string class_name = zend_container::bnode_object_get_class_name(value);
     zend_object *clone_object = NULL;
     if (class_name == "bdict" || class_name == "blist" ||
@@ -66,12 +66,12 @@ void bdict::set(const std::string &key, zval *value) {
     } else {
         return;
     }
-    zval temp;
-    ZVAL_OBJ(&temp, clone_object);
+    zval tmp;
+    ZVAL_OBJ(&tmp, clone_object);
     if (zend_hash_str_exists(_data, key.c_str(), key.length())) {
-        zend_hash_str_update(_data, key.c_str(), key.length(), &temp);
+        zend_hash_str_update(_data, key.c_str(), key.length(), &tmp);
     } else {
-        zend_hash_str_add(_data, key.c_str(), key.length(), &temp);
+        zend_hash_str_add(_data, key.c_str(), key.length(), &tmp);
     }
 }
 

bencode.cc

@@ -555,7 +555,7 @@ PHP_MINIT_FUNCTION(bencode)
 {
     REGISTER_INI_ENTRIES();
 
-    char *ini_ns_key = zend_container::get_cstring("bencode.namespace");
+    char *ini_ns_key = estrdup("bencode.namespace");
     zend_bool ini_ns = zend_ini_long(ini_ns_key, strlen(ini_ns_key), 0);
     efree(ini_ns_key);
     do {
@@ -584,17 +584,12 @@ PHP_MSHUTDOWN_FUNCTION(bencode)
     return SUCCESS;
 }
 
-static zend_function_entry bencode_functions[] = {
-    PHP_FE(bencode_hello, NULL)
-    {NULL, NULL, NULL}
-};
-
 zend_module_entry bencode_module_entry = {
 #if ZEND_MODULE_API_NO >= 20010901
     STANDARD_MODULE_HEADER,
 #endif
     PHP_BENCODE_EXTNAME,
-    bencode_functions,          //FUNCTIONS
+    NULL,                       //FUNCTIONS
     PHP_MINIT(bencode),         //PHP_MINIT
     PHP_MSHUTDOWN(bencode),     //PHP_MSHUTDOWN(bencode),
     NULL,                       //PHP_RINIT(bencode),
@@ -611,9 +606,3 @@ extern "C" {
 ZEND_GET_MODULE(bencode)
 }
 #endif
-
-PHP_FUNCTION(bencode_hello)
-{
-    php_printf("hello bencode!\n");
-    RETURN_TRUE;
-}

blist.cc

@@ -18,12 +18,12 @@ blist::blist(const blist *that) : bitem() {
     for(zend_hash_internal_pointer_reset(that->_data);
             zend_hash_has_more_elements(that->_data) == SUCCESS;
             zend_hash_move_forward(that->_data)) {
-        zval temp;
-        ZVAL_OBJ(&temp, zend_container::bnode_object_clone(zend_hash_get_current_data(that->_data)));
+        zval tmp;
+        ZVAL_OBJ(&tmp, zend_container::bnode_object_clone(zend_hash_get_current_data(that->_data)));
         zend_string *_str_index;
         zend_ulong _num_index;
         zend_hash_get_current_key(that->_data, &_str_index, &_num_index);
-        zend_hash_index_add(_data, _num_index, &temp);
+        zend_hash_index_add(_data, _num_index, &tmp);
     }
 }
 
@@ -63,9 +63,9 @@ void blist::add(zval *value) {
     } else {
         return;
     }
-    zval temp;
-    ZVAL_OBJ(&temp, clone_object);
-    zend_hash_next_index_insert(_data, &temp);
+    zval tmp;
+    ZVAL_OBJ(&tmp, clone_object);
+    zend_hash_next_index_insert(_data, &tmp);
 }
 
 void blist::set(const size_t &key, zval *value) {
@@ -77,12 +77,12 @@ void blist::set(const size_t &key, zval *value) {
     } else {
         return;
     }
-    zval temp;
-    ZVAL_OBJ(&temp, clone_object);
+    zval tmp;
+    ZVAL_OBJ(&tmp, clone_object);
     if (zend_hash_index_exists(_data, key)) {
-        zend_hash_index_update(_data, key, &temp);
+        zend_hash_index_update(_data, key, &tmp);
     } else {
-        zend_hash_next_index_insert(_data, &temp);
+        zend_hash_next_index_insert(_data, &tmp);
     }
 }
 

bstr.cc

@@ -57,8 +57,7 @@ zval * bstr::to_array(const bool include_meta) const {
         char *_type_data = estrdup("bstr");
         char *_length = estrdup("_length");
         char *_data = estrdup("_data");
-        char *_data_data = (char *)emalloc(_value.length());
-        strcpy(_data_data, _value.c_str());
+        char *_data_data = zend_container::get_cstring(_value);
         add_assoc_string(zv, _type, _type_data);
         add_assoc_long(zv, _length, length());
         add_assoc_string(zv, _data, _data_data);
@@ -68,8 +67,7 @@ zval * bstr::to_array(const bool include_meta) const {
         efree(_data);
         efree(_data_data);
     } else {
-        char *tmp = (char *)emalloc(_value.length());
-        strcpy(tmp, _value.c_str());
+        char *tmp = zend_container::get_cstring(_value);
         ZVAL_STRING(zv, tmp);
         efree(tmp);
     }

php_bencode.h

@@ -14,7 +14,6 @@ extern "C" {
 
 PHP_MINIT_FUNCTION(bencode);
 PHP_MSHUTDOWN_FUNCTION(bencode);
-PHP_FUNCTION(bencode_hello);
 
 extern zend_module_entry bencode_module_entry;
 #define phpext_bencode_ptr &bencode_module_entry