Changeset 109 for trunk/src/reglookup.c

Timestamp:

04/29/08 16:38:27 (16 years ago)

Author:

tim

Message:

reworked SK record caching to prevent unnecessary loads.

SK records now cached in iterators on an as-needed basis

File:

• trunk/src/reglookup.c (modified) (6 diffs)

trunk/src/reglookup.c

@@ -44 +44 @@
 
 /* Other globals */
+REGF_FILE* f;
 const char* key_special_chars = ",\"\\/";
 const char* subfield_special_chars = ",\"\\|";
@@ -621 +622 @@
 
 
-void printKey(const REGF_NK_REC* k, char* full_path)
+void printKey(REGFI_ITERATOR* i, char* full_path)
 {
   static char empty_str[1] = "";
@@ -631 +632 @@
   time_t tmp_time[1];
   struct tm* tmp_time_s = NULL;
+  const REGF_SK_REC* sk;
+  const REGF_NK_REC* k = regfi_iterator_cur_key(i);
 
   *tmp_time = nt_time_to_unix(&k->mtime);
@@ -636 +639 @@
   strftime(mtime, sizeof(mtime), "%Y-%m-%d %H:%M:%S", tmp_time_s);
 
-  if(print_security)
-  {
-    owner = regfi_get_owner(k->sec_desc->sec_desc);
-    group = regfi_get_group(k->sec_desc->sec_desc);
-    sacl = regfi_get_sacl(k->sec_desc->sec_desc);
-    dacl = regfi_get_dacl(k->sec_desc->sec_desc);
+  if(print_security && (sk=regfi_iterator_cur_sk(i)))
+  {
+    owner = regfi_get_owner(sk->sec_desc);
+    group = regfi_get_group(sk->sec_desc);
+    sacl = regfi_get_sacl(sk->sec_desc);
+    dacl = regfi_get_dacl(sk->sec_desc);
     if(owner == NULL)
       owner = empty_str;
@@ -692 +695 @@
       
       if(!type_filter_enabled || (key_type == type_filter))
-        printKey(cur, path);
+        printKey(iter, path);
       if(!type_filter_enabled || (key_type != type_filter))
         printValueList(iter, path);
@@ -838 +841 @@
 {
   char** path = NULL;
-  REGF_FILE* f;
   REGFI_ITERATOR* iter;
   int retr_path_ret;