Deleted compilations warnings from qspn-empiric.c

src/qspn-empiric.c

@@ -550,9 +550,10 @@ thread_joint(int joint, void *(*start_routine) (void *), void *nopt)
 	pthread_t thread;
 	total_threads++;
 	if (joint && !disable_joint) {
-		fprintf(stderr, "%u: Joining the thread...", pthread_self());
+		fprintf(stderr, "%u: Joining the thread...",
+				(unsigned int)pthread_self());
 		pthread_create(&thread, NULL, start_routine, (void *) nopt);
-		fprintf(stderr, " %u\n", thread);
+		fprintf(stderr, " %u\n", (unsigned int)thread);
 		pthread_join(thread, NULL);
 	} else {
 		pthread_create(&thread, NULL, start_routine, (void *) nopt);
@@ -601,7 +602,7 @@ gen_rnd_map(int start_node, int back_link, int back_link_rtt)
 	if (b) {
 		r++;
 		setzero(&rtmp, sizeof(map_rnode));
-		rtmp.r_node = (u_int *) & int_map[back_link];
+		rtmp.r_node = (int *) & int_map[back_link];
 		rtmp.rtt.tv_usec = back_link_rtt;
 		//printf("Node %d -> Adding rnode %d (back link)\n", i, back_link);
 		rnode_add(&int_map[i], &rtmp);
@@ -621,7 +622,7 @@ gen_rnd_map(int start_node, int back_link, int back_link_rtt)
 			}
 
 		/*the building of the new rnode is here */
-		rtmp.r_node = (u_int *) & int_map[rnode_rnd];
+		rtmp.r_node = (int *) & int_map[rnode_rnd];
 		ms_rnd = rand_range(0, (MAXRTT * 1000));
 		rtmp.rtt.tv_usec = ms_rnd * 1000;
 		//printf("Node %d -> Adding rnode %d\n", i, rnode_rnd);
@@ -643,7 +644,7 @@ gen_rnd_map(int start_node, int back_link, int back_link_rtt)
 			if (!c) {
 				/*We create the back link from rnode_rnd to me (i) */
 				setzero(&rtmp, sizeof(map_rnode));
-				rtmp.r_node = (u_int *) & int_map[i];
+				rtmp.r_node = (int *) & int_map[i];
 				rtmp.rtt.tv_usec = ms_rnd * 1000;
 				//printf("Node %d -> Adding rnode %d (front link)\n", rnode_rnd,i);
 				rnode_add(&int_map[rnode_rnd], &rtmp);
@@ -669,7 +670,7 @@ init_q_queue(map_node * map)
 void
 free_q_queue(map_node * map)
 {
-	int i, e, x;
+	int i;
 	for (i = 0; i < MAXGROUPNODE; i++) {
 		xfree(qspn_q[i]);
 	}
@@ -723,8 +724,8 @@ send_qspn_backpro(void *argv)
 	int x, dst, pkt, to = qopt->q.to;
 
 	usleep(qopt->sleep);
-	fprintf(stderr, "%u: qspn_backpro from %d to %d\n", pthread_self(),
-			qopt->q.from, to);
+	fprintf(stderr, "%u: qspn_backpro from %d to %d\n",
+			(unsigned int)pthread_self(), qopt->q.from, to);
 
 	/*Now we store the received pkt in our pkt_db */
 	pkt = store_tracer_pkt(qopt);
@@ -732,7 +733,7 @@ send_qspn_backpro(void *argv)
 	/*We've arrived... finally */
 	if (int_map[to].flags & QSPN_STARTER) {
 		fprintf(stderr, "%u: qspn_backpro: We've arrived... finally\n",
-				pthread_self());
+				(unsigned int)pthread_self());
 		return NULL;
 	}
 
@@ -777,8 +778,8 @@ send_qspn_reply(void *argv)
 	int x, dst, pkt, to = qopt->q.to;
 
 	usleep(qopt->sleep);
-	fprintf(stderr, "%u: qspn_reply from %d to %d\n", pthread_self(),
-			qopt->q.from, to);
+	fprintf(stderr, "%u: qspn_reply from %d to %d\n",
+			(unsigned int)pthread_self(), qopt->q.from, to);
 
 	/*Let's store the tracer_pkt first */
 	pkt = store_tracer_pkt(qopt);
@@ -787,7 +788,8 @@ send_qspn_reply(void *argv)
 	if (qopt->q.broadcast <= int_map[to].brdcast[qopt->q.from]) {
 		fprintf(stderr,
 				"%u: DROPPED old brdcast: q.broadcast: %d, qopt->q.from broadcast: %d\n",
-				pthread_self(), qopt->q.broadcast,
+				(unsigned int)pthread_self(),
+				qopt->q.broadcast,
 				int_map[to].brdcast[qopt->q.from]);
 		return NULL;
 	} else
@@ -835,18 +837,18 @@ send_qspn_open(void *argv)
 {
 	struct q_opt *qopt = (struct q_opt *) argv, *nopt;
 	int x, i = 0, dst, pkt, to = qopt->q.to;
-	int re, sub_id = qopt->q.q_sub_id;
+	int sub_id = qopt->q.q_sub_id;
 
 	usleep(qopt->sleep);
 	fprintf(stderr, "%u: qspn_open from %d to %d [subid: %d]\n",
-			pthread_self(), qopt->q.from, to, sub_id);
+			(unsigned int)pthread_self(), qopt->q.from, to, sub_id);
 
 	pkt = store_tracer_pkt(qopt);
 
 	if (to == sub_id) {
 		fprintf(stderr,
 				"%u: qspn_open: We received a qspn_open, but we are the OPENER!!\n",
-				pthread_self());
+				(unsigned int)pthread_self());
 		return NULL;
 	}
 
@@ -855,7 +857,7 @@ send_qspn_open(void *argv)
 			&int_map[qopt->q.from]) {
 			qspn_q[to][x].flags[sub_id] |= QSPN_OPENED;
 			fprintf(stderr, "%u: node:%d->rnode %d  opened\n",
-					pthread_self(), to, x);
+					(unsigned int)pthread_self(), to, x);
 		}
 
 		if (!(qspn_q[to][x].flags[sub_id] & QSPN_OPENED))
