X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftype.c;h=710803de252b0a48aae2870e0477cb93d7168886;hb=41f18f3ef43db3c0f71b5bf232d27f7004673aef;hp=21636c24d5b0acb31730e280d1857d5eb17938fe;hpb=02007847f865c0d2f50979b5ceecbdeec5ef7b97;p=lttv.git

diff --git a/ltt/branches/poly/ltt/type.c b/ltt/branches/poly/ltt/type.c
index 21636c24..710803de 100644
--- a/ltt/branches/poly/ltt/type.c
+++ b/ltt/branches/poly/ltt/type.c
@@ -60,12 +60,12 @@ LttFacility *ltt_eventtype_facility(LttEventType *et)
  *Input params
  *    et                        : an  event type   
  *Return value
- *    unsigned *                : the relative id
+ *    unsigned                  : the relative id
  ****************************************************************************/
 
-unsigned *ltt_eventtype_relative_id(LttEventType *et)
+unsigned ltt_eventtype_relative_id(LttEventType *et)
 {
-  return (unsigned*)&et->index;
+  return et->index;
 }
 
 /*****************************************************************************
@@ -74,14 +74,12 @@ unsigned *ltt_eventtype_relative_id(LttEventType *et)
  *Input params
  *    et               : an  event type   
  *Return value
- *    unsigned *       : the id
+ *    unsigned         : the id
  ****************************************************************************/
 
-unsigned *ltt_eventtype_id(LttEventType *et)
+unsigned ltt_eventtype_id(LttEventType *et)
 {
-  unsigned *id = g_new(unsigned,1);
-  *id = et->facility->base_id + et->index;
-  return (unsigned*)id;
+  return et->facility->base_id + et->index;
 }
 
 /*****************************************************************************
@@ -243,7 +241,7 @@ LttType *ltt_type_member_type(LttType *t, unsigned i, char ** name)
 {
   if(t->type_class != LTT_STRUCT){*name == NULL; return NULL;}
   if(i >= t->element_number || i < 0 ){*name = NULL; return NULL;}
-  *name = t->element_name;
+  *name = t->element_type[i]->element_name;
   return t->element_type[i];
 }