Changeset 81 for trunk/lib

Timestamp:

01/17/07 11:47:39 (18 years ago)

Author:

tim

Message:

Finished incorporating changes to reglookup to work with new regfi interface.

Compiles now, but is minimally tested.

Location:

trunk/lib

Files:

• Makefile (modified) (1 diff)
• regfi.c (modified) (10 diffs)
• void_stack.c (modified) (1 diff)

trunk/lib/Makefile

@@ -3 +3 @@
 ################################################################################
 
-FILES=regfio.o smb_deps.o void_stack.o
+FILES=regfi.o smb_deps.o void_stack.o
 
 all: $(FILES)
 
-regfio.o: regfio.c
-        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ regfio.c
+regfi.o: regfi.c
+        $(CC) $(CFLAGS) $(OPTS) $(INC) -c -o $@ regfi.c
 
 smb_deps.o: smb_deps.c

trunk/lib/regfi.c

@@ -6 +6 @@
  * Windows NT registry I/O library
  *
- * Copyright (C) 2005-2006 Timothy D. Morgan
+ * Copyright (C) 2005-2007 Timothy D. Morgan
  * Copyright (C) 2005 Gerald (Jerry) Carter
  *
@@ -25 +25 @@
  */
 
-#include "../include/regfio.h"
+#include "../include/regfi.h"
 
 
@@ -629 +629 @@
     nk->hbin->dirty = true;
   
-  nk->subkey_index = 0;
   return true;
 }
@@ -1516 +1515 @@
   {
     for(i=0; i < nk->num_values; i++)
-      regfi_value_free(nk->values[i]);
+    {
+      if(nk->values[i].valuename != NULL)
+        free(nk->values[i].valuename);
+      if(nk->values[i].data != NULL)
+        free(nk->values[i].data);
+    }
     free(nk->values);
   }
@@ -1533 +1537 @@
 /******************************************************************************
  *****************************************************************************/
-void regfi_value_free(REGF_VK_REC* vk)
-{
-  if(vk->valuename != NULL)
-    free(vk->valuename);
-  if(vk->data != NULL)
-    free(vk->data);  
-  
-  /* XXX: not freeing hbin because these are cached.  This needs to be reviewed. */
-  free(vk);
-}
-
-
-/******************************************************************************
- *****************************************************************************/
 REGFI_ITERATOR* regfi_iterator_new(REGF_FILE* fh)
 {
@@ -1554 +1544 @@
     return NULL;
 
-  root = regfi_rootkey(f);
+  root = regfi_rootkey(fh);
   if(root == NULL)
   {
@@ -1725 +1715 @@
 /******************************************************************************
  *****************************************************************************/
-REGF_NK_REC* regfi_iterator_cur_key(REGFI_ITERATOR* i);
+REGF_NK_REC* regfi_iterator_cur_key(REGFI_ITERATOR* i)
 {
   return i->cur_key;
@@ -1735 +1725 @@
 REGF_NK_REC* regfi_iterator_first_subkey(REGFI_ITERATOR* i)
 {
-  REGF_NK_REC* subkey;
-  REGF_HBIN* hbin;
-  
   i->cur_subkey = 0;
   return regfi_iterator_cur_subkey(i);
@@ -1821 +1808 @@
        && (strcasecmp(cur->valuename, value_name) == 0))
       found = true;
-    cur = retfi_iterator_next_value(i);
+    cur = regfi_iterator_next_value(i);
   }
 
@@ -1846 +1833 @@
   REGF_VK_REC* ret_val = NULL;
   if(i->cur_value < i->cur_key->num_values)
-    ret_val = i->cur_key->values[i];
+    ret_val = &(i->cur_key->values[i->cur_value]);
 
   return ret_val;

trunk/lib/void_stack.c

@@ -4 +4 @@
  * leaks. 
  *
- * Copyright (C) 2005 Timothy D. Morgan
+ * Copyright (C) 2005,2007 Timothy D. Morgan
  *
  * This program is free software; you can redistribute it and/or modify