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

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

[TIPC]: Cosmetic cleanup of print buffer code 



This patch contains changes to make TIPC's print buffer code
conform more closely to Linux kernel coding guidelines.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8903985

net/tipc/core.h

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/core.h: Include file for TIPC global declarations

 *

 * Copyright (c) 2005-2006, Ericsson AB

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

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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,9 @@ 
#define assert(i)  BUG_ON(!(i))



struct tipc_msg;

extern struct print_buf *TIPC_NULL, *TIPC_CONS, *TIPC_LOG;

extern struct print_buf *const TIPC_NULL;

extern struct print_buf *const TIPC_CONS;

extern struct print_buf *const TIPC_LOG;

void tipc_msg_print(struct print_buf*,struct tipc_msg *,const char*);

void tipc_printf(struct print_buf *, const char *fmt, ...);

void tipc_dump(struct print_buf*,const char *fmt, ...);

net/tipc/dbg.c

+7 −7
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ 
 */



static struct print_buf null_buf = { NULL, 0, NULL, 0 };

struct print_buf *TIPC_NULL = &null_buf;

struct print_buf *const TIPC_NULL = &null_buf;



static struct print_buf cons_buf = { NULL, 0, NULL, 1 };

struct print_buf *TIPC_CONS = &cons_buf;

struct print_buf *const TIPC_CONS = &cons_buf;



static struct print_buf log_buf = { NULL, 0, NULL, 1 };

struct print_buf *TIPC_LOG = &log_buf;

struct print_buf *const TIPC_LOG = &log_buf;



/*

 * Locking policy when using print buffers.
@@ -118,7 +118,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 size) 


void tipc_printbuf_reset(struct print_buf *pb)

{

	if (pb->buf != NULL) {

	if (pb->buf) {

		pb->crs = pb->buf;

		pb->buf[0] = 0;

		pb->buf[pb->size - 1] = ~0;
@@ -158,7 +158,7 @@ int tipc_printbuf_validate(struct print_buf *pb) 


	if (pb->buf[pb->size - 1] == 0) {

		cp_buf = kmalloc(pb->size, GFP_ATOMIC);

		if (cp_buf != NULL){

		if (cp_buf) {

			tipc_printbuf_init(&cb, cp_buf, pb->size);

			tipc_printbuf_move(&cb, pb);

			tipc_printbuf_move(pb, &cb);