X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Foption.c;h=c5046ef861a2100dd10d115373e0cec20ea58efa;hb=6601bf27d85f3a9bad9926432f2044363f420b9d;hp=aa8656f85a030eb77962c0b90b87d22b1df20f70;hpb=eccb53529c117e1c39bd558e1db7fb801e054fb8;p=lttv.git

diff --git a/ltt/branches/poly/lttv/option.c b/ltt/branches/poly/lttv/option.c
index aa8656f8..c5046ef8 100644
--- a/ltt/branches/poly/lttv/option.c
+++ b/ltt/branches/poly/lttv/option.c
@@ -1,6 +1,8 @@
+#include <popt.h>
 
+#include <lttv/hook.h>
 #include <lttv/lttv.h>
-#include <popt.h>
+#include <lttv/option.h>
 
 /* Extensible array of popt command line options. Modules add options as
    they are loaded and initialized. */
@@ -10,8 +12,6 @@ typedef struct _lttv_option {
   void *hook_data;
 } lttv_option;
 
-extern lttv_attributes *attributes_global;
-
 static GArray *lttv_options_command;
 
 static GArray *lttv_options_command_popt;
@@ -46,16 +46,16 @@ void lttv_option_init(int argc, char **argv) {
   hooks_options_before = lttv_hooks_new();
   hooks_options_after = lttv_hooks_new();
 
-  lttv_attributes_set_pointer_pathname(attributes_global, 
+  lttv_attributes_set_pointer_pathname(lttv_global_attributes(), 
       "hooks/options/before", hooks_options_before);
 
-  lttv_attributes_set_pointer_pathname(attributes_global,
+  lttv_attributes_set_pointer_pathname(lttv_global_attributes(),
       "hooks/options/after",  hooks_options_after);
 
   lttv_options_command_popt = g_array_new(0,0,sizeof(struct poptOption));
   lttv_options_command = g_array_new(0,0,sizeof(lttv_option));
 
-  hooks_init_after = lttv_attributes_get_pointer_pathname(attributes_global,
+  hooks_init_after = lttv_attributes_get_pointer_pathname(lttv_global_attributes(),
 		  "hooks/init/after");
   lttv_hooks_add(hooks_init_after, lttv_options_command_parse, NULL);
 
@@ -63,13 +63,24 @@ void lttv_option_init(int argc, char **argv) {
 
 void lttv_option_destroy() {
 
+  struct poptOption *poption;
+
+  int i;
+  
+  for(i=0; i < lttv_options_command_popt->len ; i++) {
+    poption = &g_array_index (lttv_options_command_popt, struct poptOption, i);
+
+    g_free((gpointer)poption->longName);
+    g_free((gpointer)poption->descrip);
+    g_free((gpointer)poption->argDescrip);
+  }
   g_array_free(lttv_options_command_popt,TRUE) ;
   g_array_free(lttv_options_command,TRUE) ;
 
-  lttv_attributes_set_pointer_pathname(attributes_global, 
+  lttv_attributes_set_pointer_pathname(lttv_global_attributes(), 
       "hooks/options/before", NULL);
 
-  lttv_attributes_set_pointer_pathname(attributes_global,
+  lttv_attributes_set_pointer_pathname(lttv_global_attributes(),
       "hooks/options/after",  NULL);
 
   lttv_hooks_destroy(hooks_options_before);
@@ -83,18 +94,19 @@ static int poptToLTT[] = {
 };
 
 
-void lttv_option_add(char *long_name, char char_name, char *description, 
-    char *argDescription, lttv_option_type t, void *p, 
-    lttv_option_hook h, void *hook_data)
+void lttv_option_add(const char *long_name, const char char_name,
+		const char *description, const char *argDescription,
+		const lttv_option_type t, void *p, 
+		const lttv_option_hook h, void *hook_data)
 {
   struct poptOption poption;
 
   lttv_option option;
 
-  poption.longName = long_name;
+  poption.longName = (char *)g_strdup(long_name);
   poption.shortName = char_name;
-  poption.descrip = description;
-  poption.argDescrip = argDescription;
+  poption.descrip = (char *)g_strdup(description);
+  poption.argDescrip = (char *)g_strdup(argDescription);
   poption.argInfo = poptToLTT[t];
   poption.arg = p;
   poption.val = lttv_options_command->len + 1;