Changeset 203 for trunk/python2/regfi/pyregfi.h

Timestamp:

08/21/10 12:53:19 (14 years ago)

Author:

tim

Message:

misc fixes

stripped _REC from some data type names

File:

• trunk/python2/regfi/pyregfi.h (modified) (6 diffs)

trunk/python2/regfi/pyregfi.h

@@ -37 +37 @@
 struct TreeIterator_t;
 
-BIND_STRUCT(REGFI_NK_REC)
-BIND_STRUCT(REGFI_VK_REC)
+BIND_STRUCT(REGFI_NK)
+BIND_STRUCT(REGFI_VK)
 BIND_STRUCT(REGFI_DATA)
 
@@ -44 +44 @@
 CLASS(RawData, Object)
     const REGFI_DATA *data;
-    const REGFI_VK_REC *rec;
+    const REGFI_VK *rec;
 
-    RawData METHOD(RawData, Con, REGFI_DATA *data, REGFI_VK_REC *record);
+    RawData METHOD(RawData, Con, REGFI_DATA *data, REGFI_VK *record);
 
     /** Return the raw buffer as a string. By default we only return
@@ -73 +73 @@
                                    char **path, REGFI_ENCODING encoding);
 
-/*     struct ValueIterator_t *METHOD(TreeIterator, list_values);*/
-
      void METHOD(TreeIterator, __iter__);
      struct RegistryKey_t *METHOD(TreeIterator, iternext);
 
+
      int METHOD(TreeIterator, down);
      int METHOD(TreeIterator, up);
+
+     struct RegistryKey_t *METHOD(TreeIterator, current);
+     int METHOD(TreeIterator, to_root);
+
 END_CLASS
 
@@ -86 +89 @@
 CLASS(RegistryKey, Object)
      struct RegistryFile_t *file;
-     const REGFI_NK_REC *key;      /* XXX: temporary */
+     const REGFI_NK *key;
 
      struct RegistryKey_t *METHOD(RegistryKey, Con,
-                                  struct RegistryFile_t *file, REGFI_NK_REC *base_key);
+                                  struct RegistryFile_t *file, REGFI_NK *base_key);
 
      struct SubkeyIterator_t *METHOD(RegistryKey, subkeys);
@@ -104 +107 @@
      
      SubkeyIterator METHOD(SubkeyIterator, Con, 
-                           struct RegistryFile_t *file, REGFI_NK_REC *key);
+                           struct RegistryFile_t *file, REGFI_NK *key);
 
      void METHOD(SubkeyIterator, __iter__);
@@ -119 +122 @@
      
      ValueIterator METHOD(ValueIterator, Con, 
-                          struct RegistryFile_t *file, REGFI_NK_REC *key);
+                          struct RegistryFile_t *file, REGFI_NK *key);
 
      void METHOD(ValueIterator, __iter__);
-     REGFI_VK_REC *METHOD(ValueIterator, iternext);
+     REGFI_VK *METHOD(ValueIterator, iternext);
 END_CLASS