libdpkg: Remove unused argument from unlockdatabase

diff --git a/ChangeLog b/ChangeLog
index 18da5cf6db5fad49f9ed4cbe775111b2e8c12e3f..a5b707d3c21a4a281370724cec2b6f83c16d9d96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25  Guillem Jover  <guillem@debian.org>
+
+       * lib/dpkg-db.h (unlockdatabase): Change prototype to not take any
+       argument (as it was not being used). Fix all callers.
+       * lib/lock.c (unlockdatabase): Likewise.
+
 2008-03-25  Ian Jackson  <ian@davenant.greenend.org.uk>,
             Guillem Jover  <guillem@debian.org>
 

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index ba85037f59fd8d60c8606e81389f530e5ab17ebe..d8556528955633c95d75892505a401c6dfab1876 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -222,7 +222,7 @@ void modstatdb_shutdown(void) {
     varbuffree(&uvb);
     /* fall through */
   case msdbrw_needsuperuserlockonly:
-    unlockdatabase(admindir);
+    unlockdatabase();
   default:
     break;
   }

diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index f56ab69487fa2e2c0a4b3db493a068190b173ef7..edb67fa61da73f9b32d912ee1d8c60e38be05a22 100644 (file)
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -151,7 +151,7 @@ struct pkginfo { /* pig */
 /*** from lock.c ***/
 
 void lockdatabase(const char *admindir);
-void unlockdatabase(const char *admindir);
+void unlockdatabase(void);
 
 /*** from dbmodify.c ***/
 

diff --git a/lib/lock.c b/lib/lock.c
index 5d8e3c0cb8bd3876775d2ed03aed3c6f3be3477e..3cf83642348c553d7c4d98fbb69b619dd6927264 100644 (file)
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -77,7 +77,9 @@ lock_file(int *lockfd, const char *filename,
   push_cleanup(cu_unlock_file, ~0, NULL, 0, 1, lockfd);
 }
 
-void unlockdatabase(const char *admindir) {
+void
+unlockdatabase(void)
+{
   unlock_file();
 }
 

diff --git a/src/update.c b/src/update.c
index 1b14cb3c361ec3abdd74be2b893ce1be3e232f7a..b1b59a23704a09ff59d9f9a3d5ee30589d598247 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -87,7 +87,7 @@ void updateavailable(const char *const *argv) {
 
   if (!f_noact) {
     writedb(vb.buf,1,0);
-    unlockdatabase(admindir);
+    unlockdatabase();
   }
 
   if (cipaction->arg != act_avclear)