| From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Tue, 9 Aug 2022 23:57:03 -0700 |
| Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__)) |
| |
| __attribute_malloc__ is not available on musl |
| |
| Fixes |
| | ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator |
| | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); |
| | ^ |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| audisp/plugins/remote/queue.h | 2 +- |
| auparse/auparse.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h |
| index 36b70d04..031507dc 100644 |
| --- a/audisp/plugins/remote/queue.h |
| +++ b/audisp/plugins/remote/queue.h |
| @@ -53,7 +53,7 @@ void q_close(struct queue *q); |
| * On error, return NULL and set errno. */ |
| struct queue *q_open(int q_flags, const char *path, size_t num_entries, |
| size_t entry_size) |
| - __attribute_malloc__ __attr_dealloc (q_close, 1) __wur; |
| + __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur; |
| |
| /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */ |
| int q_append(struct queue *q, const char *data); |
| diff --git a/auparse/auparse.h b/auparse/auparse.h |
| index c27f1ff9..87c52965 100644 |
| --- a/auparse/auparse.h |
| +++ b/auparse/auparse.h |
| @@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, |
| void auparse_destroy(auparse_state_t *au); |
| void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); |
| auparse_state_t *auparse_init(ausource_t source, const void *b) |
| - __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); |
| + __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); |
| int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) |
| __attr_access ((__read_only__, 2, 3)); |
| int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) |
| -- |
| 2.25.1 |
| |