Ver código fonte

Rename struct packageinlist to pkg_deconf_list

Guillem Jover 18 anos atrás
pai
commit
8f1a7a3643
5 arquivos alterados com 12 adições e 7 exclusões
  1. 5 0
      ChangeLog
  2. 3 3
      src/archives.c
  3. 1 1
      src/archives.h
  4. 2 2
      src/main.h
  5. 1 1
      src/processarc.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-07-22  Guillem Jover  <guillem@debian.org>
+
+	* src/main.h (struct packageinlist): Rename to ...
+	(struct pkg_deconf_list): ... this. Fix all users.
+
 2008-07-22  Guillem Jover  <guillem@debian.org>
 
 	* src/main.h (struct packageinlist): Change 'void *xinfo' member to

+ 3 - 3
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;

+ 1 - 1
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;

+ 2 - 2
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;
 };

+ 1 - 1
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);