lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: Minor enhancements to name table display format

Browse Source 
Eliminate printing of dashes after name table column headers
(to adhere more closely to the standard format used in tipc-config),
and simplify name table display logic using array lookups rather
than if-then-else logic.

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-08-17 11:00:14 +00:00
committed by David S. Miller
parent 76ae0d71d8
commit c2de58140a
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
net/tipc/name_table.c
View File

@@ -877,7 +877,7 @@ static void subseq_list(struct sub_seq *sseq, struct print_buf *buf, u32 depth,
u32 index) u32 index)
{ {
char portIdStr[27]; char portIdStr[27];
char *scopeStr; const char *scope_str[] = {"", " zone", " cluster", " node"};
struct publication *publ = sseq->zone_list; struct publication *publ = sseq->zone_list;
tipc_printf(buf, "%-10u %-10u ", sseq->lower, sseq->upper); tipc_printf(buf, "%-10u %-10u ", sseq->lower, sseq->upper);
@@ -893,15 +893,8 @@ static void subseq_list(struct sub_seq *sseq, struct print_buf *buf, u32 depth,
tipc_node(publ->node), publ->ref); tipc_node(publ->node), publ->ref);
tipc_printf(buf, "%-26s ", portIdStr); tipc_printf(buf, "%-26s ", portIdStr);
if (depth > 3) { if (depth > 3) {
if (publ->node != tipc_own_addr) tipc_printf(buf, "%-10u %s", publ->key,
scopeStr = ""; scope_str[publ->scope]);
else if (publ->scope == TIPC_NODE_SCOPE)
scopeStr = "node";
else if (publ->scope == TIPC_CLUSTER_SCOPE)
scopeStr = "cluster";
else
scopeStr = "zone";
tipc_printf(buf, "%-10u %s", publ->key, scopeStr);
} }
publ = publ->zone_list_next; publ = publ->zone_list_next;
@@ -951,24 +944,19 @@ static void nameseq_list(struct name_seq *seq, struct print_buf *buf, u32 depth,
static void nametbl_header(struct print_buf *buf, u32 depth) static void nametbl_header(struct print_buf *buf, u32 depth)
{ {
tipc_printf(buf, "Type "); const char *header[] = {
"Type ",
"Lower Upper ",
"Port Identity ",
"Publication Scope"
};
if (depth > 1) int i;
tipc_printf(buf, "Lower Upper ");
if (depth > 2)
tipc_printf(buf, "Port Identity ");
if (depth > 3)
tipc_printf(buf, "Publication");
tipc_printf(buf, "\n-----------");
if (depth > 1)
tipc_printf(buf, "--------------------- ");
if (depth > 2)
tipc_printf(buf, "-------------------------- ");
if (depth > 3)
tipc_printf(buf, "------------------");
if (depth > 4)
depth = 4;
for (i = 0; i < depth; i++)
tipc_printf(buf, header[i]);
tipc_printf(buf, "\n"); tipc_printf(buf, "\n");
} }