Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Allan Stephens 2010-12-31 18:59:24 +00:00 committed by David S. Miller
parent 5af5479296
commit f5e75269f5
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/tipc/Makefile
View File

@ -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

2
net/tipc/core.h
View File

@ -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

2
net/tipc/link.h
View File

@ -37,7 +37,7 @@
#ifndef _TIPC_LINK_H
#define _TIPC_LINK_H
#include "dbg.h"
#include "log.h"
#include "msg.h"
#include "node.h"

26
net/tipc/dbg.c → net/tipc/log.c
View File

@ -1,5 +1,5 @@
/*
* 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:
@ -81,13 +81,13 @@ static int tipc_printbuf_empty(struct print_buf *pb);
static void tipc_printbuf_move(struct print_buf *pb_to,
struct print_buf *pb_from);
#define FORMAT(PTR,LEN,FMT) \
#define FORMAT(PTR, LEN, FMT) \
{\
va_list args;\
va_start(args, FMT);\
LEN = vsprintf(PTR, FMT, args);\
va_end(args);\
*(PTR + LEN) = '\0';\
va_list args;\
va_start(args, FMT);\
LEN = vsprintf(PTR, FMT, args);\
va_end(args);\
*(PTR + LEN) = '\0';\
}
/**
@ -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;
}
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;
}

2
net/tipc/dbg.h → net/tipc/log.h
View File

@ -1,5 +1,5 @@
/*
* 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