The following commit has been merged in the master branch:
commit d1826b026a0930f4950619472f4e8016a4558e63
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Aug 3 23:25:03 2008 +0300
dpkg: Use blankpackageperfile instead of manually blanking the members
diff --git a/ChangeLog b/ChangeLog
index 47e4299..f372991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-03 Guillem Jover <[EMAIL PROTECTED]>
+ * src/processarc.c (process_archive): Use blankpackageperfile instead
+ of manually blanking the members.
+ * src/remove.c (removal_bulk): Likewise.
+
+2008-08-03 Guillem Jover <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c (pid_is_running) [!OSHURD]: Reimplement
using kill instead of less-portable /proc.
diff --git a/TODO b/TODO
index b20880b..a00c2dc 100644
--- a/TODO
+++ b/TODO
@@ -27,7 +27,6 @@ lenny
------
* Code cleanup:
- - Refactor blankfoo embedded code.
- Get rid of static variables inside functions.
- Coalesce admindir / infodir / foodir generation.
- Get rid of setjmp (at least in the general case, keep for dpkg itself?)
diff --git a/src/processarc.c b/src/processarc.c
index 3ed1e9a..42e4003 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -1071,15 +1071,8 @@ void process_archive(const char *filename) {
otherpkg->want= want_purge;
otherpkg->eflag= eflagv_ok;
- otherpkg->installed.depends = NULL;
- otherpkg->installed.essential= 0;
- otherpkg->installed.description = otherpkg->installed.maintainer = NULL;
- otherpkg->installed.installedsize = otherpkg->installed.source = NULL;
- otherpkg->installed.origin = otherpkg->installed.bugs = NULL;
- otherpkg->installed.architecture = NULL;
- otherpkg->installed.conffiles = NULL;
- blankversion(&otherpkg->installed.version);
- otherpkg->installed.arbs = NULL;
+ blankpackageperfile(&otherpkg->installed);
+
otherpkg->clientdata->fileslistvalid= 0;
modstatdb_note(otherpkg);
diff --git a/src/remove.c b/src/remove.c
index 679441e..e959fdc 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -601,14 +601,7 @@ void removal_bulk(struct pkginfo *pkg) {
/* This will mess up reverse links, but if we follow them
* we won't go back because pkg->status is stat_notinstalled.
*/
- pkg->installed.depends = NULL;
- pkg->installed.essential= 0;
- pkg->installed.description = pkg->installed.maintainer = NULL;
- pkg->installed.source = pkg->installed.installedsize = NULL;
- pkg->installed.origin = pkg->installed.bugs = NULL;
- pkg->installed.architecture = NULL;
- blankversion(&pkg->installed.version);
- pkg->installed.arbs = NULL;
+ blankpackageperfile(&pkg->installed);
}
pkg->eflag= eflagv_ok;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
