diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-07 00:24:49 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-07 00:24:49 +0000 |
commit | b05955e0a5aa5c16ef9460cf4bfed1ee589f5f64 (patch) | |
tree | 5079522aec9f156630fd4fa8dbc4a89ae852942d | |
parent | 8336f080cb921a8c64c4cea59463363144e97c1d (diff) | |
download | busybox-w32-b05955e0a5aa5c16ef9460cf4bfed1ee589f5f64.tar.gz busybox-w32-b05955e0a5aa5c16ef9460cf4bfed1ee589f5f64.tar.bz2 busybox-w32-b05955e0a5aa5c16ef9460cf4bfed1ee589f5f64.zip |
work around gcc's false warning
-rw-r--r-- | coreutils/diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/coreutils/diff.c b/coreutils/diff.c index 2ce681aff..872b78830 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c | |||
@@ -898,8 +898,8 @@ static int diffreg(char *ofile1, char *ofile2, int flags) | |||
898 | { | 898 | { |
899 | char *file1 = ofile1; | 899 | char *file1 = ofile1; |
900 | char *file2 = ofile2; | 900 | char *file2 = ofile2; |
901 | FILE *f1; | 901 | FILE *f1 = stdin; |
902 | FILE *f2; | 902 | FILE *f2 = stdin; |
903 | int rval = D_SAME; | 903 | int rval = D_SAME; |
904 | int i; | 904 | int i; |
905 | 905 | ||
@@ -911,7 +911,6 @@ static int diffreg(char *ofile1, char *ofile2, int flags) | |||
911 | if (LONE_DASH(file1) && LONE_DASH(file2)) | 911 | if (LONE_DASH(file1) && LONE_DASH(file2)) |
912 | goto closem; | 912 | goto closem; |
913 | 913 | ||
914 | f1 = f2 = stdin; | ||
915 | if (flags & D_EMPTY1) | 914 | if (flags & D_EMPTY1) |
916 | f1 = xfopen(bb_dev_null, "r"); | 915 | f1 = xfopen(bb_dev_null, "r"); |
917 | else if (NOT_LONE_DASH(file1)) | 916 | else if (NOT_LONE_DASH(file1)) |