Add state saving functions and update processTrace accordingly.

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

diff --git a/ltt/branches/poly/ltt/type.c b/ltt/branches/poly/ltt/type.c
index 21636c24d5b0acb31730e280d1857d5eb17938fe..a2c73f229c428f9c42822a6a9aa8892c7606d72c 100644 (file)
--- 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;
 }
 
 /*****************************************************************************
@@ -95,6 +93,7 @@ unsigned *ltt_eventtype_id(LttEventType *et)
 
 LttType *ltt_eventtype_type(LttEventType *et)
 {
+  if(!et->root_field) return NULL;
   return et->root_field->field_type;
 }
 
@@ -243,7 +242,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];
 }
 
@@ -313,6 +312,7 @@ LttField *ltt_field_member(LttField *f, unsigned i)
 
 LttType *ltt_field_type(LttField *f)
 {
+  if(!f)return NULL;
   return f->field_type;
 }