bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove global handle variable

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-07 16:14:35 -05:00
parent 52bffd2457
commit 4d9278f87f
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/alpm.c
View file

@ -34,9 +34,6 @@
#include "log.h" #include "log.h"
#include "util.h" #include "util.h"
/* Globals */
extern pmhandle_t *handle;
/** \addtogroup alpm_interface Interface Functions /** \addtogroup alpm_interface Interface Functions
* @brief Functions to initialize and release libalpm * @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(); myhandle->curl = curl_easy_init();
#endif #endif
/* TODO temporary until global var removed */
handle = myhandle;
return myhandle; return myhandle;
cleanup: cleanup:
@ -123,9 +118,6 @@ int SYMEXPORT alpm_release(pmhandle_t *myhandle)
} }
_alpm_handle_free(myhandle); _alpm_handle_free(myhandle);
myhandle = NULL;
/* TODO temporary until global var removed */
handle = NULL;
#ifdef HAVE_LIBCURL #ifdef HAVE_LIBCURL
curl_global_cleanup(); curl_global_cleanup();

4
lib/libalpm/handle.c
View file

@ -37,9 +37,6 @@
#include "trans.h" #include "trans.h"
#include "alpm.h" #include "alpm.h"
/* global var for handle (private to libalpm) */
pmhandle_t *handle = NULL;
pmhandle_t *_alpm_handle_new() pmhandle_t *_alpm_handle_new()
{ {
pmhandle_t *handle; pmhandle_t *handle;
@ -87,7 +84,6 @@ void _alpm_handle_free(pmhandle_t *handle)
FREELIST(handle->ignorepkg); FREELIST(handle->ignorepkg);
FREELIST(handle->ignoregrp); FREELIST(handle->ignoregrp);
FREE(handle); FREE(handle);
} }
alpm_cb_log SYMEXPORT alpm_option_get_logcb(pmhandle_t *handle) alpm_cb_log SYMEXPORT alpm_option_get_logcb(pmhandle_t *handle)

3
lib/libalpm/log.c
View file

@ -30,9 +30,6 @@
#include "util.h" #include "util.h"
#include "alpm.h" #include "alpm.h"
/* global handle variable */
extern pmhandle_t *handle;
/** \addtogroup alpm_log Logging Functions /** \addtogroup alpm_log Logging Functions
* @brief Functions to log using libalpm * @brief Functions to log using libalpm
* @{ * @{