[SCM] dpkg's main repository branch, master, updated. 1.14.20-114-g13122b7

[Guillem Jover]

The following commit has been merged in the master branch:
commit 8f1a7a3643157f17a955f75fc1c43796c8ac8fc1
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue Jul 22 07:31:02 2008 +0300

    Rename struct packageinlist to pkg_deconf_list

diff --git a/ChangeLog b/ChangeLog
index 8be4206..15e5f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-07-22  Guillem Jover  <[EMAIL PROTECTED]>
 
+       * src/main.h (struct packageinlist): Rename to ...
+       (struct pkg_deconf_list): ... this. Fix all users.
+
+2008-07-22  Guillem Jover  <[EMAIL PROTECTED]>
+
        * src/main.h (struct packageinlist): Change 'void *xinfo' member to
        'struct pkginfo *pkg_removal'. Fix all users.
 
diff --git a/src/archives.c b/src/archives.c
index 37890b9..52153f1 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -261,7 +261,7 @@ int fnameidlu;
 struct varbuf fnamevb;
 struct varbuf fnametmpvb;
 struct varbuf fnamenewvb;
-struct packageinlist *deconfigure = NULL;
+struct pkg_deconf_list *deconfigure = NULL;
 
 static time_t currenttime;
 
@@ -870,7 +870,7 @@ static int try_deconfigure_can(int (*force_p)(struct 
deppossi*),
    *                 1: deconfiguration queued ok (no message printed)
    *                 0: not possible (why is printed)
    */
-  struct packageinlist *newdeconf;
+  struct pkg_deconf_list *newdeconf;
   
   if (force_p && force_p(pdep)) {
     fprintf(stderr, _("dpkg: warning - "
@@ -891,7 +891,7 @@ static int try_deconfigure_can(int (*force_p)(struct 
deppossi*),
       }
     }
     pkg->clientdata->istobe= itb_deconfigure;
-    newdeconf = m_malloc(sizeof(struct packageinlist));
+    newdeconf = m_malloc(sizeof(struct pkg_deconf_list));
     newdeconf->next= deconfigure;
     newdeconf->pkg= pkg;
     newdeconf->pkg_removal = removal;
diff --git a/src/archives.h b/src/archives.h
index 63b81dd..9982df7 100644
--- a/src/archives.h
+++ b/src/archives.h
@@ -32,7 +32,7 @@ extern int fnameidlu;
 extern struct varbuf fnamevb;
 extern struct varbuf fnametmpvb;
 extern struct varbuf fnamenewvb;
-extern struct packageinlist *deconfigure;
+extern struct pkg_deconf_list *deconfigure;
 
 extern struct pkginfo *conflictor[];
 extern int cflict_index;
diff --git a/src/main.h b/src/main.h
index 29a5a63..bf5d433 100644
--- a/src/main.h
+++ b/src/main.h
@@ -46,8 +46,8 @@ struct perpackagestate {
   struct pkginqueue *trigprocdeferred;
 };
 
-struct packageinlist {
-  struct packageinlist *next;
+struct pkg_deconf_list {
+  struct pkg_deconf_list *next;
   struct pkginfo *pkg;
   struct pkginfo *pkg_removal;
 };
diff --git a/src/processarc.c b/src/processarc.c
index e258fa0..3ed1e9a 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -83,7 +83,7 @@ void process_archive(const char *filename) {
   struct filenamenode *namenode;
   struct dirent *de;
   struct stat stab, oldfs;
-  struct packageinlist *deconpil, *deconpiltemp;
+  struct pkg_deconf_list *deconpil, *deconpiltemp;
   
   cleanup_pkg_failed= cleanup_conflictor_failed= 0;
   admindirlen= strlen(admindir);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]