[SCM] dpkg's main repository branch, master, updated. 1.15.7.2-217-gcaba9f9

[Guillem Jover]

The following commit has been merged in the master branch:
commit 15cf1342b886f548e8845dd042a72b028efc5d3d
Author: Guillem Jover <guil...@debian.org>
Date:   Wed Jul 28 17:48:01 2010 +0200

    libdpkg: Rename TarExtractor to tar_extractor

diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index 4846daf..fc34370 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -136,7 +136,7 @@ LIBDPKG_PRIVATE {
        progress_done;
 
        # Tar support
-       TarExtractor;
+       tar_extractor;
 
        # Non-freeing malloc (pool/arena)
        nfmalloc;
diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c
index 3be6179..635a816 100644
--- a/lib/dpkg/tarfn.c
+++ b/lib/dpkg/tarfn.c
@@ -179,7 +179,7 @@ struct symlinkList {
 };
 
 int
-TarExtractor(void *ctx, const struct tar_operations *ops)
+tar_extractor(void *ctx, const struct tar_operations *ops)
 {
        int status;
        char buffer[TARBLKSZ];
diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h
index eeede60..c692abc 100644
--- a/lib/dpkg/tarfn.h
+++ b/lib/dpkg/tarfn.h
@@ -74,6 +74,6 @@ struct tar_operations {
        tar_func mknod;
 };
 
-int TarExtractor(void *ctx, const struct tar_operations *ops);
+int tar_extractor(void *ctx, const struct tar_operations *ops);
 
 #endif
diff --git a/src/archives.c b/src/archives.c
index e646810..7389e29 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -415,7 +415,7 @@ tarobject(void *ctx, struct TarInfo *ti)
 
   /* Append to list of files.
    * The trailing / put on the end of names in tarfiles has already
-   * been stripped by TarExtractor (lib/tarfn.c).
+   * been stripped by tar_extractor (lib/tarfn.c).
    */
   oldnifd= tc->newfilesp;
   nifd= addfiletolist(tc, findnamenode(ti->name, 0));
diff --git a/src/processarc.c b/src/processarc.c
index d955e8a..e2d2a30 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -630,7 +630,7 @@ void process_archive(const char *filename) {
   tc.pkg= pkg;
   tc.backendpipe= p1[0];
 
-  r= TarExtractor((void*)&tc, &tf);
+  r = tar_extractor(&tc, &tf);
   if (r) {
     if (errno) {
       ohshite(_("error reading dpkg-deb tar output"));

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