diff options
| author | Guillem Jover <guillem@debian.org> | 2012-06-26 20:05:59 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2012-06-30 06:35:24 +0200 |
| commit | f2199100c96c85850f6aee405fe69c888bb34b5b (patch) | |
| tree | 54b6006dfd7599b08a46dfab7271d099bf8de2e4 /dpkg-deb | |
| parent | fdeacd2d9fba81b71e3fad7e4b60e25f940d4b23 (diff) | |
| download | dpkg-f2199100c96c85850f6aee405fe69c888bb34b5b.tar.gz | |
dpkg-deb: Rename string variable from err to errstr
Diffstat (limited to 'dpkg-deb')
| -rw-r--r-- | dpkg-deb/extract.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index 08b0664a8..868df2131 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) |