diff options
author | Richard Alpe <richard.alpe@ericsson.com> | 2015-02-09 03:50:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-09 16:20:49 -0500 |
commit | 941787b82982b3f33ac398c8c00035ddd0f8c514 (patch) | |
tree | 4859799a8311ecd637e2a582600af1057a78e08b /net/tipc | |
parent | 22ae7cff509f3bb22caaa0003f67eeb93d338fed (diff) |
tipc: remove tipc_snprintf
tipc_snprintf() was heavily utilized by the old netlink API which no
longer exists (now netlink compat).
In this patch we swap tipc_snprintf() to the identical scnprintf() in
the only remaining occurrence.
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/Makefile | 2 | ||||
-rw-r--r-- | net/tipc/bearer.c | 6 | ||||
-rw-r--r-- | net/tipc/core.h | 2 | ||||
-rw-r--r-- | net/tipc/log.c | 54 |
4 files changed, 4 insertions, 60 deletions
diff --git a/net/tipc/Makefile b/net/tipc/Makefile index 6864b9de2404..599b1a540d2b 100644 --- a/net/tipc/Makefile +++ b/net/tipc/Makefile | |||
@@ -7,7 +7,7 @@ obj-$(CONFIG_TIPC) := tipc.o | |||
7 | tipc-y += addr.o bcast.o bearer.o \ | 7 | tipc-y += addr.o bcast.o bearer.o \ |
8 | core.o link.o discover.o msg.o \ | 8 | core.o link.o discover.o msg.o \ |
9 | name_distr.o subscr.o name_table.o net.o \ | 9 | name_distr.o subscr.o name_table.o net.o \ |
10 | netlink.o netlink_compat.o node.o socket.o log.o eth_media.o \ | 10 | netlink.o netlink_compat.o node.o socket.o eth_media.o \ |
11 | server.o socket.o | 11 | server.o socket.o |
12 | 12 | ||
13 | tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o | 13 | tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o |
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 858c5a6c32df..48852c2dcc03 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -111,13 +111,13 @@ void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a) | |||
111 | m_ptr = media_find_id(a->media_id); | 111 | m_ptr = media_find_id(a->media_id); |
112 | 112 | ||
113 | if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str))) | 113 | if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str))) |
114 | ret = tipc_snprintf(buf, len, "%s(%s)", m_ptr->name, addr_str); | 114 | ret = scnprintf(buf, len, "%s(%s)", m_ptr->name, addr_str); |
115 | else { | 115 | else { |
116 | u32 i; | 116 | u32 i; |
117 | 117 | ||
118 | ret = tipc_snprintf(buf, len, "UNKNOWN(%u)", a->media_id); | 118 | ret = scnprintf(buf, len, "UNKNOWN(%u)", a->media_id); |
119 | for (i = 0; i < sizeof(a->value); i++) | 119 | for (i = 0; i < sizeof(a->value); i++) |
120 | ret += tipc_snprintf(buf - ret, len + ret, | 120 | ret += scnprintf(buf - ret, len + ret, |
121 | "-%02x", a->value[i]); | 121 | "-%02x", a->value[i]); |
122 | } | 122 | } |
123 | } | 123 | } |
diff --git a/net/tipc/core.h b/net/tipc/core.h index 451c346fd3cf..3dc68c7a966d 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -70,8 +70,6 @@ | |||
70 | 70 | ||
71 | #define TIPC_MOD_VER "2.0.0" | 71 | #define TIPC_MOD_VER "2.0.0" |
72 | 72 | ||
73 | int tipc_snprintf(char *buf, int len, const char *fmt, ...); | ||
74 | |||
75 | extern int tipc_net_id __read_mostly; | 73 | extern int tipc_net_id __read_mostly; |
76 | extern int sysctl_tipc_rmem[3] __read_mostly; | 74 | extern int sysctl_tipc_rmem[3] __read_mostly; |
77 | extern int sysctl_tipc_named_timeout __read_mostly; | 75 | extern int sysctl_tipc_named_timeout __read_mostly; |
diff --git a/net/tipc/log.c b/net/tipc/log.c deleted file mode 100644 index b186af06e361..000000000000 --- a/net/tipc/log.c +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * net/tipc/log.c: TIPC print buffer routines for debugging | ||
3 | * | ||
4 | * Copyright (c) 1996-2006, Ericsson AB | ||
5 | * Copyright (c) 2005-2007, Wind River Systems | ||
6 | * All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions are met: | ||
10 | * | ||
11 | * 1. Redistributions of source code must retain the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer. | ||
13 | * 2. Redistributions in binary form must reproduce the above copyright | ||
14 | * notice, this list of conditions and the following disclaimer in the | ||
15 | * documentation and/or other materials provided with the distribution. | ||
16 | * 3. Neither the names of the copyright holders nor the names of its | ||
17 | * contributors may be used to endorse or promote products derived from | ||
18 | * this software without specific prior written permission. | ||
19 | * | ||
20 | * Alternatively, this software may be distributed under the terms of the | ||
21 | * GNU General Public License ("GPL") version 2 as published by the Free | ||
22 | * Software Foundation. | ||
23 | * | ||
24 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
25 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
26 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
27 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
28 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
29 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
30 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
31 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
32 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
33 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
34 | * POSSIBILITY OF SUCH DAMAGE. | ||
35 | */ | ||
36 | |||
37 | #include "core.h" | ||
38 | |||
39 | /** | ||
40 | * tipc_snprintf - append formatted output to print buffer | ||
41 | * @buf: pointer to print buffer | ||
42 | * @len: buffer length | ||
43 | * @fmt: formatted info to be printed | ||
44 | */ | ||
45 | int tipc_snprintf(char *buf, int len, const char *fmt, ...) | ||
46 | { | ||
47 | int i; | ||
48 | va_list args; | ||
49 | |||
50 | va_start(args, fmt); | ||
51 | i = vscnprintf(buf, len, fmt, args); | ||
52 | va_end(args); | ||
53 | return i; | ||
54 | } | ||