Commit 0b1c27db authored by Quentin Monnet's avatar Quentin Monnet Committed by David S. Miller
Browse files

tools: bpftool: move p_err() and p_info() from main.h to common.c 



The two functions were declared as static inline in a header file. There
is no particular reason why they should be inlined, they just happened to
remain in the same header file when they were turned from macros to
functions in a precious commit.

Make them non-inlined functions and move them to common.c file instead.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a3b718a

tools/bpf/bpftool/common.c

+31 −0
Original line number Diff line number Diff line
@@ -50,6 +50,37 @@ 


#include "main.h"



void p_err(const char *fmt, ...)

{

	va_list ap;



	va_start(ap, fmt);

	if (json_output) {

		jsonw_start_object(json_wtr);

		jsonw_name(json_wtr, "error");

		jsonw_vprintf_enquote(json_wtr, fmt, ap);

		jsonw_end_object(json_wtr);

	} else {

		fprintf(stderr, "Error: ");

		vfprintf(stderr, fmt, ap);

		fprintf(stderr, "\n");

	}

	va_end(ap);

}



void p_info(const char *fmt, ...)

{

	va_list ap;



	if (json_output)

		return;



	va_start(ap, fmt);

	vfprintf(stderr, fmt, ap);

	fprintf(stderr, "\n");

	va_end(ap);

}



static bool is_bpffs(char *path)

{

	struct statfs st_fs;

tools/bpf/bpftool/main.h

+3 −31
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ extern const char *bin_name; 
extern json_writer_t *json_wtr;

extern bool json_output;



void p_err(const char *fmt, ...);

void p_info(const char *fmt, ...);



bool is_prefix(const char *pfx, const char *str);

void fprint_hex(FILE *f, void *arg, unsigned int n, const char *sep);

void usage(void) __attribute__((noreturn));
@@ -97,35 +100,4 @@ int prog_parse_fd(int *argc, char ***argv); 
void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes);

void print_hex_data_json(uint8_t *data, size_t len);



static inline void p_err(const char *fmt, ...)

{

	va_list ap;



	va_start(ap, fmt);

	if (json_output) {

		jsonw_start_object(json_wtr);

		jsonw_name(json_wtr, "error");

		jsonw_vprintf_enquote(json_wtr, fmt, ap);

		jsonw_end_object(json_wtr);

	} else {

		fprintf(stderr, "Error: ");

		vfprintf(stderr, fmt, ap);

		fprintf(stderr, "\n");

	}

	va_end(ap);

}



static inline void p_info(const char *fmt, ...)

{

	va_list ap;



	if (json_output)

		return;



	va_start(ap, fmt);

	vfprintf(stderr, fmt, ap);

	fprintf(stderr, "\n");

	va_end(ap);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE