Changeset 54 for trunk/src

Timestamp:

09/04/05 21:19:05 (19 years ago)

Author:

tim

Message:

Added some verbose output

code cleanup and minor bug fixes

File:

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

trunk/src/reglookup.c

@@ -184 +184 @@
 
   /* XXX: this MULTI_SZ parser is pretty inefficient.  Should be
-   *      redone with fewer malloc and better string concatenation. 
+   *      redone with fewer malloc calls and better string concatenation. 
    */
   case REG_MULTI_SZ:
@@ -317 +317 @@
   if (buf == NULL)
     return NULL;
-  buf[0] = '/';
-  buf[1] = '\0';
+  buf[0] = '\0';
 
   iter = void_stack_iterator_new(nk_stack);
@@ -472 +471 @@
 
 
-/* XXX: this function is god-awful.  Needs to be re-designed. */
+/* XXX: this function is awful.  Needs to be re-designed. */
 void printKeyTree(REGF_FILE* f, void_stack* nk_stack, char* prefix)
 {
@@ -479 +478 @@
   char* path = NULL;
   char* val_path = NULL;
-
   int key_type = regfio_type_str2val("KEY");
   
@@ -486 +484 @@
     cur->subkey_index = 0;
     path = stack2Path(nk_stack);
-    
+
+    if(print_verbose)
+    {
+      if(prefix[0] == '\0')
+        fprintf(stderr, "VERBOSE: Printing key tree under path: /\n");
+      else
+        fprintf(stderr, "VERBOSE: Printing key tree under path: %s\n",
+                prefix);
+    }
 
     val_path = (char*)malloc(strlen(prefix)+strlen(path)+1);
     sprintf(val_path, "%s%s", prefix, path);
+    if(val_path[0] == '\0')
+    {
+      val_path[0] = '/';
+      val_path[1] = '\0';
+    }
+
     if(!type_filter_enabled || (key_type == type_filter))
       printKey(cur, val_path);
-
     if(!type_filter_enabled || (key_type != type_filter))
       printValueList(cur, val_path);
@@ -527 +538 @@
     }
   }
+  if(print_verbose)
+    fprintf(stderr, "VERBOSE: Finished printing key tree.\n");
 }
 
@@ -559 +572 @@
   cur = (REGF_NK_REC*)void_stack_cur(nk_stack);
 
+  if(print_verbose)
+    fprintf(stderr, "VERBOSE: Beginning retrieval of specified path: %s\n", 
+            path_filter);
+
   while(void_stack_size(path_stack) > 1)
   {
@@ -575 +592 @@
       }
     }
+    if(print_verbose && !found_cur)
+      fprintf(stderr, "VERBOSE: Could not find KEY '%s' in specified path.\n", 
+              cur_str);
+
     free(cur_str);
-
     if(!found_cur)
       return 1;
@@ -583 +603 @@
   /* Last round, search value and key records */
   cur_str = (char*)void_stack_pop(path_stack);
+
+  if(print_verbose)
+    fprintf(stderr, "VERBOSE: Searching values for last component"
+                    " of specified path.\n");
 
   for(i=0; (i < cur->num_values); i++)
@@ -594 +618 @@
       if(path != NULL)
         free(path);
+
+      if(print_verbose)
+        fprintf(stderr, "VERBOSE: Found final path element as value.\n");
+
       return 0;
     }
   }
+
+  if(print_verbose)
+    fprintf(stderr, "VERBOSE: Searching keys for last component"
+                    " of specified path.\n");
 
   while((sub = regfio_fetch_subkey(f, cur)) != NULL)
@@ -611 +643 @@
       strcat(prefix, "/");
       strcat(prefix, sub->keyname);
+
+      if(print_verbose)
+        fprintf(stderr, "VERBOSE: Found final path element as key.\n");
+
       printKeyTree(f, sub_nk_stack, prefix);
+
       return 0;
     }
   }
+
+  if(print_verbose)
+    fprintf(stderr, "VERBOSE: Could not find last element of path.\n");
 
   return 1;