From 02f46276dd48fdce51515bc6f4332db7f4c10569423f7685996dac034ed6ef6a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 13 Oct 2008 14:30:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=15 --- iproute2-2.6.25-warnings.diff | 375 ++++++++++++++++++++++++++++++++++ iproute2.changes | 5 + iproute2.spec | 6 +- 3 files changed, 385 insertions(+), 1 deletion(-) create mode 100644 iproute2-2.6.25-warnings.diff diff --git a/iproute2-2.6.25-warnings.diff b/iproute2-2.6.25-warnings.diff new file mode 100644 index 0000000..4517c7b --- /dev/null +++ b/iproute2-2.6.25-warnings.diff @@ -0,0 +1,375 @@ +--- ./tc/q_netem.c.orig 2008-10-13 13:17:03.000000000 +0000 ++++ ./tc/q_netem.c 2008-10-13 13:19:54.000000000 +0000 +@@ -100,7 +100,8 @@ + static int isnumber(const char *arg) + { + char *p; +- (void) strtod(arg, &p); ++ double res = 0; ++ res = strtod(arg, &p); + return (p != arg); + } + +--- ./netem/maketable.c.orig 2008-10-13 13:32:22.000000000 +0000 ++++ ./netem/maketable.c 2008-10-13 13:32:47.000000000 +0000 +@@ -38,7 +38,8 @@ + } + + for (i=0; inlmsg_type = 15; + n1->nlmsg_flags = 0; +@@ -42,7 +43,7 @@ + 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, +--- ./misc/lnstat_util.c.orig 2008-10-13 13:30:32.000000000 +0000 ++++ ./misc/lnstat_util.c 2008-10-13 13:32:00.000000000 +0000 +@@ -49,7 +49,8 @@ + + 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 @@ + 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 @@ + } + + 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 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); + } +--- ./misc/ss.c.orig 2008-10-13 13:18:25.000000000 +0000 ++++ ./misc/ss.c 2008-10-13 13:25:22.000000000 +0000 +@@ -261,7 +261,8 @@ + snprintf(tmp, sizeof(tmp), "%s/%d/stat", + getenv("PROC_ROOT") ? : "/proc", pid); + if ((fp = fopen(tmp, "r")) != NULL) { +- fscanf(fp, "%*d (%[^)])", process); ++ int res = 0; ++ res = fscanf(fp, "%*d (%[^)])", process); + fclose(fp); + } + } +@@ -315,7 +316,8 @@ + + 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/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]; +@@ -477,7 +480,8 @@ + 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 { +@@ -654,7 +658,8 @@ + 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); + } + } +@@ -1496,8 +1501,10 @@ + 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)) { +@@ -1929,9 +1936,11 @@ + 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; +@@ -2017,9 +2026,11 @@ + if (!(f->states & (1<states & (1<= 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 +762,8 @@ + 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); +--- ./misc/nstat.c.orig 2008-10-13 13:25:58.000000000 +0000 ++++ ./misc/nstat.c 2008-10-13 13:27:16.000000000 +0000 +@@ -515,7 +515,8 @@ + } + if (fork()) + exit(0); +- chdir("/"); ++ int res = 0; ++ res = chdir("/"); + close(0); close(1); close(2); setsid(); + signal(SIGPIPE, SIG_IGN); + signal(SIGCHLD, sigchild); +@@ -567,8 +568,9 @@ + 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 +614,8 @@ + 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); +--- ./misc/arpd.c.orig 2008-10-13 13:29:59.000000000 +0000 ++++ ./misc/arpd.c 2008-10-13 13:30:14.000000000 +0000 +@@ -786,7 +786,8 @@ + goto do_abort; + } + +- chdir("/"); ++ int res = 0; ++ res = chdir("/"); + fd = open("/dev/null", O_RDWR); + if (fd >= 0) { + dup2(fd, 0); +--- ./ip/rtmon.c.orig 2008-10-13 15:41:51.000000000 +0200 ++++ ./ip/rtmon.c 2008-10-13 15:42:19.000000000 +0200 +@@ -52,7 +52,8 @@ + 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; + } diff --git a/iproute2.changes b/iproute2.changes index e73a5ec..48221ee 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 13 15:39:40 CEST 2008 - ms@suse.de + +- fixed compiler warnings (bnc #434714) + ------------------------------------------------------------------- Thu Sep 18 09:46:42 CEST 2008 - hare@suse.de diff --git a/iproute2.spec b/iproute2.spec index fadd3c5..5bce8db 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -25,7 +25,7 @@ Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on Version: 2.6.25 -Release: 40 +Release: 41 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -39,6 +39,7 @@ Patch6: %name-2.6.25-flushcheckuid.diff Patch7: %name-m_skbedit.patch Patch8: %name-q_multiq.patch Patch9: %name-2.6.25-DCCP-redefine +Patch10: %name-2.6.25-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnetlink-devel @@ -77,6 +78,7 @@ Authors: %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -127,6 +129,8 @@ rm -rf $RPM_BUILD_ROOT %_libdir/lib* %changelog +* Mon Oct 13 2008 ms@suse.de +- fixed compiler warnings (bnc #434714) * Thu Sep 18 2008 hare@suse.de - Add skbedit support for FCoE (FATE#303914) - Add multiqueue support for FCoE (FATE#303914)