libdpkg: Remove unneeded variable assignments and a variable

diff --git a/ChangeLog b/ChangeLog
index 762dbe203c2695d7bfd08257f7468118cb8f035f..d969a3f1a649d9daba7f93061597e7a21009584d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02  Guillem Jover  <guillem@debian.org>
+
+       * lib/fields.c (convert_string): Remove unneeded variable assignments.
+       Get rid this way of an int variable.
+
 2008-07-02  Guillem Jover  <guillem@debian.org>
 
        * lib/fields.c (convert_string): Change nvip to be const and use a

diff --git a/lib/fields.c b/lib/fields.c
index 7e1abf068911d3a59b2ee28c89f7c9f9a719d22f..9fc8197023c1b4ed6a7f7fc808a461b3fda77010 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -38,11 +38,9 @@ convert_string(const char *filename, int lno, const char *what, int otherwise,
                const char **endpp)
 {
   const char *ep;
-  int c;
   const struct namevalue *nvip = ivip;
 
-  ep= startp;
-  if (!*ep)
+  if (!*startp)
     parse_error(filename, lno, pigp, _("%s is missing"), what);
   while (nvip->name) {
     if (strncasecmp(nvip->name, startp, nvip->length))
@@ -55,10 +53,11 @@ convert_string(const char *filename, int lno, const char *what, int otherwise,
     parse_error(filename, lno, pigp, _("`%.*s' is not allowed for %s"),
                 strnlen(startp, 50), startp, what);
   }
+
   ep = startp + nvip->length;
-  c = *ep;
-  while (isspace(c)) c= *++ep;
-  if (c && !endpp)
+  while (isspace(*ep))
+    ep++;
+  if (*ep && !endpp)
     parse_error(filename, lno, pigp, _("junk after %s"), what);
   if (endpp) *endpp= ep;
   return nvip->value;