Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941787b8 authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

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: default avatarRichard Alpe <richard.alpe@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22ae7cff

net/tipc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-$(CONFIG_TIPC) := tipc.o 
tipc-y	+= addr.o bcast.o bearer.o \

	   core.o link.o discover.o msg.o  \

	   name_distr.o  subscr.o name_table.o net.o  \

	   netlink.o netlink_compat.o node.o socket.o log.o eth_media.o \

	   netlink.o netlink_compat.o node.o socket.o eth_media.o \

	   server.o socket.o



tipc-$(CONFIG_TIPC_MEDIA_IB)	+= ib_media.o

net/tipc/bearer.c

+3 −3
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a) 
	m_ptr = media_find_id(a->media_id);



	if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str)))

		ret = tipc_snprintf(buf, len, "%s(%s)", m_ptr->name, addr_str);

		ret = scnprintf(buf, len, "%s(%s)", m_ptr->name, addr_str);

	else {

		u32 i;



		ret = tipc_snprintf(buf, len, "UNKNOWN(%u)", a->media_id);

		ret = scnprintf(buf, len, "UNKNOWN(%u)", a->media_id);

		for (i = 0; i < sizeof(a->value); i++)

			ret += tipc_snprintf(buf - ret, len + ret,

			ret += scnprintf(buf - ret, len + ret,

					    "-%02x", a->value[i]);

	}

}

net/tipc/core.h

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ 


#define TIPC_MOD_VER "2.0.0"



int tipc_snprintf(char *buf, int len, const char *fmt, ...);



extern int tipc_net_id __read_mostly;

extern int sysctl_tipc_rmem[3] __read_mostly;

extern int sysctl_tipc_named_timeout __read_mostly;

net/tipc/log.c

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/*

 * net/tipc/log.c: TIPC print buffer routines for debugging

 *

 * Copyright (c) 1996-2006, Ericsson AB

 * Copyright (c) 2005-2007, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. Neither the names of the copyright holders nor the names of its

 *    contributors may be used to endorse or promote products derived from

 *    this software without specific prior written permission.

 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2 as published by the Free

 * Software Foundation.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */



#include "core.h"



/**

 * tipc_snprintf - append formatted output to print buffer

 * @buf: pointer to print buffer

 * @len: buffer length

 * @fmt: formatted info to be printed

 */

int tipc_snprintf(char *buf, int len, const char *fmt, ...)

{

	int i;

	va_list args;



	va_start(args, fmt);

	i = vscnprintf(buf, len, fmt, args);

	va_end(args);

	return i;

}