mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-06 00:17:54 +00:00
5433656705
After commita233caa0aa("json: make pretty printing optional") I get following build failure: LINK rtmon ../lib/libutil.a(json_print.o): In function `new_json_obj': json_print.c:(.text+0x35): undefined reference to `show_pretty' collect2: error: ld returned 1 exit status make[1]: *** [rtmon] Error 1 make: *** [all] Error 2 It is caused by missing show_pretty variable in rtmon. On the other hand tc/tc.c there are two distinct variables and single matches() call that handles -pretty option thus setting show_pretty will never happen. Note that since commit44dcfe8201("Change formatting of u32 back to default") show_pretty is used in tc/f_u32.c so this is first place where -pretty introduced. Furthermore other utilities like misc/ifstat.c and misc/nstat.c define pretty variable, however only for their own purposes. They both support JSON output and thus depend show_pretty in new_json_obj(). Assuming above use common variable to represent -pretty option, define it in utils.c and declare in utils.h that is commonly used. Replace show_pretty with pretty. Fixes:a233caa0aa("json: make pretty printing optional") Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> Signed-off-by: David Ahern <dsahern@gmail.com>
71 lines
1.9 KiB
C
71 lines
1.9 KiB
C
/*
|
|
* json_print.h "print regular or json output, based on json_writer".
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Julien Fortin, <julien@cumulusnetworks.com>
|
|
*/
|
|
|
|
#ifndef _JSON_PRINT_H_
|
|
#define _JSON_PRINT_H_
|
|
|
|
#include "json_writer.h"
|
|
#include "color.h"
|
|
|
|
json_writer_t *get_json_writer(void);
|
|
|
|
/*
|
|
* use:
|
|
* - PRINT_ANY for context based output
|
|
* - PRINT_FP for non json specific output
|
|
* - PRINT_JSON for json specific output
|
|
*/
|
|
enum output_type {
|
|
PRINT_FP = 1,
|
|
PRINT_JSON = 2,
|
|
PRINT_ANY = 4,
|
|
};
|
|
|
|
void new_json_obj(int json);
|
|
void delete_json_obj(void);
|
|
|
|
bool is_json_context(void);
|
|
|
|
void fflush_fp(void);
|
|
|
|
void open_json_object(const char *str);
|
|
void close_json_object(void);
|
|
void open_json_array(enum output_type type, const char *delim);
|
|
void close_json_array(enum output_type type, const char *delim);
|
|
|
|
#define _PRINT_FUNC(type_name, type) \
|
|
void print_color_##type_name(enum output_type t, \
|
|
enum color_attr color, \
|
|
const char *key, \
|
|
const char *fmt, \
|
|
type value); \
|
|
\
|
|
static inline void print_##type_name(enum output_type t, \
|
|
const char *key, \
|
|
const char *fmt, \
|
|
type value) \
|
|
{ \
|
|
print_color_##type_name(t, COLOR_NONE, key, fmt, value); \
|
|
}
|
|
_PRINT_FUNC(int, int);
|
|
_PRINT_FUNC(bool, bool);
|
|
_PRINT_FUNC(null, const char*);
|
|
_PRINT_FUNC(string, const char*);
|
|
_PRINT_FUNC(uint, uint64_t);
|
|
_PRINT_FUNC(hu, unsigned short);
|
|
_PRINT_FUNC(hex, unsigned int);
|
|
_PRINT_FUNC(0xhex, unsigned int);
|
|
_PRINT_FUNC(lluint, unsigned long long int);
|
|
_PRINT_FUNC(float, double);
|
|
#undef _PRINT_FUNC
|
|
|
|
#endif /* _JSON_PRINT_H_ */
|