libdpkg: Rename fd_null_copy() to fd_skip()

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) {

dpkg-split/join.c

@@ -55,7 +55,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
     fd_in = open(pi->filename, O_RDONLY);
     if (fd_in < 0)
       ohshite(_("unable to (re)open input part file `%.250s'"), pi->filename);
-    fd_null_copy(fd_in, pi->headerlen, _("skipping split package header"));
+    fd_skip(fd_in, pi->headerlen, _("skipping split package header"));
     fd_fd_copy(fd_in, fd_out, pi->thispartlen, _("split package part"));
     close(fd_in);
 

lib/dpkg/buffer.h

@@ -59,7 +59,7 @@ struct buffer_data {
 # define fd_vbuf_copy(fd, buf, limit, ...) \
 	buffer_copy_IntPtr(fd, BUFFER_READ_FD, buf, BUFFER_WRITE_VBUF, \
 	                   limit, __VA_ARGS__)
-# define fd_null_copy(fd, limit, ...) \
+# define fd_skip(fd, limit, ...) \
 	buffer_skip_Int(fd, BUFFER_READ_FD, limit, __VA_ARGS__)
 
 off_t buffer_copy_IntPtr(int i, int typeIn, void *p, int typeOut,

src/archives.c

@@ -191,9 +191,9 @@ tarfile_skip_one_forward(struct tarcontext *tc, struct tar_entry *ti)
   if (ti->type == tar_filetype_file) {
     char fnamebuf[256];
 
-    fd_null_copy(tc->backendpipe, ti->size,
-                 _("skipped unpacking file '%.255s' (replaced or excluded?)"),
-                 path_quote_filename(fnamebuf, ti->name, 256));
+    fd_skip(tc->backendpipe, ti->size,
+            _("skipped unpacking file '%.255s' (replaced or excluded?)"),
+            path_quote_filename(fnamebuf, ti->name, 256));
     r = ti->size % TARBLKSZ;
     if (r > 0)
       if (fd_read(tc->backendpipe, databuf, TARBLKSZ - r) < 0)

src/processarc.c

@@ -846,7 +846,7 @@ void process_archive(const char *filename) {
       ohshit(_("corrupted filesystem tarfile - corrupted package archive"));
     }
   }
-  fd_null_copy(p1[0], -1, _("dpkg-deb: zap possible trailing zeros"));
+  fd_skip(p1[0], -1, _("dpkg-deb: zap possible trailing zeros"));
   close(p1[0]);
   p1[0] = -1;
   subproc_wait_check(pid, BACKEND " --fsys-tarfile", PROCPIPE);