diff options
| author | Guillem Jover <guillem@debian.org> | 2011-05-03 10:55:45 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2011-09-09 09:32:47 +0200 |
| commit | 3650a669fb01737444656916a6a7a09e82800679 (patch) | |
| tree | 6c4bf12d6c993e58fa63732d84bd163b4425d048 /dpkg-deb | |
| parent | 3416f1d5c7a78e49a52f079b1e2a8576025650cb (diff) | |
| download | dpkg-3650a669fb01737444656916a6a7a09e82800679.tar.gz | |
libdpkg: Rename fd_null_copy() to fd_skip()
Diffstat (limited to 'dpkg-deb')
| -rw-r--r-- | dpkg-deb/extract.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index f80955e7a..737dab7af 100644 --- a/dpkg-deb/extract.c +++ b/dpkg-deb/extract.c @@ -175,8 +175,8 @@ extracthalf(const char *debar, const char *dir, const char *taroption, } else if (arh.ar_name[0] == '_') { /* Members with ‘_’ are noncritical, and if we don't understand * them we skip them. */ - fd_null_copy(arfd, memberlen + (memberlen & 1), - _("skipped archive member data from %s"), debar); + fd_skip(arfd, memberlen + (memberlen & 1), + _("skipped archive member data from %s"), debar); } else { if (strncmp(arh.ar_name, ADMINMEMBER, sizeof(arh.ar_name)) == 0) adminmember = 1; @@ -201,8 +201,8 @@ extracthalf(const char *debar, const char *dir, const char *taroption, ctrllennum= memberlen; } if (!adminmember != !admininfo) { - fd_null_copy(arfd, memberlen + (memberlen & 1), - _("skipped archive member data from %s"), debar); + fd_skip(arfd, memberlen + (memberlen & 1), + _("skipped archive member data from %s"), debar); } else { /* Yes! - found it. */ break; @@ -238,8 +238,8 @@ extracthalf(const char *debar, const char *dir, const char *taroption, memberlen = ctrllennum; } else { memberlen = stab.st_size - ctrllennum - strlen(ctrllenbuf) - l; - fd_null_copy(arfd, ctrllennum, - _("skipped archive control member data from %s"), debar); + fd_skip(arfd, ctrllennum, + _("skipped archive control member data from %s"), debar); } if (admininfo >= 2) { |