Changeset 233

Timestamp:

04/28/11 23:28:16 (14 years ago)

Author:

tim

Message:

improved version information interface by adding a special purpose function

Location:

trunk

Files:

• include/regfi.h (modified) (2 diffs)
• lib/regfi.c (modified) (2 diffs)
• python/pyregfi/__init__.py (modified) (1 diff)
• python/pyregfi/structures.py (modified) (1 diff)
• src/reglookup-recover.c (modified) (1 diff)
• src/reglookup.c (modified) (1 diff)

trunk/include/regfi.h

@@ -79 +79 @@
 #include <range_list.h>
 #include <lru_cache.h>
-
-/* Library version can be overridden at build time */
-#ifndef REGFI_VERSION
-#define REGFI_VERSION "trunk"
-#endif
 
 /* GCC-specific macro for library exports */
@@ -884 +879 @@
 /******************************************************************************/
 
+
+/** Returns the current regfi library version
+ *
+ * @return A string indicating the version.
+ *
+ * @ingroup regfiBase
+ */
+_EXPORT
+const char* regfi_version();
+
+
 /** Parses file headers of an already open registry hive file and 
  *  allocates related structures for further parsing.

trunk/lib/regfi.c

@@ -34 +34 @@
 #include "regfi.h"
 
+/* Library version can be overridden at build time */
+#ifndef REGFI_VERSION
+#define REGFI_VERSION "trunk"
+#endif
+
 
 /* Registry types mapping */
@@ -48 +53 @@
 static pthread_once_t regfi_init_once = PTHREAD_ONCE_INIT;
 
+
+/******************************************************************************
+ ******************************************************************************/
+const char* regfi_version()
+{
+  return REGFI_VERSION;
+}
 
 

trunk/python/pyregfi/__init__.py

@@ -182 +182 @@
 
 
+## Returns the (py)regfi library version
+#
+# @return A string indicating the version
+def getVersion():
+    return regfi.regfi_version()
+
+
 ## Retrieves messages produced by regfi during parsing and interpretation
 #

trunk/python/pyregfi/structures.py

@@ -228 +228 @@
 
 # Define function prototypes
+regfi.regfi_version.argtypes = []
+regfi.regfi_version.restype = c_char_p
+
 regfi.regfi_alloc.argtypes = [c_int, REGFI_ENCODING]
 regfi.regfi_alloc.restype = POINTER(REGFI_FILE)

trunk/src/reglookup-recover.c

@@ -336 +336 @@
 {
   fprintf(stderr, "Usage: reglookup-recover [options] <REGISTRY_FILE>\n");
-  fprintf(stderr, "Version: %s\n", REGFI_VERSION);
+  fprintf(stderr, "Version: %s\n", regfi_version());
   fprintf(stderr, "Options:\n");
   fprintf(stderr, "\t-v\t sets verbose mode.\n");

trunk/src/reglookup.c

@@ -551 +551 @@
           " [-p <PATH_FILTER>] [-t <TYPE_FILTER>]"
           " <REGISTRY_FILE>\n");
-  fprintf(stderr, "Version: %s\n", REGFI_VERSION);
+  fprintf(stderr, "Version: %s\n", regfi_version());
   fprintf(stderr, "Options:\n");
   fprintf(stderr, "\t-v\t sets verbose mode.\n");