iproute2/include
Serhey Popovych 5433656705 ip: Use single variable to represent -pretty
After commit a233caa0aa ("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 commit 44dcfe8201 ("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>
2018-02-16 08:13:36 -08:00
..
iptables SPDX license identifiers 2017-11-24 12:21:35 -08:00
libiptc SPDX license identifiers 2017-11-24 12:21:35 -08:00
netinet ss: report ecnseen 2011-11-23 14:51:54 -08:00
uapi Update kernel headers to 4.15-rc8 2018-01-19 12:33:41 -08:00
SNAPSHOT.h v4.15.0 2018-01-29 08:08:52 -08:00
bpf_api.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
bpf_elf.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
bpf_scm.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
bpf_util.h bpf: allow loading programs for a specific ifindex 2017-11-26 11:57:57 -08:00
color.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
dlfcn.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
ip6tables.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
iptables.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
json_print.h ip: Use single variable to represent -pretty 2018-02-16 08:13:36 -08:00
json_writer.h json_writer: add new json handlers (null, float with format, lluint, hu) 2017-08-17 18:02:40 -07:00
libgenl.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
libnetlink.h lib/libnetlink: Add a new function rtnl_talk_iov 2018-01-14 09:03:33 -08:00
list.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
ll_map.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
names.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
namespace.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
rt_names.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
rtm_map.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
utils.h utils: Introduce and use inet_prefix_reset() 2018-02-14 09:00:26 -08:00
xt-internal.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
xtables.h SPDX license identifiers 2017-11-24 12:21:35 -08:00