Просмотр исходного кода

dpkg-deb: Rename string variable from err to errstr

Guillem Jover лет назад: 14
Родитель
Сommit
f2199100c9
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      dpkg-deb/extract.c

+ 7 - 7
dpkg-deb/extract.c

@@ -107,7 +107,7 @@ void
 extracthalf(const char *debar, const char *dir, const char *taroption,
 extracthalf(const char *debar, const char *dir, const char *taroption,
             int admininfo)
             int admininfo)
 {
 {
-  const char *err;
+  const char *errstr;
   char versionbuf[40];
   char versionbuf[40];
   struct deb_version version;
   struct deb_version version;
   off_t ctrllennum, memberlen = 0;
   off_t ctrllennum, memberlen = 0;
@@ -161,9 +161,9 @@ extracthalf(const char *debar, const char *dir, const char *taroption,
 
 
         if (strchr(infobuf, '\n') == NULL)
         if (strchr(infobuf, '\n') == NULL)
           ohshit(_("archive has no newlines in header"));
           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)
         if (version.major != 2)
           ohshit(_("archive is format version %d.%d; get a newer dpkg-deb"),
           ohshit(_("archive is format version %d.%d; get a newer dpkg-deb"),
                  version.major, version.minor);
                  version.major, version.minor);
@@ -224,9 +224,9 @@ extracthalf(const char *debar, const char *dir, const char *taroption,
 
 
     if (strchr(versionbuf, '\n') == NULL)
     if (strchr(versionbuf, '\n') == NULL)
       ohshit(_("archive has no newlines in header"));
       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));
     r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf));
     if (r < 0)
     if (r < 0)