Deleted unused variables and various cast warnings

src/andna_cache.c

@@ -1293,7 +1293,7 @@ pack_rh_cache(rh_cache * rhcache, size_t * pack_sz)
 	struct rh_cache_pkt_hdr rh_hdr;
 	rh_cache *rhc = rhcache;
 	size_t tot_pack_sz = 0, service_sz;
-	char *pack, *buf, *body;
+	char *pack, *buf;
 
 	rh_hdr.tot_caches = 0;
 	tot_pack_sz = sizeof(struct rh_cache_pkt_hdr);
@@ -1316,8 +1316,6 @@ pack_rh_cache(rh_cache * rhcache, size_t * pack_sz)
 		rhc = rhcache;
 
 		list_for(rhc) {
-			body = buf;
-
 			bufput(&rhc->hash, sizeof(u_int));
 			bufput(&rhc->flags, sizeof(char));
 			bufput(&rhc->timestamp, sizeof(time_t));

src/andns_lib.c

@@ -100,9 +100,6 @@ a_hdr_u(char *buf, andns_pkt * ap)
 {
 	uint8_t c;
 	uint16_t s;
-	char *start_buf;
-
-	start_buf = buf;
 
 	ap->r = *(buf + 1) & 0x01;
 	memcpy(&s, buf, 2);

src/andns_snsd.c

@@ -255,15 +255,14 @@ snsd_node_to_dansw(dns_pkt * dp, snsd_node * sn, int iplen)
 {
 	char temp[18];
 	dns_pkt_a *dpa;
-	snsd_node snt, *s;
+	snsd_node snt;
 	int res;
 
 	if (!(sn->flags & SNSD_NODE_HNAME)) {
-		if (!(res = snsd_main_ip((u_int*)sn->record, &snt)))
+		if (!(res = snsd_main_ip((u_int*)sn->record, &snt))) {
 			return -1;
-		s = &snt;
-	} else
-		s = sn;
+		}
+	}
 
 	memcpy(temp, sn->record, iplen);
 	inet_htonl((u_int *) (temp), (iplen == 4) ? AF_INET : AF_INET6);

src/dnslib.c

@@ -232,9 +232,6 @@ rm_inv_prefix(char *src, char *dst)
 int
 add_inv_prefix(char *s, int family)
 {
-	int len;
-
-	len = strlen(s);
 	if (family == AF_INET)
 		strcat(s, DNS_INV_PREFIX);
 	else

src/gmap.c

@@ -975,11 +975,9 @@ void
 reset_gmap(map_gnode * gmap, int groups)
 {
 	int i;
-	size_t len;
 
 	if (!groups)
 		groups = MAXGROUPNODE;
-	len = sizeof(map_gnode) * groups;
 
 	for (i = 0; i < groups; i++)
 		gmap_node_del(&gmap[i]);
@@ -1175,9 +1173,11 @@ merge_ext_maps(map_gnode ** base, map_gnode ** new, quadro_group base_root,
 	int level, i;
 
 	for (level = base_root.levels - 1; level >= 0; level--) {
-
+		
+		/*
 		if (base_root.gid[level] != base_root.gid[level])
 			break;
+		*/
 
 		if (level == 1)
 			/* The two maps are of the same quadro_group */

src/hook.c

@@ -132,7 +132,7 @@ get_free_nodes(map_node * dst_rnode,
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_FREE_NODES) < 0 && _return(-1);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_FREE_NODES) < 0) { _return(-1); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err =
@@ -317,7 +317,7 @@ get_qspn_round(map_node * dst_rnode, struct timeval to_rtt,
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_QSPN_ROUND) < 0 && _return(-1);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_QSPN_ROUND) < 0) { _return(-1); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err =
@@ -506,7 +506,7 @@ get_ext_map(map_node * dst_rnode, quadro_group * new_quadg)
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_EXT_MAP) < 0 && _return(0);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_EXT_MAP) < 0) { _return(0); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err = rnl_send_rq(dst_rnode, &pkt, 0, GET_EXT_MAP, 0, PUT_EXT_MAP, 1,
@@ -578,7 +578,7 @@ get_int_map(map_node * dst_rnode, map_node ** new_root)
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_INT_MAP) < 0 && _return(0);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_INT_MAP) < 0) {  _return(0); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err = rnl_send_rq(dst_rnode, &pkt, 0, GET_INT_MAP, 0, PUT_INT_MAP, 1,
@@ -657,7 +657,7 @@ get_bnode_map(map_node * dst_rnode, u_int ** bmap_nodes)
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_BNODE_MAP) < 0 && _return(0);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_BNODE_MAP) < 0){ _return(0); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err = rnl_send_rq(dst_rnode, &pkt, 0, GET_BNODE_MAP, 0, PUT_BNODE_MAP,
@@ -735,7 +735,7 @@ get_internet_gws(map_node * dst_rnode, int **igws_counter)
 	setzero(&pkt, sizeof(PACKET));
 	setzero(&rpkt, sizeof(PACKET));
 
-	hook_fill_rq(dst_rnode, &pkt, GET_INTERNET_GWS) < 0 && _return(0);
+	if(hook_fill_rq(dst_rnode, &pkt, GET_INTERNET_GWS) < 0) { _return(0); }
 	pkt_addtimeout(&pkt, HOOK_RQ_TIMEOUT, 1, 0);
 
 	err = rnl_send_rq(dst_rnode, &pkt, 0, GET_INTERNET_GWS, 0,
@@ -1346,7 +1346,7 @@ hook_get_ext_map(int hook_level, int new_gnode,
 		gcount =
 			new_ext_map[_EL(hook_level)][old_quadg->gid[hook_level]].
 			gcount;
-		qspn_dec_gcount((int *) qspn_gnode_count, hook_level + 1, gcount);
+		qspn_dec_gcount((u_int *) qspn_gnode_count, hook_level + 1, gcount);
 
 		old_gid = old_quadg->gid[hook_level];
 		new_ext_map[_EL(hook_level)][old_gid].gcount = 0;

src/inet.c

@@ -604,7 +604,7 @@ inet_close(int *sk)
 }
 
 int
-inet_getpeername(int sk, inet_prefix * ip, short *port)
+inet_getpeername(int sk, inet_prefix * ip, u_short *port)
 {
 	struct sockaddr_storage saddr_sto;
 	struct sockaddr *sa = (struct sockaddr *) &saddr_sto;

src/inet.h

@@ -178,7 +178,7 @@ int sockaddr_to_inet(struct sockaddr *ip, inet_prefix * dst,
 int new_socket(int sock_type);
 int new_dgram_socket(int sock_type);
 int inet_close(int *sk);
-int inet_getpeername(int sk, inet_prefix * ip, short *port);
+int inet_getpeername(int sk, inet_prefix * ip, u_short *port);
 int join_ipv6_multicast(int socket, int idx);
 
 int set_keepalive_sk(int socket);

src/libiptc/libip4tc.c

@@ -18,6 +18,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+// linux_list.h macros trigger a lot of unused value warnings....
+#pragma GCC diagnostic ignored "-Wunused-value"
+#pragma GCC diagnostic push
+
 #ifdef DEBUG_CONNTRACK
 #define inline
 #endif
@@ -492,4 +496,7 @@ do_check(TC_HANDLE_T h, unsigned int line)
 }
 #endif							/*IPTC_DEBUG */
 
+
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif

src/libiptc/libiptc.c

@@ -808,11 +808,8 @@ static TC_HANDLE_T
 alloc_handle(const char *tablename, unsigned int size,
 			 unsigned int num_rules)
 {
-	size_t len;
 	TC_HANDLE_T h;
 
-	len = sizeof(STRUCT_TC_HANDLE) + size;
-
 	h = malloc(sizeof(STRUCT_TC_HANDLE));
 	if (!h) {
 		errno = ENOMEM;

src/libnetlink.c

@@ -45,7 +45,7 @@ rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
 	int sndbuf = 32768;
 	int rcvbuf = 32768;
 
-	memset(rth, 0, sizeof(rth));
+	memset(rth, 0, sizeof(struct rtnl_handle));
 
 	rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
 	if (rth->fd < 0) {
@@ -442,7 +442,7 @@ rtnl_from_file(FILE * rtnl, rtnl_filter_t handler, void *jarg)
 	nladdr.nl_groups = 0;
 
 	while (1) {
-		int err, len, type;
+		int err, len;
 		int l;
 
 		status = fread(&buf, 1, sizeof(*h), rtnl);
@@ -457,7 +457,6 @@ rtnl_from_file(FILE * rtnl, rtnl_filter_t handler, void *jarg)
 			return 0;
 
 		len = h->nlmsg_len;
-		type = h->nlmsg_type;
 		l = len - sizeof(*h);
 
 		if (l < 0 || len > sizeof(buf)) {

src/libping.c

@@ -260,7 +260,7 @@ recv_ping(struct sockaddr_in *taddr, struct ping_priv *datum)
 	int from;
 	int nf, cc;
 	unsigned char buf[HDRLEN + DATALEN];
-	struct icmp *icp;
+	//struct icmp *icp;
 	struct sockaddr_in faddr;
 	struct timeval to;
 	fd_set readset;
@@ -297,7 +297,7 @@ recv_ping(struct sockaddr_in *taddr, struct ping_priv *datum)
 			return 0;
 	}
 
-	icp = (struct icmp *) (buf + HDRLEN + DATALEN);
+	//icp = (struct icmp *) (buf + HDRLEN + DATALEN);
 	if (faddr.sin_addr.s_addr != taddr->sin_addr.s_addr) {
 		return 1;
 	}

src/ntk-console-server.c

@@ -60,6 +60,7 @@ opensocket(void)
 
 	rc = bind(serverfd, (struct sockaddr *) &serveraddr,
 			  SUN_LEN(&serveraddr));
+	stop_trying = 0;
 	if (rc < 0) {
 		perror("bind() failed");
 		clean_up();

src/qspn.c

@@ -473,11 +473,11 @@ qspn_remove_deads(u_char level)
 			if (!level) {
 				debug(DBG_NORMAL, "qspn: The node %d is dead", i);
 				map_node_del(node);
-				qspn_dec_gcount((int *) qspn_gnode_count, level + 1, 1);
+				qspn_dec_gcount((u_int *) qspn_gnode_count, level + 1, 1);
 			} else {
 				debug(DBG_NORMAL, "The groupnode %d of level %d"
 					  " is dead", i, level);
-				qspn_dec_gcount((int *) qspn_gnode_count, level + 1,
+				qspn_dec_gcount((u_int *) qspn_gnode_count, level + 1,
 								gnode->gcount);
 				gmap_node_del(gnode);
 			}
@@ -610,14 +610,12 @@ int
 qspn_send(u_char level)
 {
 	PACKET pkt;
-	map_node *from;
 	int round_ms, ret = 0, ret_err, upper_gid, root_node_pos, qid;
 	map_node *map, *root_node;
 	map_gnode *gmap;
 	u_char upper_level;
 
 	qid = me.cur_qspn_id[level];
-	from = me.cur_node;
 	upper_level = level + 1;
 	qspn_set_map_vars(level, &map, &root_node, &root_node_pos, &gmap);
 

src/radar.c

@@ -691,7 +691,7 @@ radar_remove_old_rnodes(char *rnode_deleted)
 	int i, e, node_pos, bm, rnode_pos, bnode_rnode_pos, root_node_pos;
 	int broot_node_pos;
 	int level, blevel, external_node, total_levels, first_level;
-	void *void_map, *void_gnode;
+	void *void_gnode;
 
 	if (!me.cur_node->links)
 		return 0;
@@ -728,7 +728,6 @@ radar_remove_old_rnodes(char *rnode_deleted)
 			 */
 
 			if (!level && !external_node) {
-				void_map = me.int_map;
 				node_pos = pos_from_node(node, me.int_map);
 				rnode_pos = i;
 
@@ -736,14 +735,13 @@ radar_remove_old_rnodes(char *rnode_deleted)
 
 				/* delete it from the int_map and update the gcount */
 				map_node_del(node);
-				qspn_dec_gcount((int *) qspn_gnode_count, level + 1, 1);
+				qspn_dec_gcount((u_int *) qspn_gnode_count, level + 1, 1);
 
 				/* delete the route */
 				rt_update_node(0, node, 0, 0, 0, level);
 
 				send_qspn_now[level] = 1;
 			} else {
-				void_map = me.ext_map;
 				gnode = e_rnode->quadg.gnode[_EL(level)];
 
 				/** delete the direct route to the ext_node */
@@ -793,7 +791,7 @@ radar_remove_old_rnodes(char *rnode_deleted)
 				if (map_find_bnode_rnode
 					(me.bnode_map[level - 1], me.bmap_nodes[level - 1],
 					 gnode) == -1) {
-					qspn_dec_gcount((int *) qspn_gnode_count, level + 1,
+					qspn_dec_gcount((u_int *) qspn_gnode_count, level + 1,
 									gnode->gcount);
 					gmap_node_del(gnode);
 					gnode_dec_seeds(&me.cur_quadg, level);	/* update the seeds */
@@ -871,13 +869,11 @@ radar_update_bmap(struct radar_queue *rq, int level, int gnode_level)
 	map_node *root_node;
 	map_rnode *rnode, rn;
 	int bm, rnode_pos, root_node_pos;
-	void *void_map;
 
 	if (level == me.cur_quadg.levels - 1)
 		return;
 
 	qspn_set_map_vars(level, 0, &root_node, &root_node_pos, 0);
-	void_map = me.ext_map;
 	gnode = rq->quadg.gnode[_EL(gnode_level + 1)];
 
 	bm = map_find_bnode(me.bnode_map[level], me.bmap_nodes[level],
@@ -923,7 +919,6 @@ radar_update_map(void)
 	int i, diff, rnode_pos;
 	u_char rnode_added[MAX_LEVELS / 8], rnode_deleted[MAX_LEVELS / 8];
 	int level, external_node, total_levels, root_node_pos, node_update;
-	void *void_map;
 	const char *ntop;
 	char updated_rnodes, routes_update, devs_update;
 
@@ -963,7 +958,6 @@ radar_update_map(void)
 			node_update = devs_update = 0;
 
 			if (!level) {
-				void_map = me.int_map;
 				node = rq->node;
 			} else {
 				/* Skip the levels where the ext_rnode belongs
@@ -985,7 +979,6 @@ radar_update_map(void)
 				root_node->flags |= MAP_BNODE;
 				me.cur_node->flags |= MAP_BNODE;
 
-				void_map = me.ext_map;
 				gnode = rq->quadg.gnode[_EL(level)];
 				node = &gnode->g;
 			}

src/snsd_cache.c

@@ -1170,7 +1170,7 @@ snsd_dump_node(snsd_node * snd, int single)
 {
 	list_for(snd) {
 		printf("\t\t{\n "
-			   "\t\trecord = %x:%x:%x:%x\n "
+			   "\t\trecord = %lx:%lx:%lx:%lx\n "
 			   "\t\tpubkey = %p\n "
 			   "\t\tflags = %d\n "
 			   "\t\tweight = %d\n",

src/tracer.c

@@ -869,7 +869,6 @@ tracer_store_bblock(u_char level, tracer_hdr * trcr_hdr,
 {
 	map_node *node;
 	map_gnode *gnode;
-	void *void_node;
 
 	bnode_hdr **bblist_hdr = 0;
 	bnode_chunk ***bblist = 0;
@@ -958,12 +957,10 @@ tracer_store_bblock(u_char level, tracer_hdr * trcr_hdr,
 				node = node_from_pos(bnode, me.int_map);
 				node->flags |= MAP_BNODE;
 				node->flags &= ~QSPN_OLD;
-				void_node = (void *) node;
 			} else {
 				gnode = gnode_from_pos(bnode, me.ext_map[_EL(blevel)]);
 				gnode->g.flags |= MAP_BNODE;
 				gnode->g.flags &= ~QSPN_OLD;
-				void_node = (void *) &gnode->g;
 			}
 
 			/* Let's check if we have this bnode in the bmap, if not let's 
@@ -1439,7 +1436,6 @@ tracer_pkt_recv(PACKET rpkt)
 	u_char level, orig_lvl;
 	const char *ntop = 0;
 	char *old_bblock = 0;
-	void *void_map;
 
 	ret_err = tracer_unpack_pkt(rpkt, &bcast_hdr, &trcr_hdr, &tracer,
 								&bhdr, &bblock_sz, &rip_quadg,
@@ -1459,7 +1455,6 @@ tracer_pkt_recv(PACKET rpkt)
 		root_node = me.cur_node;
 		from = node_from_pos(tracer[hops - 1].node, me.int_map);
 		tracer_starter = node_from_pos(tracer[0].node, me.int_map);
-		void_map = me.int_map;
 	} else {
 		level--;
 		root_node = &me.cur_quadg.gnode[_EL(level)]->g;
@@ -1469,7 +1464,6 @@ tracer_pkt_recv(PACKET rpkt)
 		tracer_starter =
 			(map_node *) gnode_from_pos(tracer[0].node,
 										me.ext_map[_EL(level)]);
-		void_map = me.ext_map;
 	}
 
 	if (server_opt.dbg_lvl) {