[Reproducible-commits] [dpkg] 24/63: dpkg: Rename filenamenode_queu_push() to tar_filenamenode_queue_push()

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit e37401bdf52b1ed61ac4620cb9361554382a7598
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Feb 18 17:57:30 2016 +0100

    dpkg: Rename filenamenode_queu_push() to tar_filenamenode_queue_push()
    
    Make the function less general, as we are using an extraction specific
    obstack.
---
 src/archives.c | 32 ++++++++++++++++----------------
 src/archives.h |  4 ++++
 src/main.h     |  5 -----
 src/unpack.c   |  4 ++--
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/archives.c b/src/archives.c
index 92f7def..8a0ef34 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -113,6 +113,22 @@ tar_pool_release(void)
   }
 }
 
+struct fileinlist *
+tar_filenamenode_queue_push(struct filenamenode_queue *queue,
+                            struct filenamenode *namenode)
+{
+  struct fileinlist *node;
+
+  node = tar_pool_alloc(sizeof(*node));
+  node->namenode = namenode;
+  node->next = NULL;
+
+  *queue->tail = node;
+  queue->tail = &node->next;
+
+  return node;
+}
+
 /**
  * Check if a file or directory will save a package from disappearance.
  *
@@ -1648,19 +1664,3 @@ wanttoinstall(struct pkginfo *pkg)
     }
   }
 }
-
-struct fileinlist *
-filenamenode_queue_push(struct filenamenode_queue *queue,
-                        struct filenamenode *namenode)
-{
-  struct fileinlist *node;
-
-  node = tar_pool_alloc(sizeof(*node));
-  node->next = NULL;
-  node->namenode = namenode;
-
-  *queue->tail = node;
-  queue->tail = &node->next;
-
-  return node;
-}
diff --git a/src/archives.h b/src/archives.h
index 4eecf48..c7fff1a 100644
--- a/src/archives.h
+++ b/src/archives.h
@@ -73,6 +73,10 @@ int tarobject(void *ctx, struct tar_entry *ti);
 int tarfileread(void *ud, char *buf, int len);
 void tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg);
 
+struct fileinlist *
+tar_filenamenode_queue_push(struct filenamenode_queue *queue,
+                            struct filenamenode *namenode);
+
 bool filesavespackage(struct fileinlist *, struct pkginfo *,
                       struct pkginfo *pkgbeinginstalled);
 
diff --git a/src/main.h b/src/main.h
index cc8dfa7..b7c1db7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -27,7 +27,6 @@
 
 /* These two are defined in filesdb.h. */
 struct fileinlist;
-struct filenamenode_queue;
 struct filenamenode;
 
 enum pkg_istobe {
@@ -163,10 +162,6 @@ int archivefiles(const char *const *argv);
 void process_archive(const char *filename);
 bool wanttoinstall(struct pkginfo *pkg);
 
-struct fileinlist *
-filenamenode_queue_push(struct filenamenode_queue *queue,
-                        struct filenamenode *namenode);
-
 /* from update.c */
 
 int forgetold(const char *const *argv);
diff --git a/src/unpack.c b/src/unpack.c
index 27ca15c..ba886a7 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -237,7 +237,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
 
     namenode = findnamenode(conffilenamebuf, 0);
     namenode->oldhash = NEWCONFFILEFLAG;
-    newconff = filenamenode_queue_push(newconffiles, namenode);
+    newconff = tar_filenamenode_queue_push(newconffiles, namenode);
 
     /*
      * Let's see if any packages have this file.
@@ -1137,7 +1137,7 @@ void process_archive(const char *filename) {
 	  debug(dbg_eachfile, "process_archive: old conff %s"
 		" is disappearing", namenode->name);
 	  namenode->flags |= fnnf_obs_conff;
-	  filenamenode_queue_push(&newconffiles, namenode);
+	  tar_filenamenode_queue_push(&newconffiles, namenode);
 	  addfiletolist(&tc, namenode);
 	}
 	continue;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git