Changeset 185 for test/regfi-threadtest.c

Timestamp:

03/22/10 22:22:07 (14 years ago)

Author:

tim

Message:

reworked logging API again to simplify interface

updated regfi-threadtest to work with more recent commits

File:

• test/regfi-threadtest.c (modified) (8 diffs)

test/regfi-threadtest.c

@@ -49 +49 @@
 void traverseValueList(REGFI_ITERATOR* iter)
 {
-  REGFI_VK_REC* value;
+  const REGFI_VK_REC* value;
 
   value = regfi_iterator_first_value(iter);
@@ -55 +55 @@
   {
     printMsgs(iter->f);
-    regfi_free_value(value);
+    regfi_free_record(value);
     value = regfi_iterator_next_value(iter);
   }
@@ -65 +65 @@
   const REGFI_NK_REC* root = NULL;
   const REGFI_NK_REC* cur = NULL;
-  REGFI_NK_REC* sub = NULL;
+  const REGFI_NK_REC* sub = NULL;
   const REGFI_SK_REC* sk;
   bool print_this = true;
@@ -116 +116 @@
       cur = regfi_iterator_cur_key(iter);
       printMsgs(iter->f);
-      regfi_free_key(sub);
+      regfi_free_record(sub);
 
       sub = regfi_iterator_first_subkey(iter);
@@ -131 +131 @@
 
 int num_iterations;
-void threadLoop(void* file)
+void* threadLoop(void* file)
 {
   REGFI_ITERATOR* iter;
   int i;
 
+  regfi_log_set_mask(REGFI_LOG_INFO|REGFI_LOG_WARN|REGFI_LOG_ERROR);
+
   iter = regfi_iterator_new((REGFI_FILE*)f, REGFI_ENCODING_ASCII);
   if(iter == NULL)
@@ -150 +152 @@
 
   regfi_iterator_free(iter);
+
+  return NULL;
 }
 
@@ -185 +189 @@
   registry_file = argv[argi];
 
-  regfi_log_start(REGFI_LOG_INFO|REGFI_LOG_WARN|REGFI_LOG_ERROR);
+  regfi_log_set_mask(REGFI_LOG_INFO|REGFI_LOG_WARN|REGFI_LOG_ERROR);
 
   fd = openHive(registry_file);
@@ -211 +215 @@
 
   regfi_free(f);
-  regfi_log_stop();
   close(fd);