[RCFILE] Fixed some missing box_free/box_strdup in rcfile

1 files changed, 11 insertions, 11 deletions

diff --git a/src/tools/rcfile.c b/src/tools/rcfile.c
index e2e14d3b..fd9468a9 100644
--- a/src/tools/rcfile.c
+++ b/src/tools/rcfile.c
@@ -291,9 +291,9 @@ static void clearParam(my_params_t* param)
     #define CENTRYBOOL(NAME, name) 
     #define ENTRYINT(NAME, name, minval, maxval, bits) 
     #define ENTRYINTPOS(NAME, name) 
-    #define ENTRYSTRING(NAME, name) free(param->name); 
-    #define ENTRYSTRING_(NAME, name) free(param->name); 
-    #define ENTRYDSTRING(NAME, name) free(param->name); 
+    #define ENTRYSTRING(NAME, name) box_free(param->name); 
+    #define ENTRYSTRING_(NAME, name) box_free(param->name); 
+    #define ENTRYDSTRING(NAME, name) box_free(param->name); 
     #define ENTRYADDR(NAME, name) 
     #define ENTRYULONG(NAME, name) 
     SUPER()
@@ -396,7 +396,7 @@ void LoadRCFile(const char* filename)
                 decor = 1;
             // prepare a new entry
             memset(&current_param, 0, sizeof(current_param));
-            free(current_name);
+            box_free(current_name);
             current_name = LowerCase(line+decor);
             *(strchr(current_name, ']')+1-decor) = '\0';
             trimString(current_name);
@@ -430,7 +430,7 @@ void LoadRCFile(const char* filename)
             #define ENTRYSTRING(NAME, name)                             \
                 else if(!strcmp(key, #NAME)) {                          \
                     current_param.is_##name##_present = 1;              \
-                    if(current_param.name) free(current_param.name);    \
+                    if(current_param.name) box_free(current_param.name);\
                     current_param.name = box_strdup(val);               \
                 }
             #define ENTRYSTRING_(NAME, name) ENTRYSTRING(NAME, name)
@@ -474,9 +474,9 @@ void LoadRCFile(const char* filename)
     // last entry to be pushed too
     if(current_name) {
         addParam(current_name, &current_param, (decor==2));
-        free(current_name);
+        box_free(current_name);
     }
-    free(line);
+    box_free(line);
     fclose(f);
     printf_log(LOG_INFO, "Params database has %d entries\n", kh_size(params));
 }
@@ -491,7 +491,7 @@ void DeleteParams()
     // need to free duplicated strings
     kh_foreach_value_ref(params, p, clearParam(p));
     const char* key;
-    kh_foreach_key(params, key, free((void*)key));
+    kh_foreach_key(params, key, box_free((void*)key));
     // free the hash itself
     kh_destroy(params, params);
     params = NULL;
@@ -537,7 +537,7 @@ void ApplyParams(const char* name)
             if(strstr(lname, k2))
                 internal_ApplyParams(name, param);
         )
-        free(lname);
+        box_free(lname);
     }
     if(k1 == kh_end(params))
         return;
@@ -562,7 +562,7 @@ void internal_ApplyParams(const char* name, const my_params_t* param) {
     #define ENTRYINTPOS(NAME, name) if(param->is_##name##_present) {name = param->name; printf_log(LOG_INFO, "Applying %s=%d\n", #NAME, param->name);}
     #define ENTRYSTRING(NAME, name) if(param->is_##name##_present) {name = param->name; printf_log(LOG_INFO, "Applying %s=%s\n", #NAME, param->name);}
     #define ENTRYSTRING_(NAME, name)  
-    #define ENTRYDSTRING(NAME, name) if(param->is_##name##_present) {if(name) free(name); name = box_strdup(param->name); printf_log(LOG_INFO, "Applying %s=%s\n", #NAME, param->name);}
+    #define ENTRYDSTRING(NAME, name) if(param->is_##name##_present) {if(name) box_free(name); name = box_strdup(param->name); printf_log(LOG_INFO, "Applying %s=%s\n", #NAME, param->name);}
     #define ENTRYADDR(NAME, name) if(param->is_##name##_present) {name = param->name; printf_log(LOG_INFO, "Applying %s=%zd\n", #NAME, param->name);}
     #define ENTRYULONG(NAME, name) if(param->is_##name##_present) {name = param->name; printf_log(LOG_INFO, "Applying %s=%lld\n", #NAME, param->name);}
     SUPER()
@@ -657,7 +657,7 @@ void internal_ApplyParams(const char* name, const my_params_t* param) {
     }
     if(param->is_bash_present && FileIsX64ELF(param->bash)) {
         if(my_context->bashpath)
-            free(my_context->bashpath);
+            box_free(my_context->bashpath);
         my_context->bashpath = box_strdup(param->bash);
         printf_log(LOG_INFO, "Applying %s=%s\n", "BOX64_BASH", param->bash);
     }