From 4a45a273ead089ffa280ce5c160039ec392fa6f3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 1 Mar 2007 03:08:41 +0000
Subject: * Fix up _alpm_db_free, remove use of void*.

---
 lib/libalpm/db.c     | 6 ++----
 lib/libalpm/db.h     | 2 +-
 lib/libalpm/server.h | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 62255a3f..a44e079d 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -78,13 +78,11 @@ pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename)
 	return(db);
 }
 
-void _alpm_db_free(void *data)
+void _alpm_db_free(pmdb_t *db)
 {
-	pmdb_t *db = data;
-
 	ALPM_LOG_FUNC;
 
-	FREELISTSERVERS(db->servers);
+	_FREELIST(db->servers, _alpm_server_free);
 	FREE(db->path);
 	FREE(db);
 
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 008ff669..4f3c1bf0 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -48,7 +48,7 @@ struct __pmdb_t {
 
 /* db.c, database general calls */
 pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename);
-void _alpm_db_free(void *data);
+void _alpm_db_free(pmdb_t *db);
 int _alpm_db_cmp(const void *db1, const void *db2);
 alpm_list_t *_alpm_db_search(pmdb_t *db, alpm_list_t *needles);
 pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback);
diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h
index 60c9163c..8c357ab2 100644
--- a/lib/libalpm/server.h
+++ b/lib/libalpm/server.h
@@ -28,7 +28,6 @@
 #include <download.h>
 
 #define FREESERVER(p) do { if(p){_alpm_server_free(p); p = NULL;}} while(0)
-#define FREELISTSERVERS(p) _FREELIST(p, _alpm_server_free)
 
 /* Servers */
 struct __pmserver_t {
-- 
cgit v1.2.3-24-g4f1b