printk: add generic functions to find KERN_<LEVEL> headers

The current form of a KERN_<LEVEL> is "<.>".

Add printk_get_level and printk_skip_level functions to handle these
formats.

These functions centralize tests of KERN_<LEVEL> so a future modification
can change the KERN_<LEVEL> style and shorten the number of bytes consumed
by these headers.

[[email protected]: fix build error and warning]
Signed-off-by: Joe Perches <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: Wu Fengguang <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Joe Perches 2012-07-30 14:40:09 -07:00 • committed by Linus Torvalds
commit acc8fa41ad
2 changed files with 35 additions and 5 deletions

View file

@ -1487,6 +1487,7 @@ asmlinkage int vprintk_emit(int facility, int level,
size_t text_len;
enum log_flags lflags = 0;
unsigned long flags;
int kern_level;
int this_cpu;
int printed_len = 0;
@ -1543,17 +1544,20 @@ asmlinkage int vprintk_emit(int facility, int level,
}
/* strip syslog prefix and extract log level or control flags */
if (text[0] == '<' && text[1] && text[2] == '>') {
switch (text[1]) {
kern_level = printk_get_level(text);
if (kern_level) {
const char *end_of_header = printk_skip_level(text);
switch (kern_level) {
case '0' ... '7':
if (level == -1)
level = text[1] - '0';
level = kern_level - '0';
case 'd': /* KERN_DEFAULT */
lflags |= LOG_PREFIX;
case 'c': /* KERN_CONT */
text += 3;
text_len -= 3;
break;
}
text_len -= end_of_header - text;
text = (char *)end_of_header;
}
if (level == -1)