From 3847446603036e3a873c2d0bc0cdd6c1aa19fc2e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 18 Jun 2011 19:21:21 -0400 Subject: lib/util: call _alpm_log before setting handle->pm_errno This is an unfortunate chain of events. RET_ERR and RET_ERR_VOID will eventually call CHECK_HANDLE, which resets the handle's pm_errno member. Dan probably had a reason for doing this, so we merely switch the order of operations in the RET_ERR macros to avoid stomping on our pm_errno. Signed-off-by: Dave Reisner --- lib/libalpm/util.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 0549c81e..778e20fe 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -61,12 +61,14 @@ #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0) -#define RET_ERR_VOID(handle, err) do { (handle)->pm_errno = (err); \ +#define RET_ERR_VOID(handle, err) do { \ _alpm_log(handle, PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerror(err)); \ + (handle)->pm_errno = (err); \ return; } while(0) -#define RET_ERR(handle, err, ret) do { (handle)->pm_errno = (err); \ +#define RET_ERR(handle, err, ret) do { \ _alpm_log(handle, PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerror(err)); \ + (handle)->pm_errno = (err); \ return (ret); } while(0) #define DOUBLE_EQ(x, y) (fabs((x) - (y)) < DBL_EPSILON) -- cgit v1.2.3-24-g4f1b