Changeset 203 for trunk/python2/regfi/regfi.c

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/regfi.c (modified) (9 diffs)

trunk/python2/regfi/regfi.c

@@ -82 +82 @@
 
 static RegistryKey RegistryKey_Con(RegistryKey self, 
-                                   RegistryFile file, REGFI_NK_REC* base_key)
+                                   RegistryFile file, REGFI_NK* base_key)
 {
   if(base_key == NULL)
@@ -191 +191 @@
 }
 
-
 static int TreeIterator_down(TreeIterator self) 
 {
@@ -205 +204 @@
 }
 
-/*
-static ValueIterator TreeIterator_list_values(TreeIterator self) 
-{
-  return CONSTRUCT(ValueIterator, ValueIterator, Con, NULL, self);
-}
-*/
+static RegistryKey TreeIterator_current(TreeIterator self)
+{
+  return CONSTRUCT(RegistryKey, RegistryKey, Con, NULL, self->file,
+                   regfi_iterator_cur_key(self->iter));
+}
+
+static int TreeIterator_to_root(TreeIterator self)
+{
+  return regfi_iterator_to_root(self->iter);
+}
+
 
 VIRTUAL(TreeIterator, Object) {
@@ -217 +221 @@
   VMETHOD(down) = TreeIterator_down;
   VMETHOD(up) = TreeIterator_up;
+  VMETHOD(current) = TreeIterator_current;
+  VMETHOD(to_root) = TreeIterator_to_root;
   VMETHOD(__iter__) = TreeIterator__iter__;
   /*  VMETHOD(list_values) = TreeIterator_list_values;*/
@@ -234 +240 @@
 static SubkeyIterator SubkeyIterator_Con(SubkeyIterator self, 
                                          struct RegistryFile_t* file, 
-                                         REGFI_NK_REC* key)
+                                         REGFI_NK* key)
 {
   /* XXX: add a talloc reference? */
@@ -256 +262 @@
 static RegistryKey SubkeyIterator_iternext(SubkeyIterator self)
 {
-  const REGFI_NK_REC* nk;
-
-  if(self->cur < self->list->num_keys)
+  const REGFI_NK* nk;
+
+  if(self->list != NULL && self->cur < self->list->num_keys)
   {
     /* XXX: can we switch to UTF-8 and have Python properly import that? */
@@ -291 +297 @@
 static ValueIterator ValueIterator_Con(ValueIterator self,
                                        struct RegistryFile_t* file, 
-                                       REGFI_NK_REC* key)
+                                       REGFI_NK* key)
 {
   /* XXX: add a talloc reference? */
@@ -312 +318 @@
 }
 
-static REGFI_VK_REC* ValueIterator_iternext(ValueIterator self)
-{
-  const REGFI_VK_REC* vk;
+static REGFI_VK* ValueIterator_iternext(ValueIterator self)
+{
+  const REGFI_VK* vk;
 
   if(self->list != NULL && self->cur < self->list->num_values)
@@ -386 +392 @@
 }
 
-static RawData RawData_Con(RawData self, REGFI_DATA *data, REGFI_VK_REC *record)
+static RawData RawData_Con(RawData self, REGFI_DATA *data, REGFI_VK *record)
 {
   self->rec = record;