summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/handle.c
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-03-04 07:28:48 +0100
committerAaron Griffin <aaron@archlinux.org>2007-03-04 07:28:48 +0100
commita7d7c963579176dfefe424931a57e86bc8b51924 (patch)
treea808cbe75dd7fdc761e7667397efbc43a54437e7 /lib/libalpm/handle.c
parent549ca632ef08bec2aead4d95f141e28746b35a1e (diff)
downloadpacman-a7d7c963579176dfefe424931a57e86bc8b51924.tar.gz
pacman-a7d7c963579176dfefe424931a57e86bc8b51924.tar.xz
* handle changes: callbacks should check handle first, as there's a few
occasions where some alpm stuff could be used without initializing the library (vercmp is one). TODO make these functions (handle accessors) better by returning "library not initialized" instead of failing. * Removed NoUpgrade lines from pacman.conf - we need to test this! * Re-corrected the lib targets for src/util/* * make dist seems to have updated the po files
Diffstat (limited to 'lib/libalpm/handle.c')
-rw-r--r--lib/libalpm/handle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 6e8e45e3..5ca8258e 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -119,8 +119,8 @@ int _alpm_handle_free(pmhandle_t *handle)
return(0);
}
-alpm_cb_log alpm_option_get_logcb() { return handle->logcb; }
-alpm_cb_download alpm_option_get_dlcb() { return handle->dlcb; }
+alpm_cb_log alpm_option_get_logcb() { return (handle ? handle->logcb : NULL); }
+alpm_cb_download alpm_option_get_dlcb() { return (handle ? handle->dlcb : NULL); }
unsigned short alpm_option_get_logmask() { return handle->logmask; }
const char SYMEXPORT *alpm_option_get_root() { return handle->root; }
const char SYMEXPORT *alpm_option_get_dbpath() { return handle->dbpath; }