Changeset 182 for trunk/src

Timestamp:

03/17/10 02:41:17 (14 years ago)

Author:

tim

Message:

redesigned regfi logging API to utilize thread-local storage

Location:

trunk/src

Files:

• common.c (modified) (3 diffs)
• reglookup-recover.c (modified) (3 diffs)
• reglookup.c (modified) (4 diffs)

trunk/src/common.c

@@ -29 +29 @@
 const char* common_special_chars = ",\"\\";
 
-#define REGLOOKUP_VERSION "0.12.0"
+#define REGLOOKUP_VERSION "0.1?.0"
 
 #define REGLOOKUP_EXIT_OK       0
@@ -49 +49 @@
 {
   fprintf(stderr, message);
+  regfi_log_stop();
   exit(code);
 }
 
-void printMsgs(REGFI_FILE* f)
-{
-  char* msgs = regfi_get_messages(f);
+void printMsgs()
+{
+  char* msgs = regfi_log_get_str();
   if(msgs != NULL)
   {
@@ -62 +63 @@
 }
 
-void clearMsgs(REGFI_FILE* f)
-{
-  char* msgs = regfi_get_messages(f);
+void clearMsgs()
+{
+  char* msgs = regfi_log_get_str();
   if(msgs != NULL)
     free(msgs);

trunk/src/reglookup-recover.c

@@ -827 +827 @@
   }
 
+  if(print_verbose)
+    regfi_log_start(REGFI_LOG_ERROR|REGFI_LOG_WARN|REGFI_LOG_INFO);
+  else
+    regfi_log_start(REGFI_LOG_ERROR);
+
   f = regfi_alloc(fd);
   if(f == NULL)
@@ -833 +838 @@
     bailOut(REGLOOKUP_EXIT_NOINPUT, "ERROR: Failed to create REGFI_FILE structure.\n");
   }
-
-  if(print_verbose)
-    regfi_set_message_mask(f, REGFI_MSG_ERROR|REGFI_MSG_WARN|REGFI_MSG_INFO);
-  else
-    regfi_set_message_mask(f, REGFI_MSG_ERROR);
 
   if(print_header)
@@ -994 +994 @@
 
   regfi_free(f);
+  regfi_log_stop();
   close(fd);
 

trunk/src/reglookup.c

@@ -619 +619 @@
   registry_file = argv[argi];
 
+  if(print_verbose)
+    regfi_log_start(REGFI_LOG_INFO|REGFI_LOG_WARN|REGFI_LOG_ERROR);
+  else
+    regfi_log_start(REGFI_LOG_ERROR|REGFI_LOG_WARN);
+
   fd = openHive(registry_file);
   if(fd < 0)
@@ -625 +630 @@
     bailOut(REGLOOKUP_EXIT_NOINPUT, "");
   }
-
+    
   f = regfi_alloc(fd);
   if(f == NULL)
@@ -633 +638 @@
   }
 
-  if(print_verbose)
-    regfi_set_message_mask(f, REGFI_MSG_INFO|REGFI_MSG_WARN|REGFI_MSG_ERROR);
 
   /* XXX: add command line option to choose output encoding */
@@ -678 +681 @@
   regfi_iterator_free(iter);
   regfi_free(f);
+  regfi_log_stop();
   close(fd);