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: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/Makefile b/net/tipc/Makefile
index d41cd110fe7d16f72f553e9474d9db713fa4534d..521d24d04ab2c9e1f7363510e3e0fa151cf07de5 100644 (file)
--- a/net/tipc/Makefile
+++ b/net/tipc/Makefile
@@ -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

diff --git a/net/tipc/core.h b/net/tipc/core.h
index c44f955bd54aef88f987bb0ec471665de5f6271b..17f3670ed95d9d114b2d59bfa28b54b63222a757 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -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

diff --git a/net/tipc/link.h b/net/tipc/link.h
index c562888d25dad77973e3f06cb60e4a590ee9e276..eeb0c015dba99b31614fef42cf5939b8f94c888f 100644 (file)
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -37,7 +37,7 @@
 #ifndef _TIPC_LINK_H
 #define _TIPC_LINK_H
 
-#include "dbg.h"
+#include "log.h"
 #include "msg.h"
 #include "node.h"
 

diff --git a/net/tipc/dbg.c b/net/tipc/log.c
similarity index 97%
rename from net/tipc/dbg.c
rename to net/tipc/log.c
index 46f51d208e5e55193f410ae1c9c512f6144ff791..9d99f7097d2d3a33af4c0d128a73fa746ab7893d 100644 (file)
--- a/net/tipc/dbg.c
+++ b/net/tipc/log.c
@@ -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;
 }
-

diff --git a/net/tipc/dbg.h b/net/tipc/log.h
similarity index 97%
rename from net/tipc/dbg.h
rename to net/tipc/log.h
index 3ba6ba8b434ae38a8815982729057036fa0459dd..f4343bb9e4295c52d795656662789f1be0897409 100644 (file)
--- a/net/tipc/dbg.h
+++ b/net/tipc/log.h
@@ -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