Fix compilation warnings

[lttv.git] / lttv / lttv / sync / event_processing_lttng_standard.c

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index 4b5f69ecd839c82ee37980034767d81411cdb4b0..c3b4da23d4c3ca97942c98f9783ecd4b0a8d302d 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -104,26 +104,34 @@ static void initProcessingLTTVStandard(SyncState* const syncState, ...)
        va_start(ap, syncState);
        processingData->traceSetContext= va_arg(ap, LttvTracesetContext*);
        va_end(ap);
+       syncState->traceNb=
+               lttv_traceset_number(processingData->traceSetContext->ts);
+       processingData->hookListList= g_array_sized_new(FALSE, FALSE,
+               sizeof(GArray*), syncState->traceNb);
 
-       if (syncState->stats)
-       {
-               processingData->stats= calloc(1, sizeof(ProcessingStatsLTTVStandard));
-       }
-       else
+       processingData->traceNumTable= g_hash_table_new(&g_direct_hash, NULL);
+       for(i= 0; i < syncState->traceNb; i++)
        {
-               processingData->stats= NULL;
+               g_hash_table_insert(processingData->traceNumTable,
+                       processingData->traceSetContext->traces[i]->t,
+                       GUINT_TO_POINTER(i));
        }
 
-       processingData->traceNumTable= g_hash_table_new(&g_direct_hash, NULL);
-       processingData->hookListList= g_array_sized_new(FALSE, FALSE,
-               sizeof(GArray*), syncState->traceNb);
        processingData->pendingRecv= malloc(sizeof(GHashTable*) *
                syncState->traceNb);
-
        for(i= 0; i < syncState->traceNb; i++)
        {
-               g_hash_table_insert(processingData->traceNumTable,
-                       processingData->traceSetContext->traces[i]->t, (gpointer) i);
+               processingData->pendingRecv[i]= g_hash_table_new_full(&g_direct_hash,
+                       NULL, NULL, &gdnDestroyEvent);
+       }
+
+       if (syncState->stats)
+       {
+               processingData->stats= calloc(1, sizeof(ProcessingStatsLTTVStandard));
+       }
+       else
+       {
+               processingData->stats= NULL;
        }
 
        if (syncState->graphsStream)
@@ -144,12 +152,6 @@ static void initProcessingLTTVStandard(SyncState* const syncState, ...)
                processingData->graphs= NULL;
        }
 
-       for(i= 0; i < syncState->traceNb; i++)
-       {
-               processingData->pendingRecv[i]= g_hash_table_new_full(&g_direct_hash,
-                       NULL, NULL, &gdnDestroyEvent);
-       }
-
        registerHooks(processingData->hookListList,
                processingData->traceSetContext, &processEventLTTVStandard, syncState,
                syncState->matchingModule->canMatch);
@@ -383,6 +385,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
        struct marker_info* info;
        SyncState* syncState;
        ProcessingDataLTTVStandard* processingData;
+       gpointer traceNumP;
 
        traceHook= (LttvTraceHook*) hookData;
        tfc= (LttvTracefileContext*) callData;
@@ -397,7 +400,8 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
        wTime.nanosec= time.tv_nsec;
 
        g_assert(g_hash_table_lookup_extended(processingData->traceNumTable,
-                       trace, NULL, (gpointer*) &traceNum));
+                       trace, NULL, &traceNumP));
+       traceNum= GPOINTER_TO_INT(traceNumP);
 
        g_debug("Process event: time: %ld.%09ld trace: %ld (%p) name: %s ",
                time.tv_sec, time.tv_nsec, traceNum, trace,
@@ -699,14 +703,6 @@ static void writeProcessingGraphVariablesLTTVStandard(SyncState* const
 static void writeProcessingTraceTraceOptionsLTTVStandard(SyncState* const
        syncState, const unsigned int i, const unsigned int j)
 {
-       ProcessingDataLTTVStandard* processingData;
-       ProcessingGraphsLTTVStandard* traceI, * traceJ;
-
-       processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
-
-       traceI= &processingData->graphs[i];
-       traceJ= &processingData->graphs[j];
-
        fprintf(syncState->graphsStream,
         "set key inside right bottom\n"
         "set xlabel \"Clock %1$u\"\n"
@@ -733,14 +729,6 @@ static void writeProcessingTraceTraceOptionsLTTVStandard(SyncState* const
 static void writeProcessingTraceTimeOptionsLTTVStandard(SyncState* const
        syncState, const unsigned int i, const unsigned int j)
 {
-       ProcessingDataLTTVStandard* processingData;
-       ProcessingGraphsLTTVStandard* traceI, * traceJ;
-
-       processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
-
-       traceI= &processingData->graphs[i];
-       traceJ= &processingData->graphs[j];
-
        fprintf(syncState->graphsStream,
         "set key inside right bottom\n"
         "set xlabel \"Clock %1$u\"\n"