diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 23:14:35 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 02:41:16 +0200 |
| commit | 4d9278f87fffc1d1fe7e6a2f805a2a8df296bb0d (patch) | |
| tree | 2db447cd14c08ee93bed9264bc1e1b458f0b9e32 | |
| parent | 52bffd2457b7ba3b6fb08d3aa959ea0b53a45dc8 (diff) | |
| download | pacman-4d9278f87fffc1d1fe7e6a2f805a2a8df296bb0d.tar.gz pacman-4d9278f87fffc1d1fe7e6a2f805a2a8df296bb0d.tar.xz | |
Remove global handle variable
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/alpm.c | 8 | ||||
| -rw-r--r-- | lib/libalpm/handle.c | 4 | ||||
| -rw-r--r-- | 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 86b1619a..5d475ce4 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 7f3b0e67..3c17e9d4 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 34c97624..91bcb823 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 * @{ |