Changeset 184 for trunk/src

Timestamp:

03/20/10 13:50:44 (14 years ago)

Author:

tim

Message:

redesigned memory management to allow for multiple references to talloc-ed objects

Location:

trunk/src

Files:

• common.c (modified) (1 diff)
• reglookup-recover.c (modified) (3 diffs)
• reglookup.c (modified) (13 diffs)

trunk/src/common.c

@@ -163 +163 @@
  * value, and a non-NULL (*error_msg).
  */
-static char* data_to_ascii(REGFI_DATA* data, char** error_msg)
+static char* data_to_ascii(const REGFI_DATA* data, char** error_msg)
 {
   char* ret_val;

trunk/src/reglookup-recover.c

@@ -291 +291 @@
         {
           /* XXX: Need to add a warning here */
-          regfi_free_key(cur_ancestor);
+          regfi_free_record(cur_ancestor);
           void_stack_free(path_stack);
           return NULL;
@@ -303 +303 @@
         ret_val_size += path_element->len + 1;
 
-        regfi_free_key(cur_ancestor);
+        regfi_free_record(cur_ancestor);
       }
     }
@@ -631 +631 @@
 
  fail:
-  regfi_free_key(key);
+  regfi_free_record(key);
   return error_code;
 }

trunk/src/reglookup.c

@@ -54 +54 @@
 void printValue(REGFI_ITERATOR* iter, const REGFI_VK_REC* vk, char* prefix)
 {
-  REGFI_DATA* data;
+  const REGFI_DATA* data;
   char* quoted_value = NULL;
   char* quoted_name = NULL;
@@ -95 +95 @@
       fprintf(stderr, "WARN: While quoting value for '%s/%s', "
               "warning returned: %s\n", prefix, quoted_name, conv_error);
-    regfi_free_data(data);
+    regfi_free_record(data);
   }
 
@@ -275 +275 @@
 void printValueList(REGFI_ITERATOR* iter, char* prefix)
 {
-  REGFI_VK_REC* value;
+  const REGFI_VK_REC* value;
 
   value = regfi_iterator_first_value(iter);
@@ -282 +282 @@
     if(!type_filter_enabled || (value->type == type_filter))
       printValue(iter, value, prefix);
-    regfi_free_value(value);
+    regfi_free_record(value);
     value = regfi_iterator_next_value(iter);
     printMsgs(iter->f);
@@ -299 +299 @@
   char* quoted_classname;
   const REGFI_SK_REC* sk;
-  const REGFI_NK_REC* k = regfi_iterator_cur_key(iter);
-  REGFI_CLASSNAME* classname;
-
-  formatTime(&k->mtime, mtime);
+  const REGFI_NK_REC* key = regfi_iterator_cur_key(iter);
+  const REGFI_CLASSNAME* classname;
+
+  formatTime(&key->mtime, mtime);
 
   if(print_security && (sk=regfi_iterator_cur_sk(iter)))
@@ -310 +310 @@
     sacl = regfi_get_sacl(sk->sec_desc);
     dacl = regfi_get_dacl(sk->sec_desc);
+    regfi_free_record(sk);
+
     if(owner == NULL)
       owner = empty_str;
@@ -319 +321 @@
       dacl = empty_str;
 
-    classname = regfi_iterator_fetch_classname(iter, k);
+    classname = regfi_iterator_fetch_classname(iter, key);
     printMsgs(iter->f);
     if(classname != NULL)
@@ -343 +345 @@
     else
       quoted_classname = empty_str;
-    regfi_free_classname(classname);
+    regfi_free_record(classname);
 
     printMsgs(iter->f);
@@ -362 +364 @@
   else
     printf("%s,KEY,,%s\n", full_path, mtime);
+
+  regfi_free_record(key);
 }
 
@@ -369 +373 @@
   const REGFI_NK_REC* root = NULL;
   const REGFI_NK_REC* cur = NULL;
-  REGFI_NK_REC* sub = NULL;
+  const REGFI_NK_REC* sub = NULL;
   char* path = NULL;
   int key_type = regfi_type_str2val("KEY");
@@ -430 +434 @@
 
       cur = regfi_iterator_cur_key(iter);
-      regfi_free_key(sub);
+      regfi_free_record(sub);
       sub = regfi_iterator_first_subkey(iter);
       print_this = true;
@@ -453 +457 @@
 int retrievePath(REGFI_ITERATOR* iter, char** path)
 {
-  REGFI_VK_REC* value;
+  const REGFI_VK_REC* value;
   char* tmp_path_joined;
   const char** tmp_path;
@@ -508 +512 @@
       printValue(iter, value, tmp_path_joined);
 
-    regfi_free_value(value);
+    regfi_free_record(value);
     free(tmp_path);
     free(tmp_path_joined);