From: Jim Meyering <meyering@redhat.com>
Date: Fri, 27 Jun 2008 16:52:56 +0000 (+0200)
Subject: uniq: remove redundant test
X-Git-Tag: v7.0~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d9b3de9;p=thirdparty%2Fcoreutils.git

uniq: remove redundant test

* src/uniq.c (find_field): Remove redundant test in outer loop-
termination expression. Also, add a "const" attribute.
---

diff --git a/src/uniq.c b/src/uniq.c
index 5af52710c6..f2aeb77d9b 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -203,14 +203,14 @@ size_opt (char const *opt, char const *msgid)
    return a pointer to the beginning of the line's field to be compared. */
 
 static char *
-find_field (const struct linebuffer *line)
+find_field (struct linebuffer const *line)
 {
   size_t count;
-  char *lp = line->buffer;
+  char const *lp = line->buffer;
   size_t size = line->length - 1;
   size_t i = 0;
 
-  for (count = 0; count < skip_fields && i < size; count++)
+  for (count = 0; count < skip_fields; count++)
     {
       while (i < size && isblank (to_uchar (lp[i])))
 	i++;
@@ -221,7 +221,7 @@ find_field (const struct linebuffer *line)
   for (count = 0; count < skip_chars && i < size; count++)
     i++;
 
-  return lp + i;
+  return line->buffer + i;
 }
 
 /* Return false if two strings OLD and NEW match, true if not.