Changeset 272 for trunk

Timestamp:

07/14/11 14:06:31 (13 years ago)

Author:

tim

Message:

fixed name/flags bug
improved error reporting on bad key/value names

Location:

trunk

Files:

• lib/regfi.c (modified) (2 diffs)
• python/pyregfi/__init__.py (modified) (1 diff)

trunk/lib/regfi.c

@@ -1205 +1205 @@
     {
       regfi_log_add(REGFI_LOG_WARN, "Error occurred while converting"
-                        " value name to encoding %s.  Error message: %s",
-                        regfi_encoding_int2str(file->string_encoding),
-                        strerror(errno));
+                    " value name to encoding %s.  VK offset: 0x%.8X."
+                    "  Error message: %s",
+                    regfi_encoding_int2str(file->string_encoding),
+                    vk->offset, strerror(errno));
       vk->name = NULL;
     }
@@ -1296 +1297 @@
     {
       regfi_log_add(REGFI_LOG_WARN, "Error occurred while converting"
-                    " key name to encoding %s.  Error message: %s",
+                    " key name to encoding %s.  NK offset: 0x%.8X."
+                    "  Error message: %s",
                     regfi_encoding_int2str(file->string_encoding), 
-                    strerror(errno));
+                    nk->offset, strerror(errno));
       nk->name = NULL;
     }

trunk/python/pyregfi/__init__.py

@@ -723 +723 @@
 
         elif name == "name_encoding":
-            flags = super(Key, self).__getattr__("flags")
+            flags = super(Value, self).__getattr__("flags")
             if (flags & structures.REGFI_VK_FLAG_ASCIINAME) > 0:
                 ret_val = "ascii"