Преглед на файлове

Give a proper type and name to the xinfo member in packageinlist

This struct is being used privately by the deconfiguring code, so we
can give a proper type and name to the member.
Guillem Jover преди 18 години
родител
ревизия
1a33c16f3d
променени са 4 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. 5 0
      ChangeLog
  2. 1 1
      src/archives.c
  3. 1 1
      src/main.h
  4. 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): Change 'void *xinfo' member to
+	'struct pkginfo *pkg_removal'. Fix all users.
+
 2008-07-22  Guillem Jover  <guillem@debian.org>
 2008-07-22  Guillem Jover  <guillem@debian.org>
 
 
 	* src/main.h (ignoredependss): Change type to 'struct pkginqueue'.
 	* src/main.h (ignoredependss): Change type to 'struct pkginqueue'.

+ 1 - 1
src/archives.c

@@ -894,7 +894,7 @@ static int try_deconfigure_can(int (*force_p)(struct deppossi*),
     newdeconf = m_malloc(sizeof(struct packageinlist));
     newdeconf = m_malloc(sizeof(struct packageinlist));
     newdeconf->next= deconfigure;
     newdeconf->next= deconfigure;
     newdeconf->pkg= pkg;
     newdeconf->pkg= pkg;
-    newdeconf->xinfo= removal;
+    newdeconf->pkg_removal = removal;
     deconfigure= newdeconf;
     deconfigure= newdeconf;
     return 1;
     return 1;
   } else {
   } else {

+ 1 - 1
src/main.h

@@ -49,7 +49,7 @@ struct perpackagestate {
 struct packageinlist {
 struct packageinlist {
   struct packageinlist *next;
   struct packageinlist *next;
   struct pkginfo *pkg;
   struct pkginfo *pkg;
-  void *xinfo;
+  struct pkginfo *pkg_removal;
 };
 };
 
 
 struct pkginqueue {
 struct pkginqueue {

+ 1 - 1
src/processarc.c

@@ -412,7 +412,7 @@ void process_archive(const char *filename) {
   }
   }
 
 
   for (deconpil= deconfigure; deconpil; deconpil= deconpil->next) {
   for (deconpil= deconfigure; deconpil; deconpil= deconpil->next) {
-    struct pkginfo *removing= deconpil->xinfo;
+    struct pkginfo *removing = deconpil->pkg_removal;
 
 
     if (removing)
     if (removing)
       printf(_("De-configuring %s, to allow removal of %s ...\n"),
       printf(_("De-configuring %s, to allow removal of %s ...\n"),