[SCM] dpkg's main repository branch, master, updated. 1.16.5

[Guillem Jover]

The following commit has been merged in the master branch:
commit f2199100c96c85850f6aee405fe69c888bb34b5b
Author: Guillem Jover <guil...@debian.org>
Date:   Tue Jun 26 20:05:59 2012 +0200

    dpkg-deb: Rename string variable from err to errstr

diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 08b0664..868df21 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -107,7 +107,7 @@ void
 extracthalf(const char *debar, const char *dir, const char *taroption,
             int admininfo)
 {
-  const char *err;
+  const char *errstr;
   char versionbuf[40];
   struct deb_version version;
   off_t ctrllennum, memberlen = 0;
@@ -161,9 +161,9 @@ extracthalf(const char *debar, const char *dir, const char 
*taroption,
 
         if (strchr(infobuf, '\n') == NULL)
           ohshit(_("archive has no newlines in header"));
-        err = deb_version_parse(&version, infobuf);
-        if (err)
-          ohshit(_("archive has invalid format version: %s"), err);
+        errstr = deb_version_parse(&version, infobuf);
+        if (errstr)
+          ohshit(_("archive has invalid format version: %s"), errstr);
         if (version.major != 2)
           ohshit(_("archive is format version %d.%d; get a newer dpkg-deb"),
                  version.major, version.minor);
@@ -224,9 +224,9 @@ extracthalf(const char *debar, const char *dir, const char 
*taroption,
 
     if (strchr(versionbuf, '\n') == NULL)
       ohshit(_("archive has no newlines in header"));
-    err = deb_version_parse(&version, versionbuf);
-    if (err)
-      ohshit(_("archive has invalid format version: %s"), err);
+    errstr = deb_version_parse(&version, versionbuf);
+    if (errstr)
+      ohshit(_("archive has invalid format version: %s"), errstr);
 
     r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf));
     if (r < 0)

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org