From: Serhey Popovych <serhe.popovych@gmail.com>
To: netdev@vger.kernel.org
Subject: [PATCH iproute2 v2 9/9] tunnel: Return constant string without copying it
Date: Thu, 18 Jan 2018 16:04:36 +0200 [thread overview]
Message-ID: <1516284276-10942-10-git-send-email-serhe.popovych@gmail.com> (raw)
In-Reply-To: <1516284276-10942-1-git-send-email-serhe.popovych@gmail.com>
We return constant string from tnl_strproto(), no need
to copy it to temporary buffer and then return such
buffer as const: return constant string instead.
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
---
ip/tunnel.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/ip/tunnel.c b/ip/tunnel.c
index 42ae70e..0414804 100644
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -40,33 +40,22 @@
const char *tnl_strproto(__u8 proto)
{
- static char buf[16];
-
switch (proto) {
case IPPROTO_IPIP:
- strcpy(buf, "ip");
- break;
+ return "ip";
case IPPROTO_GRE:
- strcpy(buf, "gre");
- break;
+ return "gre";
case IPPROTO_IPV6:
- strcpy(buf, "ipv6");
- break;
+ return "ipv6";
case IPPROTO_ESP:
- strcpy(buf, "esp");
- break;
+ return "esp";
case IPPROTO_MPLS:
- strcpy(buf, "mpls");
- break;
+ return "mpls";
case 0:
- strcpy(buf, "any");
- break;
+ return "any";
default:
- strcpy(buf, "unknown");
- break;
+ return "unknown";
}
-
- return buf;
}
int tnl_get_ioctl(const char *basedev, void *p)
--
1.7.10.4
next prev parent reply other threads:[~2018-01-18 14:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 14:04 [PATCH iproute2 v2 0/9] ip/tunnel: Improve tunnel parameters printing Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 1/9] iplink: Use ll_index_to_name() instead of if_indextoname() Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 2/9] ip/tunnel: Correct and unify ttl/hoplimit printing Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 3/9] ip/tunnel: Simplify and unify tos printing Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 4/9] ip/tunnel: Use print_0xhex() instead of print_string() Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 5/9] ip/tunnel: Abstract tunnel encapsulation options printing Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 6/9] gre/tunnel: Print erspan_index using print_uint() Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 7/9] vti/tunnel: Unify ikey/okey printing Serhey Popovych
2018-01-18 14:04 ` [PATCH iproute2 v2 8/9] vti6/tunnel: Unify and simplify link type help functions Serhey Popovych
2018-01-18 14:04 ` Serhey Popovych [this message]
2018-01-19 0:35 ` [PATCH iproute2 v2 0/9] ip/tunnel: Improve tunnel parameters printing 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=1516284276-10942-10-git-send-email-serhe.popovych@gmail.com \
--to=serhe.popovych@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).