diff options
| author | Ivan Vecera <ivecera@redhat.com> | 2017-11-10 07:20:13 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-11-12 16:15:23 -0800 |
| commit | 6648853975332e5f34d03a1e2a6e09f5e1742099 (patch) | |
| tree | 3f43693070513190c7fa1e97604d4989e58ed70c | |
| parent | 274b63ae21a07497bf12827128fa7594b842cf24 (diff) | |
| download | platform_external_iproute2-6648853975332e5f34d03a1e2a6e09f5e1742099.tar.gz platform_external_iproute2-6648853975332e5f34d03a1e2a6e09f5e1742099.tar.bz2 platform_external_iproute2-6648853975332e5f34d03a1e2a6e09f5e1742099.zip | |
lib: make resolve_hosts variable common
Any iproute utility that uses any function from lib/utils.c needs
to declare its own resolve_hosts variable instance although it does
not need/use hostname resolving functionality (currently only 'ip'
and 'ss' commands uses this).
The patch declares single common instance of resolve_hosts directly
in utils.c so the existing ones can be removed (the same approach
that is used for timestamp_short).
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
| -rw-r--r-- | bridge/bridge.c | 1 | ||||
| -rw-r--r-- | genl/genl.c | 1 | ||||
| -rw-r--r-- | ip/ip.c | 1 | ||||
| -rw-r--r-- | ip/rtmon.c | 1 | ||||
| -rw-r--r-- | lib/utils.c | 1 | ||||
| -rw-r--r-- | misc/arpd.c | 2 | ||||
| -rw-r--r-- | misc/ss.c | 1 | ||||
| -rw-r--r-- | tc/tc.c | 1 |
8 files changed, 1 insertions, 8 deletions
diff --git a/bridge/bridge.c b/bridge/bridge.c index 5ff038d6..6658cb8f 100644 --- a/bridge/bridge.c +++ b/bridge/bridge.c @@ -18,7 +18,6 @@ struct rtnl_handle rth = { .fd = -1 }; int preferred_family = AF_UNSPEC; -int resolve_hosts; int oneline; int show_stats; int show_details; diff --git a/genl/genl.c b/genl/genl.c index 747074b0..7e4a208d 100644 --- a/genl/genl.c +++ b/genl/genl.c @@ -30,7 +30,6 @@ int show_stats = 0; int show_details = 0; int show_raw = 0; -int resolve_hosts = 0; static void *BODY; static struct genl_util * genl_list; @@ -30,7 +30,6 @@ int human_readable; int use_iec; int show_stats; int show_details; -int resolve_hosts; int oneline; int brief; int json; @@ -25,7 +25,6 @@ #include "utils.h" #include "libnetlink.h" -int resolve_hosts; static int init_phase = 1; static void write_stamp(FILE *fp) diff --git a/lib/utils.c b/lib/utils.c index ac155bf5..f77be1fd 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -37,6 +37,7 @@ #include "utils.h" #include "namespace.h" +int resolve_hosts; int timestamp_short; int get_hex(char c) diff --git a/misc/arpd.c b/misc/arpd.c index c2666f76..67d86b67 100644 --- a/misc/arpd.c +++ b/misc/arpd.c @@ -38,8 +38,6 @@ #include "utils.h" #include "rt_names.h" -int resolve_hosts; - DB *dbase; char *dbname = "/var/lib/arpd/arpd.db"; @@ -88,7 +88,6 @@ static int security_get_initial_context(char *name, char **context) } #endif -int resolve_hosts; int resolve_services = 1; int preferred_family = AF_UNSPEC; int show_options; @@ -39,7 +39,6 @@ int show_graph; int timestamp; int batch_mode; -int resolve_hosts; int use_iec; int force; bool use_names; |