Module Name: othersrc
Committed By: agc
Date: Thu Sep 18 01:47:13 UTC 2014
Modified Files:
othersrc/external/bsd/netdiff/dist: diff.c mem.c qdiff.c
Log Message:
fixes for WARNS=5 with gcc-4.8
Mainly "variable set but not used errors"
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/netdiff/dist/diff.c
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/mem.c
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/qdiff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/netdiff/dist/diff.c
diff -u othersrc/external/bsd/netdiff/dist/diff.c:1.5 othersrc/external/bsd/netdiff/dist/diff.c:1.6
--- othersrc/external/bsd/netdiff/dist/diff.c:1.5 Wed Jan 16 01:50:19 2013
+++ othersrc/external/bsd/netdiff/dist/diff.c Thu Sep 18 01:47:13 2014
@@ -340,7 +340,6 @@ main(int argc, char **argv)
{
diff_t diff;
char **oargv;
- char *line_format, *group_format;
char *prog;
int ch, lastch, prevoptind, newarg;
int oargc;
@@ -455,7 +454,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -463,7 +461,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
Index: othersrc/external/bsd/netdiff/dist/mem.c
diff -u othersrc/external/bsd/netdiff/dist/mem.c:1.2 othersrc/external/bsd/netdiff/dist/mem.c:1.3
--- othersrc/external/bsd/netdiff/dist/mem.c:1.2 Wed Jan 16 01:50:19 2013
+++ othersrc/external/bsd/netdiff/dist/mem.c Thu Sep 18 01:47:13 2014
@@ -279,6 +279,7 @@ read_excludes_file(diff_t *diff, char *f
char *buf, *pattern;
size_t len;
+ pattern = NULL;
if (strcmp(file, "-") == 0) {
fp = stdin;
} else if ((fp = fopen(file, "r")) == NULL) {
@@ -380,7 +381,6 @@ main(int argc, char **argv)
{
diff_t diff;
char **oargv;
- char *line_format, *group_format;
char *prog;
int ch, lastch, prevoptind, newarg;
int oargc;
@@ -495,7 +495,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -503,7 +502,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
Index: othersrc/external/bsd/netdiff/dist/qdiff.c
diff -u othersrc/external/bsd/netdiff/dist/qdiff.c:1.3 othersrc/external/bsd/netdiff/dist/qdiff.c:1.4
--- othersrc/external/bsd/netdiff/dist/qdiff.c:1.3 Wed Jan 16 01:50:20 2013
+++ othersrc/external/bsd/netdiff/dist/qdiff.c Thu Sep 18 01:47:13 2014
@@ -278,18 +278,21 @@ read_excludes_file(diff_t *diff, char *f
char *buf, *pattern;
size_t len;
- if (strcmp(file, "-") == 0)
+ pattern = NULL;
+ if (strcmp(file, "-") == 0) {
fp = stdin;
- else if ((fp = fopen(file, "r")) == NULL)
+ } else if ((fp = fopen(file, "r")) == NULL) {
err(2, "%s", file);
+ }
while ((buf = fgetln(fp, &len)) != NULL) {
if (buf[len - 1] == '\n') {
len--;
}
push_excludes(diff, pattern, len);
}
- if (strcmp(file, "-") != 0)
+ if (strcmp(file, "-") != 0) {
fclose(fp);
+ }
}
static int
@@ -334,8 +337,6 @@ main(int argc, char **argv)
{
diff_t diff;
size_t cc;
- char *line_format;
- char *group_format;
char **oargv;
char *prog;
char *s;
@@ -449,7 +450,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -457,7 +457,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
