diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2016-02-22 20:07:57 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-02-23 03:41:36 +0100 |
| commit | a724235b6127f9655708614d1e44f9b5c661a506 (patch) | |
| tree | 6b4ef62ae28bc340db7ca5b2d628a60e3a15363a /lib/libalpm/util.h | |
| parent | 1d6583a58da0904fb7feafd4a666391087955a7b (diff) | |
| download | pacman-a724235b6127f9655708614d1e44f9b5c661a506.tar.gz pacman-a724235b6127f9655708614d1e44f9b5c661a506.tar.xz | |
make alpm_unlock and trans_interrupt async safe
RET_ERR calls _alpm_log which includes calls that are not safe for use
in asynchronous signal handlers (see signal(7)). Replace it in
functions called from our signal handlers with a new macro
RET_ERR_ASYNC_SAFE which is identical except that it lacks the call to
_alpm_log.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to 'lib/libalpm/util.h')
| -rw-r--r-- | lib/libalpm/util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9817939f..94949867 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -71,6 +71,10 @@ void _alpm_alloc_fail(size_t size); (handle)->pm_errno = (err); \ return (ret); } while(0) +#define RET_ERR_ASYNC_SAFE(handle, err, ret) do { \ + (handle)->pm_errno = (err); \ + return (ret); } while(0) + #define DOUBLE_EQ(x, y) (fabs((x) - (y)) < DBL_EPSILON) #define CHECK_HANDLE(handle, action) do { if(!(handle)) { action; } (handle)->pm_errno = 0; } while(0) |