Changeset 150 for trunk/include

Timestamp:

03/01/09 21:17:46 (16 years ago)

Author:

tim

Message:

integrated talloc into most of the rest of the regfi library
fixed a length validation issue

Location:

trunk/include

Files:

• regfi.h (modified) (6 diffs)
• void_stack.h (modified) (2 diffs)

trunk/include/regfi.h

@@ -224 +224 @@
 
 
-/* Key Value */
+/* Value record */
 typedef struct 
 {
@@ -230 +230 @@
   uint32 cell_size;     /* ((start_offset - end_offset) & 0xfffffff8) */
 
-  REGFI_HBIN* hbin;     /* pointer to HBIN record (in memory) containing 
-                         * this nk record 
-                         */
   uint8* data;
+  char*  valuename;
   uint16 name_length;
-  char*  valuename;
   uint32 hbin_off;      /* offset from beginning of this hbin block */
   
@@ -420 +417 @@
 const REGFI_NK_REC*   regfi_iterator_cur_key(REGFI_ITERATOR* i);
 const REGFI_SK_REC*   regfi_iterator_cur_sk(REGFI_ITERATOR* i);
-const REGFI_NK_REC*   regfi_iterator_first_subkey(REGFI_ITERATOR* i);
-const REGFI_NK_REC*   regfi_iterator_cur_subkey(REGFI_ITERATOR* i);
-const REGFI_NK_REC*   regfi_iterator_next_subkey(REGFI_ITERATOR* i);
+
+REGFI_NK_REC*         regfi_iterator_first_subkey(REGFI_ITERATOR* i);
+REGFI_NK_REC*         regfi_iterator_cur_subkey(REGFI_ITERATOR* i);
+REGFI_NK_REC*         regfi_iterator_next_subkey(REGFI_ITERATOR* i);
 
 bool                  regfi_iterator_find_value(REGFI_ITERATOR* i, 
                                                 const char* value_name);
-const REGFI_VK_REC*   regfi_iterator_first_value(REGFI_ITERATOR* i);
-const REGFI_VK_REC*   regfi_iterator_cur_value(REGFI_ITERATOR* i);
-const REGFI_VK_REC*   regfi_iterator_next_value(REGFI_ITERATOR* i);
+REGFI_VK_REC*         regfi_iterator_first_value(REGFI_ITERATOR* i);
+REGFI_VK_REC*         regfi_iterator_cur_value(REGFI_ITERATOR* i);
+REGFI_VK_REC*         regfi_iterator_next_value(REGFI_ITERATOR* i);
 
 
@@ -471 +469 @@
  *   A newly allocated NK record structure, or NULL on failure.
  */
-REGFI_NK_REC*         regfi_parse_nk(REGFI_FILE* file, uint32 offset, 
+REGFI_NK_REC*         regfi_parse_nk(REGFI_FILE* file, uint32 offset,
                                      uint32 max_size, bool strict);
 
@@ -498 +496 @@
                                             uint32 max_size, bool strict);
 
+/* Dispose of previously parsed records */
+void                  regfi_free_key(REGFI_NK_REC* nk);
+void                  regfi_free_value(REGFI_VK_REC* vk);
+
+
 
 /************************************/
@@ -503 +506 @@
 /************************************/
 REGFI_NK_REC*         regfi_rootkey(REGFI_FILE* file);
-void                  regfi_key_free(REGFI_NK_REC* nk);
 void                  regfi_subkeylist_free(REGFI_SUBKEY_LIST* list);
 uint32                regfi_read(int fd, uint8* buf, uint32* length);

trunk/include/void_stack.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005,2007 Timothy D. Morgan
+ * Copyright (C) 2005,2007,2009 Timothy D. Morgan
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
  */
 
+#ifndef _VOID_STACK_H
+#define _VOID_STACK_H
+
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-
-#ifndef _VOID_STACK_H
-#define _VOID_STACK_H
+#include "talloc.h"
 
 typedef struct _void_stack