From: Ivan Vecera <ivecera@redhat.com>
To: netdev@vger.kernel.org
Cc: jiri@mellanox.com, arkadis@mellanox.com
Subject: [PATCH iproute2 1/2] lib: make resolve_hosts variable common
Date: Fri, 10 Nov 2017 07:20:13 +0100 [thread overview]
Message-ID: <20171110062014.2693-2-ivecera@redhat.com> (raw)
In-Reply-To: <20171110062014.2693-1-ivecera@redhat.com>
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>
---
bridge/bridge.c | 1 -
genl/genl.c | 1 -
ip/ip.c | 1 -
ip/rtmon.c | 1 -
lib/utils.c | 1 +
misc/arpd.c | 2 --
misc/ss.c | 1 -
tc/tc.c | 1 -
8 files changed, 1 insertion(+), 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;
diff --git a/ip/ip.c b/ip/ip.c
index e66f6970..e2da46dd 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -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;
diff --git a/ip/rtmon.c b/ip/rtmon.c
index 1c2981f7..94baa38e 100644
--- a/ip/rtmon.c
+++ b/ip/rtmon.c
@@ -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";
diff --git a/misc/ss.c b/misc/ss.c
index 56a9ad41..45a0c330 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -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;
diff --git a/tc/tc.c b/tc/tc.c
index 8e64a82b..32924164 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -39,7 +39,6 @@ int show_graph;
int timestamp;
int batch_mode;
-int resolve_hosts;
int use_iec;
int force;
bool use_names;
--
2.13.6
next prev parent reply other threads:[~2017-11-10 6:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 6:20 [PATCH iproute2 0/2] add batch command support to devlink Ivan Vecera
2017-11-10 6:20 ` Ivan Vecera [this message]
2017-11-10 6:20 ` [PATCH iproute2 2/2] devlink: add batch command support Ivan Vecera
2017-11-10 6:57 ` Leon Romanovsky
2017-11-10 7:10 ` Ivan Vecera
2017-11-10 19:47 ` Leon Romanovsky
2017-11-12 5:06 ` Jiri Pirko
2017-11-12 8:19 ` Leon Romanovsky
2017-11-12 8:21 ` Jiri Pirko
2017-11-13 0:16 ` Stephen Hemminger
2017-11-13 8:59 ` Leon Romanovsky
2017-11-12 5:08 ` Jiri Pirko
2017-11-13 0:17 ` [PATCH iproute2 0/2] add batch command support to devlink Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171110062014.2693-2-ivecera@redhat.com \
--to=ivecera@redhat.com \
--cc=arkadis@mellanox.com \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.