[SCM] dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd

[Guillem Jover]

The following commit has been merged in the master branch:
commit 571ab351cb9a7df6e94a7d0de2711a04afd4aaf6
Author: Guillem Jover <guil...@debian.org>
Date:   Fri Mar 16 11:25:35 2012 +0100

    dpkg: Rename tarfile_skip_one_forward() to tarobject_skip_entry()

diff --git a/src/archives.c b/src/archives.c
index 1926eb3..083c5b3 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -183,7 +183,7 @@ int tarfileread(void *ud, char *buf, int len) {
 }
 
 static void
-tarfile_skip_one_forward(struct tarcontext *tc, struct tar_entry *ti)
+tarobject_skip_entry(struct tarcontext *tc, struct tar_entry *ti)
 {
   size_t r;
   char databuf[TARBLKSZ];
@@ -780,14 +780,14 @@ tarobject(void *ctx, struct tar_entry *ti)
 
   if (keepexisting) {
     remove_file_from_list(tc, ti, oldnifd, nifd);
-    tarfile_skip_one_forward(tc, ti);
+    tarobject_skip_entry(tc, ti);
     return 0;
   }
 
   if (filter_should_skip(ti)) {
     nifd->namenode->flags &= ~fnnf_new_inarchive;
     nifd->namenode->flags |= fnnf_filtered;
-    tarfile_skip_one_forward(tc, ti);
+    tarobject_skip_entry(tc, ti);
 
     return 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