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

Commit f5e75269 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: rename dbg.[ch] to log.[ch] 



As the first step in removing obsolete debugging code from TIPC the
files that implement TIPC's non-debug-related log buffer subsystem
are renamed to better reflect their true nature.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5af54792

net/tipc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ tipc-y += addr.o bcast.o bearer.o config.o \ 
	   core.o handler.o link.o discover.o msg.o  \

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

	   netlink.o node.o node_subscr.o port.o ref.o  \

	   socket.o dbg.o eth_media.o

	   socket.o log.o eth_media.o



# End of file

net/tipc/core.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#define TIPC_MOD_VER "2.0.0"



struct tipc_msg;	/* msg.h */

struct print_buf;	/* dbg.h */

struct print_buf;	/* log.h */



/*

 * TIPC sanity test macros

net/tipc/link.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#ifndef _TIPC_LINK_H

#define _TIPC_LINK_H



#include "dbg.h"

#include "log.h"

#include "msg.h"

#include "node.h"

net/tipc/dbg.c→net/tipc/log.c

+11 −15
Original line number Diff line number Diff line 
/*

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

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

 *

 * Copyright (c) 1996-2006, Ericsson AB

 * Copyright (c) 2005-2007, Wind River Systems
@@ -36,7 +36,7 @@ 


#include "core.h"

#include "config.h"

#include "dbg.h"

#include "log.h"



/*

 * TIPC pre-defines the following print buffers:
@@ -353,10 +353,8 @@ int tipc_log_resize(int log_size) 
	int res = 0;



	spin_lock_bh(&print_lock);

	if (TIPC_LOG->buf) {

	kfree(TIPC_LOG->buf);

	TIPC_LOG->buf = NULL;

	}

	if (log_size) {

		if (log_size < TIPC_PB_MIN_SIZE)

			log_size = TIPC_PB_MIN_SIZE;
@@ -407,8 +405,7 @@ struct sk_buff *tipc_log_dump(void) 
	} else if (tipc_printbuf_empty(TIPC_LOG)) {

		spin_unlock_bh(&print_lock);

		reply = tipc_cfg_reply_ultra_string("log is empty\n");

	}

	else {

	} else {

		struct tlv_desc *rep_tlv;

		struct print_buf pb;

		int str_len;
@@ -429,4 +426,3 @@ struct sk_buff *tipc_log_dump(void) 
	}

	return reply;

}

net/tipc/dbg.h→net/tipc/log.h

+1 −1
Original line number Diff line number Diff line 
/*

 * net/tipc/dbg.h: Include file for TIPC print buffer routines

 * net/tipc/log.h: Include file for TIPC print buffer routines

 *

 * Copyright (c) 1997-2006, Ericsson AB

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