diff options
| author | Jim Meyering <jim@meyering.net> | 1999-08-22 08:16:34 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-08-22 08:16:34 +0000 |
| commit | a711e8e1324bac94b850568dc5005aa2b51dbada (patch) | |
| tree | 996fb9164e3e2afd145406a2e4b069aa4f389cd2 /src | |
| parent | e32013660ee193e68a44f8245ff57c8f94fa5bb7 (diff) | |
| download | coreutils-a711e8e1324bac94b850568dc5005aa2b51dbada.tar.xz | |
(check_file): Move declarations of local variables
into the scopes where they're used.
(min): Remove macro definition.
(different): Use MIN, not min.
Diffstat (limited to 'src')
| -rw-r--r-- | src/uniq.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/uniq.c b/src/uniq.c index c50337b09..7af6072f1 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -173,9 +173,9 @@ different (const char *old, const char *new, size_t oldlen, size_t newlen) avoid portability hassles of getting a non-conflicting declaration of memcmp. */ if (ignore_case) - order = memcasecmp (old, new, min (oldlen, newlen)); + order = memcasecmp (old, new, MIN (oldlen, newlen)); else - order = memcmp (old, new, min (oldlen, newlen)); + order = memcmp (old, new, MIN (oldlen, newlen)); if (order == 0) return oldlen - newlen; @@ -210,9 +210,9 @@ check_file (const char *infile, const char *outfile) FILE *istream; FILE *ostream; struct linebuffer lb1, lb2; - struct linebuffer *thisline, *prevline, *exch; - char *prevfield, *thisfield; - size_t prevlen, thislen; + struct linebuffer *thisline, *prevline; + char *prevfield; + size_t prevlen; int match_count = 0; if (STREQ (infile, "-")) @@ -243,6 +243,8 @@ check_file (const char *infile, const char *outfile) while (!feof (istream)) { int match; + char *thisfield; + size_t thislen; if (readline (thisline, istream) == 0) break; thisfield = find_field (thisline); @@ -254,10 +256,11 @@ check_file (const char *infile, const char *outfile) if (!match || mode == output_all_repeated) { + struct linebuffer *tmp; writeline (prevline, ostream, match_count); - exch = prevline; + tmp = prevline; prevline = thisline; - thisline = exch; + thisline = tmp; prevfield = thisfield; prevlen = thislen; if (!match) |