From 760768890e60617acfd144dce875a4a3be14513c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Sep 2015 20:19:56 +0200 Subject: src: rename existing functions to use the nftnl_ prefix So we can use the nft_* prefix anytime soon for our upcoming higher level library. After this patch, the nft_* symbols become an alias of the nftnl_* symbols. Signed-off-by: Pablo Neira Ayuso --- include/utils.h | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'include/utils.h') diff --git a/include/utils.h b/include/utils.h index fad64e8..7a46725 100644 --- a/include/utils.h +++ b/include/utils.h @@ -10,7 +10,7 @@ #include "config.h" #ifdef HAVE_VISIBILITY_HIDDEN # define __visible __attribute__((visibility("default"))) -# define EXPORT_SYMBOL(y, x) typeof(x) (x) __visible; __typeof (x) y __attribute ((alias (#x), visibility ("default"))) +# define EXPORT_SYMBOL(x, y) typeof(x) (x) __visible; __typeof (x) y __attribute ((alias (#x), visibility ("default"))) #else # define EXPORT_SYMBOL #endif @@ -26,19 +26,19 @@ void __noreturn __abi_breakage(const char *file, int line, const char *reason); #define abi_breakage() \ __abi_breakage(__FILE__, __LINE__, strerror(errno)); -void __nft_assert_fail(uint16_t attr, const char *filename, int line); +void __nftnl_assert_fail(uint16_t attr, const char *filename, int line); -#define nft_assert(val, attr, expr) \ +#define nftnl_assert(val, attr, expr) \ ((!val || expr) \ ? (void)0 \ - : __nft_assert_fail(attr, __FILE__, __LINE__)) + : __nftnl_assert_fail(attr, __FILE__, __LINE__)) -#define nft_assert_validate(data, _validate_array, _attr, _data_len) \ +#define nftnl_assert_validate(data, _validate_array, _attr, _data_len) \ ({ \ if (!data) \ - __nft_assert_fail(attr, __FILE__, __LINE__); \ + __nftnl_assert_fail(attr, __FILE__, __LINE__); \ if (_validate_array[_attr]) \ - nft_assert(data, attr, _validate_array[_attr] == _data_len); \ + nftnl_assert(data, attr, _validate_array[_attr] == _data_len); \ }) #define SNPRINTF_BUFFER_SIZE(ret, size, len, offset) \ @@ -50,32 +50,32 @@ void __nft_assert_fail(uint16_t attr, const char *filename, int line); size += ret; \ len -= ret; -const char *nft_family2str(uint32_t family); -int nft_str2family(const char *family); - -enum nft_type { - NFT_TYPE_U8, - NFT_TYPE_U16, - NFT_TYPE_U32, - NFT_TYPE_U64, - NFT_TYPE_S8, - NFT_TYPE_S16, - NFT_TYPE_S32, - NFT_TYPE_S64, +const char *nftnl_family2str(uint32_t family); +int nftnl_str2family(const char *family); + +enum nftnl_type { + NFTNL_TYPE_U8, + NFTNL_TYPE_U16, + NFTNL_TYPE_U32, + NFTNL_TYPE_U64, + NFTNL_TYPE_S8, + NFTNL_TYPE_S16, + NFTNL_TYPE_S32, + NFTNL_TYPE_S64, }; -int nft_strtoi(const char *string, int base, void *number, enum nft_type type); -int nft_get_value(enum nft_type type, void *val, void *out); +int nftnl_strtoi(const char *string, int base, void *number, enum nftnl_type type); +int nftnl_get_value(enum nftnl_type type, void *val, void *out); -const char *nft_verdict2str(uint32_t verdict); -int nft_str2verdict(const char *verdict, int *verdict_num); +const char *nftnl_verdict2str(uint32_t verdict); +int nftnl_str2verdict(const char *verdict, int *verdict_num); -const char *nft_cmd2tag(enum nft_cmd_type cmd); -uint32_t nft_str2cmd(const char *cmd); +const char *nftnl_cmd2tag(enum nftnl_cmd_type cmd); +uint32_t nftnl_str2cmd(const char *cmd); -enum nft_cmd_type nft_flag2cmd(uint32_t flags); +enum nftnl_cmd_type nftnl_flag2cmd(uint32_t flags); -int nft_fprintf(FILE *fp, void *obj, uint32_t cmd, uint32_t type, +int nftnl_fprintf(FILE *fp, void *obj, uint32_t cmd, uint32_t type, uint32_t flags, int (*snprintf_cb)(char *buf, size_t bufsiz, void *obj, uint32_t cmd, uint32_t type, uint32_t flags)); -- cgit v1.2.3