File iproute2-2.6.29-1-warnings.diff of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File iproute2-2.6.29-1-warnings.diff of Package iproute2 (Revision 689e627fbf4aff8e1ed932d038ce2944)

Currently displaying revision 689e627fbf4aff8e1ed932d038ce2944 , Show latest

Index: ip/ip6tunnel.c
===================================================================
--- ip/ip6tunnel.c.orig
+++ ip/ip6tunnel.c
@@ -261,8 +261,9 @@ static int do_tunnels_list(struct ip6_tn
 	}
 
 	/* skip two lines at the begenning of the file */
-	fgets(buf, sizeof(buf), fp);
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
+	res = fgets(buf, sizeof(buf), fp);
 
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
 		char name[IFNAMSIZ];
Index: ip/ipmaddr.c
===================================================================
--- ip/ipmaddr.c.orig
+++ ip/ipmaddr.c
@@ -128,7 +128,8 @@ void read_igmp(struct ma_info **result_p
 	if (!fp)
 		return;
 	memset(&m, 0, sizeof(m));
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
 
 	m.addr.family = AF_INET;
 	m.addr.bitlen = 32;
Index: ip/ipmroute.c
===================================================================
--- ip/ipmroute.c.orig
+++ ip/ipmroute.c
@@ -58,7 +58,8 @@ static void read_viftable(void)
 	if (!fp)
 		return;
 
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
 
 	while (fgets(buf, sizeof(buf), fp)) {
 		int vifi;
@@ -83,7 +84,8 @@ static void read_mroute_list(FILE *ofp)
 	if (!fp)
 		return;
 
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
 
 	while (fgets(buf, sizeof(buf), fp)) {
 		inet_prefix maddr, msrc;
Index: ip/iptunnel.c
===================================================================
--- ip/iptunnel.c.orig
+++ ip/iptunnel.c
@@ -412,8 +412,9 @@ static int do_tunnels_list(struct ip_tun
 		return -1;
 	}
 
-	fgets(buf, sizeof(buf), fp);
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
+	res = fgets(buf, sizeof(buf), fp);
 
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
 		char *ptr;
Index: ip/rtmon.c
===================================================================
--- ip/rtmon.c.orig
+++ ip/rtmon.c
@@ -33,6 +33,7 @@ static void write_stamp(FILE *fp)
 	char buf[128];
 	struct nlmsghdr *n1 = (void*)buf;
 	struct timeval tv;
+	size_t res;
 
 	n1->nlmsg_type = 15;
 	n1->nlmsg_flags = 0;
@@ -42,7 +43,7 @@ static void write_stamp(FILE *fp)
 	gettimeofday(&tv, NULL);
 	((__u32*)NLMSG_DATA(n1))[0] = tv.tv_sec;
 	((__u32*)NLMSG_DATA(n1))[1] = tv.tv_usec;
-	fwrite((void*)n1, 1, NLMSG_ALIGN(n1->nlmsg_len), fp);
+	res = fwrite((void*)n1, 1, NLMSG_ALIGN(n1->nlmsg_len), fp);
 }
 
 static int dump_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
@@ -51,7 +52,8 @@ static int dump_msg(const struct sockadd
 	FILE *fp = (FILE*)arg;
 	if (!init_phase)
 		write_stamp(fp);
-	fwrite((void*)n, 1, NLMSG_ALIGN(n->nlmsg_len), fp);
+	int res = 0;
+	res = fwrite((void*)n, 1, NLMSG_ALIGN(n->nlmsg_len), fp);
 	fflush(fp);
 	return 0;
 }
Index: misc/ifstat.c
===================================================================
--- misc/ifstat.c.orig
+++ misc/ifstat.c
@@ -717,8 +717,9 @@ int main(int argc, char *argv[])
 				fclose(tfp);
 			}
 			if (uptime >= 0 && time(NULL) >= stb.st_mtime+uptime) {
+				int res = 0;
 				fprintf(stderr, "ifstat: history is aged out, resetting\n");
-				ftruncate(fileno(hist_fp), 0);
+				res = ftruncate(fileno(hist_fp), 0);
 			}
 		}
 