@@ -866,7 +868,7 @@ send_qspn_open(void *argv)
 		/*Yai! We've finished the reopening of heaven */
 		fprintf(stderr,
 				"%u: Yai! We've finished the reopening of heaven\n",
-				pthread_self());
+				(unsigned int)pthread_self());
 		return NULL;
 	}
 
@@ -915,15 +917,15 @@ send_qspn_pkt(void *argv)
 	int x, i = 0, dst, pkt, to = qopt->q.to;
 
 	usleep(qopt->sleep);
-	fprintf(stderr, "%u: qspn_pkt from %d to %d\n", pthread_self(),
-			qopt->q.from, to);
+	fprintf(stderr, "%u: qspn_pkt from %d to %d\n",
+			(unsigned int)pthread_self(), qopt->q.from, to);
 
 	pkt = store_tracer_pkt(qopt);
 
 	if (qopt->q.routes > 1 && (int_map[to].flags & QSPN_STARTER)) {
 		fprintf(stderr,
 				"%u: qspn_pkt: We received a qspn_pkt, but we are the QSPN_STARTER!!\n",
-				pthread_self());
+				(unsigned int)pthread_self());
 		return NULL;
 	}
 
@@ -941,7 +943,7 @@ send_qspn_pkt(void *argv)
 	if (!i && !(int_map[to].flags & QSPN_OPENER)
 		&& !(int_map[to].flags & QSPN_STARTER)) {
 		/*W00t I'm an extreme node! */
-		fprintf(stderr, "%u: W00t I'm an extreme node!\n", pthread_self());
+		fprintf(stderr, "%u: W00t I'm an extreme node!\n", (unsigned int)pthread_self());
 		int_map[to].flags |= QSPN_OPENER;
 		for (x = 0; x < int_map[to].links; x++) {
 			/*if(int_map[to].r_node[x].flags & QSPN_SENT) 
@@ -977,7 +979,7 @@ send_qspn_pkt(void *argv)
 			gbl_stat.qspn_replies++;
 			node_stat[to].qspn_replies++;
 			fprintf(stderr, "%u: Sending a qspn_open to %d\n",
-					pthread_self(), dst);
+					(unsigned int)pthread_self(), dst);
 			thread_joint(qopt->join, send_qspn_open, (void *) nopt);
 			xfree(qopt);
 			return NULL;
@@ -1063,7 +1065,6 @@ send_qspn_pkt(void *argv)
 			int_map[to].r_node[x].flags |= QSPN_BACKPRO;
 			thread_joint(qopt->join, send_qspn_backpro, (void *) nopt);
 #else
-			0;
 #endif							/*Q_BACKPRO */
 		} else if (!(int_map[to].r_node[x].flags & QSPN_CLOSED)) {
 			gbl_stat.qspn_requests++;
@@ -1163,7 +1164,7 @@ lgl_print_map(map_node * map, char *lgl_mapfile)
 					((void *) map[x].r_node[e].r_node -
 					 (void *) map) / sizeof(map_node);
 				fprintf(lgl, "%d %d\n", node,
-						map[x].r_node[e].rtt.tv_usec);
+						(int)map[x].r_node[e].rtt.tv_usec);
 			}
 		}
 	}