From f218391fb8d3c9fde3a4897a1188f0aec811dcbe Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Mon, 1 Jul 2019 12:53:10 +0200 Subject: libnftables: reallocate definition of nft_print() and nft_gmp_print() They are not part of the libnftables library API, they are not public symbols, so it doesn't not make sense to have them there. Move the two functions to a different source file so libnftables.c only has the API functions. I think copyright belongs to Phil Sutter since he introduced this code back in commit 2535ba7006f22a6470f4c88ea7d30c343a1d8799 (src: get rid of printf). Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/Makefile.am | 1 + src/libnftables.c | 27 --------------------------- src/print.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 src/print.c (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index fd641755..a1c18fe2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,6 +62,7 @@ libnftables_la_SOURCES = \ nfnl_osf.c \ tcpopt.c \ socket.c \ + print.c \ libnftables.c # yacc and lex generate dirty code diff --git a/src/libnftables.c b/src/libnftables.c index dccb8ab4..f2cd267d 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -507,30 +507,3 @@ err: cache_release(&nft->cache); return rc; } - -int nft_print(struct output_ctx *octx, const char *fmt, ...) -{ - int ret; - va_list arg; - - va_start(arg, fmt); - ret = vfprintf(octx->output_fp, fmt, arg); - va_end(arg); - fflush(octx->output_fp); - - return ret; -} - -int nft_gmp_print(struct output_ctx *octx, const char *fmt, ...) -{ - int ret; - va_list arg; - - va_start(arg, fmt); - ret = gmp_vfprintf(octx->output_fp, fmt, arg); - va_end(arg); - fflush(octx->output_fp); - - return ret; -} - diff --git a/src/print.c b/src/print.c new file mode 100644 index 00000000..d1b25e8b --- /dev/null +++ b/src/print.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Phil Sutter + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include + +int nft_print(struct output_ctx *octx, const char *fmt, ...) +{ + int ret; + va_list arg; + + va_start(arg, fmt); + ret = vfprintf(octx->output_fp, fmt, arg); + va_end(arg); + fflush(octx->output_fp); + + return ret; +} + +int nft_gmp_print(struct output_ctx *octx, const char *fmt, ...) +{ + int ret; + va_list arg; + + va_start(arg, fmt); + ret = gmp_vfprintf(octx->output_fp, fmt, arg); + va_end(arg); + fflush(octx->output_fp); + + return ret; +} -- cgit v1.2.3