add version to help and about

[lttv.git] / ltt / branches / poly / lttv / lttv / main.c

diff --git a/ltt/branches/poly/lttv/lttv/main.c b/ltt/branches/poly/lttv/lttv/main.c
index f984df1414c656f26557059adc4487081c1a64dd..a9ebf6272a288917d262b662b00055f5b0d59177 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/main.c
+++ b/ltt/branches/poly/lttv/lttv/main.c
@@ -16,6 +16,9 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <lttv/hook.h>
 #include <lttv/module.h>
@@ -26,6 +29,7 @@
 #include <lttv/traceset.h>
 #include <ltt/trace.h>
 #include <stdio.h>
+#include <string.h>
 
 
 /* The main program maintains a few central data structures and relies
@@ -147,9 +151,9 @@ int main(int argc, char **argv) {
   GError *error = NULL;
 
   LttvModule *module_module = lttv_module_require("module", &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
   LttvModule *module_option = lttv_module_require("option", &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
 
   /* Initialize the module loading */
 
@@ -237,7 +241,7 @@ void lttv_module_option(void *hook_data)
   GError *error = NULL;
 
   lttv_module_require(a_module, &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
 }
 
 
@@ -261,14 +265,14 @@ void lttv_debug(void *hook_data)
 
 void lttv_fatal(void *hook_data)
 {
-  //g_log_set_always_fatal(G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
-  g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+  g_log_set_always_fatal(G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
+  //g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
   g_info("Critical log from glib will abort execution");
 }
 
 void lttv_help(void *hook_data)
 {
-       printf("Linux Trace Toolkit Visualizer\n");
+       printf("Linux Trace Toolkit Visualizer " VERSION "\n");
        printf("\n");
        lttv_option_show_help();
        printf("\n");