@@ -760,7 +761,8 @@ int main(int argc, char *argv[])
 			dump_incr_db(stdout);
 	}
 	if (!no_update) {
-		ftruncate(fileno(hist_fp), 0);
+		int res = 0;
+		res = ftruncate(fileno(hist_fp), 0);
 		rewind(hist_fp);
 		dump_raw_db(hist_fp, 1);
 		fflush(hist_fp);
Index: misc/lnstat_util.c
===================================================================
--- misc/lnstat_util.c.orig
+++ misc/lnstat_util.c
@@ -49,7 +49,8 @@ static int scan_lines(struct lnstat_file
 
 		num_lines++;
 
-		fgets(buf, sizeof(buf)-1, lf->fp);
+		char* res = 0;
+		res = fgets(buf, sizeof(buf)-1, lf->fp);
 		gettimeofday(&lf->last_read, NULL);
 
 		for (j = 0; j < lf->num_fields; j++) {
@@ -89,12 +90,13 @@ int lnstat_update(struct lnstat_file *ln
 	for (lf = lnstat_files; lf; lf = lf->next) {
 		if (time_after(&lf->last_read, &lf->interval, &tv)) {
 			int i;
+			char* res = 0;
 			struct lnstat_field *lfi;
 
 			rewind(lf->fp);
 			if (!lf->compat) {
 				/* skip first line */
-				fgets(buf, sizeof(buf)-1, lf->fp);
+				res = fgets(buf, sizeof(buf)-1, lf->fp);
 			}
 			scan_lines(lf, 1);
 
@@ -108,7 +110,7 @@ int lnstat_update(struct lnstat_file *ln
 			}
 
 			rewind(lf->fp);
-			fgets(buf, sizeof(buf)-1, lf->fp);
+			res = fgets(buf, sizeof(buf)-1, lf->fp);
 			scan_lines(lf, 0);
 		}
 	}
@@ -140,9 +142,10 @@ static int __lnstat_scan_fields(struct l
 static int lnstat_scan_fields(struct lnstat_file *lf)
 {
 	char buf[FGETS_BUF_SIZE];
+	char* res = 0;
 
 	rewind(lf->fp);
-	fgets(buf, sizeof(buf)-1, lf->fp);
+	res = fgets(buf, sizeof(buf)-1, lf->fp);
 
 	return __lnstat_scan_fields(lf, buf);
 }
Index: misc/nstat.c
===================================================================
--- misc/nstat.c.orig
+++ misc/nstat.c
@@ -567,8 +567,9 @@ int main(int argc, char *argv[])
 				fclose(tfp);
 			}
 			if (uptime >= 0 && time(NULL) >= stb.st_mtime+uptime) {
+				int res = 0;
 				fprintf(stderr, "nstat: history is aged out, resetting\n");
-				ftruncate(fileno(hist_fp), 0);
+				res = ftruncate(fileno(hist_fp), 0);
 			}
 		}
 
@@ -612,7 +613,8 @@ int main(int argc, char *argv[])
 			dump_incr_db(stdout);
 	}
 	if (!no_update) {
-		ftruncate(fileno(hist_fp), 0);
+		int res = 0;
+		res = ftruncate(fileno(hist_fp), 0);
 		rewind(hist_fp);
 		dump_kern_db(hist_fp, 1);
 		fflush(hist_fp);
Index: misc/rtacct.c
===================================================================
--- misc/rtacct.c.orig
+++ misc/rtacct.c
@@ -562,8 +562,10 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "rtacct: something is so wrong with history file, that I prefer not to proceed.\n");
 			exit(-1);
 		}
-		if (stb.st_size != sizeof(*hist_db))
-			write(fd, kern_db, sizeof(*hist_db));
+		if (stb.st_size != sizeof(*hist_db)) {
+			ssize_t res = 0;
+			res = write(fd, kern_db, sizeof(*hist_db));
+		}
 
 		hist_db = mmap(NULL, sizeof(*hist_db),
 			       PROT_READ|PROT_WRITE,
Index: misc/ss.c
===================================================================
--- misc/ss.c.orig
+++ misc/ss.c
@@ -290,7 +290,8 @@ static void user_ent_hash_build(void)
 
 				snprintf(tmp, sizeof(tmp), "%s/%d/stat", root, pid);
 				if ((fp = fopen(tmp, "r")) != NULL) {
-					fscanf(fp, "%*d (%[^)])", process);
+					int res = 0;
+					res = fscanf(fp, "%*d (%[^)])", process);
 					fclose(fp);
 				}
 			}
@@ -372,7 +373,8 @@ int get_slabstat(struct slabstat *s)
 
 	cnt = sizeof(*s)/sizeof(int);
 
-	fgets(buf, sizeof(buf), fp);
+	char* res = 0;
+	res = fgets(buf, sizeof(buf), fp);
 	while(fgets(buf, sizeof(buf), fp) != NULL) {
 		int i;
 		for (i=0; i<sizeof(slabstat_ids)/sizeof(slabstat_ids[0]); i++) {
@@ -496,7 +498,8 @@ void init_service_resolver(void)
 	char buf[128];
 	FILE *fp = popen("/usr/sbin/rpcinfo -p 2>/dev/null", "r");
 	if (fp) {
-		fgets(buf, sizeof(buf), fp);
+		char* res = 0;
+		res = fgets(buf, sizeof(buf), fp);
 		while (fgets(buf, sizeof(buf), fp) != NULL) {
 			unsigned int progn, port;
 			char proto[128], prog[128];
@@ -534,7 +537,8 @@ static int is_ephemeral(int port)
 	if (!ip_local_port_min) {
 		FILE *f = ephemeral_ports_open();
 		if (f) {
-			fscanf(f, "%d %d",
+			int res = 0;
+			res = fscanf(f, "%d %d",
 			       &ip_local_port_min, &ip_local_port_max);
 			fclose(f);
 		} else {
@@ -711,7 +715,8 @@ int run_ssfilter(struct ssfilter *f, str
                 if (!low) {
 			FILE *fp = ephemeral_ports_open();
 			if (fp) {
-				fscanf(fp, "%d%d", &low, &high);
+				int res = 0;
+				res = fscanf(fp, "%d%d", &low, &high);
 				fclose(fp);
 			}
 		}
@@ -1555,8 +1560,10 @@ static int tcp_show_netlink(struct filte
 			return 0;
 		}
 
-		if (dump_fp)
-			fwrite(buf, 1, NLMSG_ALIGN(status), dump_fp);
+		if (dump_fp) {
+			size_t res = 0;
+			res = fwrite(buf, 1, NLMSG_ALIGN(status), dump_fp);
+		}
 
 		h = (struct nlmsghdr*)buf;
 		while (NLMSG_OK(h, status)) {
@@ -1993,9 +2000,11 @@ int unix_show(struct filter *f)
 	int  cnt;
 	struct unixstat *list = NULL;
 
-	if ((fp = net_unix_open()) == NULL)
+	if ((fp = net_unix_open()) == NULL) {
 		return -1;
-	fgets(buf, sizeof(buf)-1, fp);
+	}
+	char* res = 0;
+	res = fgets(buf, sizeof(buf)-1, fp);
 
 	if (memcmp(buf, "Peer", 4) == 0)
 		newformat = 1;
@@ -2081,9 +2090,11 @@ int packet_show(struct filter *f)
 	if (!(f->states & (1<<SS_CLOSE)))
 		return 0;
 
-	if ((fp = net_packet_open()) == NULL)
+	if ((fp = net_packet_open()) == NULL) {
 		return -1;
-	fgets(buf, sizeof(buf)-1, fp);
+	}
+	char* res = 0;
+	res = fgets(buf, sizeof(buf)-1, fp);
 
 	while (fgets(buf, sizeof(buf)-1, fp)) {
 		sscanf(buf, "%llx %*d %d %x %d %d %u %u %u",
@@ -2154,9 +2165,11 @@ int netlink_show(struct filter *f)
 	if (!(f->states & (1<<SS_CLOSE)))
 		return 0;
 
-	if ((fp = net_netlink_open()) == NULL)
+	if ((fp = net_netlink_open()) == NULL) {
 		return -1;
-	fgets(buf, sizeof(buf)-1, fp);
+	}
+	char* res = 0;
+	res = fgets(buf, sizeof(buf)-1, fp);
 
 	while (fgets(buf, sizeof(buf)-1, fp)) {
 		sscanf(buf, "%llx %d %d %x %d %d %llx %d",
Index: netem/maketable.c
===================================================================
--- netem/maketable.c.orig
+++ netem/maketable.c
@@ -38,7 +38,8 @@ readdoubles(FILE *fp, int *number)
 	}
 
 	for (i=0; i<limit; ++i){
-		fscanf(fp, "%lf", &x[i]);
+		int res = 0;
+		res = fscanf(fp, "%lf", &x[i]);
 		if (feof(fp))
 			break;
 		++n;

Places

File iproute2-2.6.29-1-warnings.diff of Package iproute2 (Revision 689e627fbf4aff8e1ed932d038ce2944)

Places