From 2ba14ef28535eddf67ad6cb64f53938912b46999 Mon Sep 17 00:00:00 2001 From: thomasl Date: Wed, 19 Nov 2014 14:10:00 +0000 Subject: [PATCH] fix warnings : pthread_join type, and one printf warning (fixed with C99 i hope it's fine) git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6041 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- targets/RT/USER/lte-softmodem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 3c509b517a..fef526e7b8 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -1211,7 +1211,7 @@ void init_eNB_proc(void) { void kill_eNB_proc(void) { int i; - int *status_tx,*status_rx; + void *status_tx,*status_rx; int CC_id; for (CC_id=0;CC_idproc[i].pthread_tx,(void**)status_tx); + pthread_join(PHY_vars_eNB_g[0][CC_id]->proc[i].pthread_tx,&status_tx); #ifdef DEBUG_THREADS - if (status_tx) printf("status %d...\n",*status_tx); + if (status_tx) printf("status %p...\n",status_tx); #endif #ifdef DEBUG_THREADS printf("Killing RX CC_id %d thread %d\n",CC_id,i); @@ -1237,9 +1237,9 @@ void kill_eNB_proc(void) { #ifdef DEBUG_THREADS printf("Joining eNB RX CC_id %d thread %d...\n",CC_id,i); #endif - pthread_join(PHY_vars_eNB_g[0][CC_id]->proc[i].pthread_rx,(void**)status_rx); + pthread_join(PHY_vars_eNB_g[0][CC_id]->proc[i].pthread_rx,&status_rx); #ifdef DEBUG_THREADS - if (status_rx) printf("status %d...\n",*status_rx); + if (status_rx) printf("status %p...\n",status_rx); #endif pthread_mutex_destroy(&PHY_vars_eNB_g[0][CC_id]->proc[i].mutex_tx); pthread_mutex_destroy(&PHY_vars_eNB_g[0][CC_id]->proc[i].mutex_rx); @@ -2654,7 +2654,7 @@ static void get_options (int argc, char **argv) { rx_gain[CC_id][k] = (double)enb_properties->properties[i]->rx_gain[CC_id]; tx_gain[CC_id][k] = (double)enb_properties->properties[i]->tx_gain[CC_id]; } - printf("Downlink frequency/ uplink offset of CC_id %d set to %llu/%d\n", CC_id, + printf("Downlink frequency/ uplink offset of CC_id %d set to %ju/%d\n", CC_id, enb_properties->properties[i]->downlink_frequency[CC_id], enb_properties->properties[i]->uplink_frequency_offset[CC_id]); } // CC_id