diff options
Diffstat (limited to 'net/tipc/dbg.c')
-rw-r--r-- | net/tipc/dbg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c index 8ca9457250be..cda496815a05 100644 --- a/net/tipc/dbg.c +++ b/net/tipc/dbg.c | |||
@@ -49,13 +49,13 @@ | |||
49 | */ | 49 | */ |
50 | 50 | ||
51 | static struct print_buf null_buf = { NULL, 0, NULL, 0 }; | 51 | static struct print_buf null_buf = { NULL, 0, NULL, 0 }; |
52 | struct print_buf *TIPC_NULL = &null_buf; | 52 | struct print_buf *const TIPC_NULL = &null_buf; |
53 | 53 | ||
54 | static struct print_buf cons_buf = { NULL, 0, NULL, 1 }; | 54 | static struct print_buf cons_buf = { NULL, 0, NULL, 1 }; |
55 | struct print_buf *TIPC_CONS = &cons_buf; | 55 | struct print_buf *const TIPC_CONS = &cons_buf; |
56 | 56 | ||
57 | static struct print_buf log_buf = { NULL, 0, NULL, 1 }; | 57 | static struct print_buf log_buf = { NULL, 0, NULL, 1 }; |
58 | struct print_buf *TIPC_LOG = &log_buf; | 58 | struct print_buf *const TIPC_LOG = &log_buf; |
59 | 59 | ||
60 | /* | 60 | /* |
61 | * Locking policy when using print buffers. | 61 | * Locking policy when using print buffers. |
@@ -107,7 +107,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 size) | |||
107 | pb->buf = NULL; | 107 | pb->buf = NULL; |
108 | } else if (raw) { | 108 | } else if (raw) { |
109 | pb->buf[0] = 0; | 109 | pb->buf[0] = 0; |
110 | pb->buf[size-1] = ~0; | 110 | pb->buf[size - 1] = ~0; |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
@@ -118,7 +118,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 size) | |||
118 | 118 | ||
119 | void tipc_printbuf_reset(struct print_buf *pb) | 119 | void tipc_printbuf_reset(struct print_buf *pb) |
120 | { | 120 | { |
121 | if (pb->buf != NULL) { | 121 | if (pb->buf) { |
122 | pb->crs = pb->buf; | 122 | pb->crs = pb->buf; |
123 | pb->buf[0] = 0; | 123 | pb->buf[0] = 0; |
124 | pb->buf[pb->size - 1] = ~0; | 124 | pb->buf[pb->size - 1] = ~0; |
@@ -158,7 +158,7 @@ int tipc_printbuf_validate(struct print_buf *pb) | |||
158 | 158 | ||
159 | if (pb->buf[pb->size - 1] == 0) { | 159 | if (pb->buf[pb->size - 1] == 0) { |
160 | cp_buf = kmalloc(pb->size, GFP_ATOMIC); | 160 | cp_buf = kmalloc(pb->size, GFP_ATOMIC); |
161 | if (cp_buf != NULL){ | 161 | if (cp_buf) { |
162 | tipc_printbuf_init(&cb, cp_buf, pb->size); | 162 | tipc_printbuf_init(&cb, cp_buf, pb->size); |
163 | tipc_printbuf_move(&cb, pb); | 163 | tipc_printbuf_move(&cb, pb); |
164 | tipc_printbuf_move(pb, &cb); | 164 | tipc_printbuf_move(pb, &cb); |
@@ -205,7 +205,7 @@ void tipc_printbuf_move(struct print_buf *pb_to, struct print_buf *pb_from) | |||
205 | /* Copy data from char after cursor to end (if used) */ | 205 | /* Copy data from char after cursor to end (if used) */ |
206 | 206 | ||
207 | len = pb_from->buf + pb_from->size - pb_from->crs - 2; | 207 | len = pb_from->buf + pb_from->size - pb_from->crs - 2; |
208 | if ((pb_from->buf[pb_from->size-1] == 0) && (len > 0)) { | 208 | if ((pb_from->buf[pb_from->size - 1] == 0) && (len > 0)) { |
209 | strcpy(pb_to->buf, pb_from->crs + 1); | 209 | strcpy(pb_to->buf, pb_from->crs + 1); |
210 | pb_to->crs = pb_to->buf + len; | 210 | pb_to->crs = pb_to->buf + len; |
211 | } else | 211 | } else |