X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Foption.c;h=4c45d2ab97d21cbd19ab1b0c13ca63750cc3d78b;hb=c432246e06bb83a3d43a6668517486fb6b4b959d;hp=3a95a4af9b001c88bcbd475fa5cc8b3ea678df12;hpb=dc87756342c051418eccb2b7d932ffa5453c6788;p=lttv.git

diff --git a/ltt/branches/poly/lttv/option.c b/ltt/branches/poly/lttv/option.c
index 3a95a4af..4c45d2ab 100644
--- a/ltt/branches/poly/lttv/option.c
+++ b/ltt/branches/poly/lttv/option.c
@@ -1,15 +1,16 @@
-#include <popt.h>
 
+#include <popt.h>
+#include <glib.h>
 #include <lttv/option.h>
 
 typedef struct _LttvOption {
-  const char *long_name;
+  char *long_name;
   char char_name;
-  const char *description;
-  const char *arg_description;
+  char *description;
+  char *arg_description;
   LttvOptionType t;
   gpointer p;
-  LttvOptionHook h;
+  LttvOptionHook hook;
   gpointer hook_data;
 } LttvOption;
 
@@ -43,7 +44,7 @@ void lttv_option_destroy()
 {
   LttvOption option;
 
-  GPtrArray list = g_ptr_array_new();
+  GPtrArray *list = g_ptr_array_new();
 
   int i;
 
@@ -76,7 +77,7 @@ void lttv_option_add(const char *long_name, const char char_name,
   option->arg_description = g_strdup(arg_description);
   option->t = t;
   option->p = p;
-  option->h = h;
+  option->hook = h;
   option->hook_data = hook_data;
   g_hash_table_insert(options, option->long_name, option);
 }
@@ -105,7 +106,7 @@ static struct poptOption endOption = { NULL, '\0', 0, NULL, 0};
 
 static void 
 build_popts(GPtrArray **plist, struct poptOption **ppopts, poptContext *pc,
-    int argv, char **argv)
+    int argc, char **argv)
 {
   LttvOption *option;
 
@@ -152,7 +153,7 @@ destroy_popts(GPtrArray **plist, struct poptOption **ppopts, poptContext *pc)
 {
   g_ptr_array_free(*plist, TRUE); *plist = NULL;
   g_free(*ppopts); *ppopts = NULL;
-  poptFreeContext(*c);  
+  poptFreeContext(*pc);  
 }