[pacman-dev] [PATCH 12/13] Remove global handle variable

[Dan McGee]

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 lib/libalpm/alpm.c   |    8 --------
 lib/libalpm/handle.c |    4 ----
 lib/libalpm/log.c    |    3 ---
 3 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 86b1619..5d475ce 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -34,9 +34,6 @@
 #include "log.h"
 #include "util.h"
 
-/* Globals */
-extern pmhandle_t *handle;
-
 /** \addtogroup alpm_interface Interface Functions
  * @brief Functions to initialize and release libalpm
  * @{
@@ -86,8 +83,6 @@ pmhandle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
 	myhandle->curl = curl_easy_init();
 #endif
 
-	/* TODO temporary until global var removed */
-	handle = myhandle;
 	return myhandle;
 
 cleanup:
@@ -123,9 +118,6 @@ int SYMEXPORT alpm_release(pmhandle_t *myhandle)
 	}
 
 	_alpm_handle_free(myhandle);
-	myhandle = NULL;
-	/* TODO temporary until global var removed */
-	handle = NULL;
 
 #ifdef HAVE_LIBCURL
 	curl_global_cleanup();
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index c2bad4c..898ce41 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -37,9 +37,6 @@
 #include "trans.h"
 #include "alpm.h"
 
-/* global var for handle (private to libalpm) */
-pmhandle_t *handle = NULL;
-
 pmhandle_t *_alpm_handle_new()
 {
 	pmhandle_t *handle;
@@ -87,7 +84,6 @@ void _alpm_handle_free(pmhandle_t *handle)
 	FREELIST(handle->ignorepkg);
 	FREELIST(handle->ignoregrp);
 	FREE(handle);
-
 }
 
 alpm_cb_log SYMEXPORT alpm_option_get_logcb(pmhandle_t *handle)
diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index 34c9762..91bcb82 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -30,9 +30,6 @@
 #include "util.h"
 #include "alpm.h"
 
-/* global handle variable */
-extern pmhandle_t *handle;
-
 /** \addtogroup alpm_log Logging Functions
  * @brief Functions to log using libalpm
  * @{
-- 
1.7.5.2