Move bitmask_snprintf() from subr_prf.c to subr_prf_bitmask.c to permit
standalone compilation. No functional change.
This commit is contained in:
pooka
parent
f486212a0e
commit
e97d926940
@ -1,4 +1,4 @@
|
||||
# $NetBSD: files,v 1.854 2007/07/28 12:53:53 pooka Exp $
|
||||
# $NetBSD: files,v 1.855 2007/07/29 09:38:02 pooka Exp $
|
||||
|
||||
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
|
||||
|
||||
@ -1370,6 +1370,7 @@ file kern/subr_lockdebug.c
|
||||
file kern/subr_log.c
|
||||
file kern/subr_pool.c
|
||||
file kern/subr_prf.c
|
||||
file kern/subr_prf_bitmask.c
|
||||
file kern/subr_prof.c
|
||||
file kern/subr_once.c
|
||||
file kern/subr_optstr.c
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: subr_prf.c,v 1.106 2007/04/28 13:11:53 isaki Exp $ */
|
||||
/* $NetBSD: subr_prf.c,v 1.107 2007/07/29 09:38:01 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1986, 1988, 1991, 1993
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.106 2007/04/28 13:11:53 isaki Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.107 2007/07/29 09:38:01 pooka Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_ipkdb.h"
|
||||
@ -100,9 +100,6 @@ struct simplelock kprintf_slock = SIMPLELOCK_INITIALIZER;
|
||||
* defines
|
||||
*/
|
||||
|
||||
/* max size buffer kprintf needs to print quad_t [size in base 8 + \0] */
|
||||
#define KPRINTF_BUFSIZE (sizeof(quad_t) * NBBY / 3 + 2)
|
||||
|
||||
|
||||
/*
|
||||
* local prototypes
|
||||
@ -862,148 +859,6 @@ vsnprintf(char *bf, size_t size, const char *fmt, va_list ap)
|
||||
return(retval);
|
||||
}
|
||||
|
||||
/*
|
||||
* bitmask_snprintf: print an interpreted bitmask to a buffer
|
||||
*
|
||||
* => returns pointer to the buffer
|
||||
*/
|
||||
char *
|
||||
bitmask_snprintf(u_quad_t val, const char *p, char *bf, size_t buflen)
|
||||
{
|
||||
char *bp, *q;
|
||||
size_t left;
|
||||
const char *sbase;
|
||||
char snbuf[KPRINTF_BUFSIZE];
|
||||
int base, bit, ch, len, sep;
|
||||
u_quad_t field;
|
||||
|
||||
bp = bf;
|
||||
memset(bf, 0, buflen);
|
||||
|
||||
/*
|
||||
* Always leave room for the trailing NULL.
|
||||
*/
|
||||
left = buflen - 1;
|
||||
|
||||
/*
|
||||
* Print the value into the buffer. Abort if there's not
|
||||
* enough room.
|
||||
*/
|
||||
if (buflen < KPRINTF_BUFSIZE)
|
||||
return (bf);
|
||||
|
||||
ch = *p++;
|
||||
base = ch != '\177' ? ch : *p++;
|
||||
sbase = base == 8 ? "%qo" : base == 10 ? "%qd" : base == 16 ? "%qx" : 0;
|
||||
if (sbase == 0)
|
||||
return (bf); /* punt if not oct, dec, or hex */
|
||||
|
||||
snprintf(snbuf, sizeof(snbuf), sbase, val);
|
||||
for (q = snbuf ; *q ; q++) {
|
||||
*bp++ = *q;
|
||||
left--;
|
||||
}
|
||||
|
||||
/*
|
||||
* If the value we printed was 0 and we're using the old-style format,
|
||||
* or if we don't have room for "<x>", we're done.
|
||||
*/
|
||||
if (((val == 0) && (ch != '\177')) || left < 3)
|
||||
return (bf);
|
||||
|
||||
#define PUTBYTE(b, c, l) do { \
|
||||
*(b)++ = (c); \
|
||||
if (--(l) == 0) \
|
||||
goto out; \
|
||||
} while (/*CONSTCOND*/ 0)
|
||||
#define PUTSTR(b, p, l) do { \
|
||||
int c; \
|
||||
while ((c = *(p)++) != 0) { \
|
||||
*(b)++ = c; \
|
||||
if (--(l) == 0) \
|
||||
goto out; \
|
||||
} \
|
||||
} while (/*CONSTCOND*/ 0)
|
||||
|
||||
/*
|
||||
* Chris Torek's new bitmask format is identified by a leading \177
|
||||
*/
|
||||
sep = '<';
|
||||
if (ch != '\177') {
|
||||
/* old (standard) format. */
|
||||
for (;(bit = *p++) != 0;) {
|
||||
if (val & (1 << (bit - 1))) {
|
||||
PUTBYTE(bp, sep, left);
|
||||
for (; (ch = *p) > ' '; ++p) {
|
||||
PUTBYTE(bp, ch, left);
|
||||
}
|
||||
sep = ',';
|
||||
} else
|
||||
for (; *p > ' '; ++p)
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
/* new quad-capable format; also does fields. */
|
||||
field = val;
|
||||
while ((ch = *p++) != '\0') {
|
||||
bit = *p++; /* now 0-origin */
|
||||
switch (ch) {
|
||||
case 'b':
|
||||
if (((u_int)(val >> bit) & 1) == 0)
|
||||
goto skip;
|
||||
PUTBYTE(bp, sep, left);
|
||||
PUTSTR(bp, p, left);
|
||||
sep = ',';
|
||||
break;
|
||||
case 'f':
|
||||
case 'F':
|
||||
len = *p++; /* field length */
|
||||
field = (val >> bit) & ((1ULL << len) - 1);
|
||||
if (ch == 'F') /* just extract */
|
||||
break;
|
||||
PUTBYTE(bp, sep, left);
|
||||
sep = ',';
|
||||
PUTSTR(bp, p, left);
|
||||
PUTBYTE(bp, '=', left);
|
||||
sprintf(snbuf, sbase, field);
|
||||
q = snbuf; PUTSTR(bp, q, left);
|
||||
break;
|
||||
case '=':
|
||||
case ':':
|
||||
/*
|
||||
* Here "bit" is actually a value instead,
|
||||
* to be compared against the last field.
|
||||
* This only works for values in [0..255],
|
||||
* of course.
|
||||
*/
|
||||
if ((int)field != bit)
|
||||
goto skip;
|
||||
if (ch == '=')
|
||||
PUTBYTE(bp, '=', left);
|
||||
else {
|
||||
PUTBYTE(bp, sep, left);
|
||||
sep = ',';
|
||||
}
|
||||
PUTSTR(bp, p, left);
|
||||
break;
|
||||
default:
|
||||
skip:
|
||||
while (*p++ != '\0')
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sep != '<')
|
||||
PUTBYTE(bp, '>', left);
|
||||
|
||||
out:
|
||||
return (bf);
|
||||
|
||||
#undef PUTBYTE
|
||||
#undef PUTSTR
|
||||
}
|
||||
|
||||
/*
|
||||
* kprintf: scaled down version of printf(3).
|
||||
*
|
||||
|
||||
191
sys/kern/subr_prf_bitmask.c
Normal file
191
sys/kern/subr_prf_bitmask.c
Normal file
@ -0,0 +1,191 @@
|
||||
/* $NetBSD: subr_prf_bitmask.c,v 1.1 2007/07/29 09:38:02 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1986, 1988, 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* (c) UNIX System Laboratories, Inc.
|
||||
* All or some portions of this file are derived from material licensed
|
||||
* to the University of California by American Telephone and Telegraph
|
||||
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
|
||||
* the permission of UNIX System Laboratories, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)subr_prf.c 8.4 (Berkeley) 5/4/95
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: subr_prf_bitmask.c,v 1.1 2007/07/29 09:38:02 pooka Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kprintf.h>
|
||||
|
||||
/*
|
||||
* This function is in its own separate module to permit easier
|
||||
* standalone compilation without pulling in kprintf(), panic(), etcetc.
|
||||
*/
|
||||
|
||||
/*
|
||||
* bitmask_snprintf: print an interpreted bitmask to a buffer
|
||||
*
|
||||
* => returns pointer to the buffer
|
||||
*/
|
||||
char *
|
||||
bitmask_snprintf(u_quad_t val, const char *p, char *bf, size_t buflen)
|
||||
{
|
||||
char *bp, *q;
|
||||
size_t left;
|
||||
const char *sbase;
|
||||
char snbuf[KPRINTF_BUFSIZE];
|
||||
int base, bit, ch, len, sep;
|
||||
u_quad_t field;
|
||||
|
||||
bp = bf;
|
||||
memset(bf, 0, buflen);
|
||||
|
||||
/*
|
||||
* Always leave room for the trailing NULL.
|
||||
*/
|
||||
left = buflen - 1;
|
||||
|
||||
/*
|
||||
* Print the value into the buffer. Abort if there's not
|
||||
* enough room.
|
||||
*/
|
||||
if (buflen < KPRINTF_BUFSIZE)
|
||||
return (bf);
|
||||
|
||||
ch = *p++;
|
||||
base = ch != '\177' ? ch : *p++;
|
||||
sbase = base == 8 ? "%qo" : base == 10 ? "%qd" : base == 16 ? "%qx" : 0;
|
||||
if (sbase == 0)
|
||||
return (bf); /* punt if not oct, dec, or hex */
|
||||
|
||||
snprintf(snbuf, sizeof(snbuf), sbase, val);
|
||||
for (q = snbuf ; *q ; q++) {
|
||||
*bp++ = *q;
|
||||
left--;
|
||||
}
|
||||
|
||||
/*
|
||||
* If the value we printed was 0 and we're using the old-style format,
|
||||
* or if we don't have room for "<x>", we're done.
|
||||
*/
|
||||
if (((val == 0) && (ch != '\177')) || left < 3)
|
||||
return (bf);
|
||||
|
||||
#define PUTBYTE(b, c, l) do { \
|
||||
*(b)++ = (c); \
|
||||
if (--(l) == 0) \
|
||||
goto out; \
|
||||
} while (/*CONSTCOND*/ 0)
|
||||
#define PUTSTR(b, p, l) do { \
|
||||
int c; \
|
||||
while ((c = *(p)++) != 0) { \
|
||||
*(b)++ = c; \
|
||||
if (--(l) == 0) \
|
||||
goto out; \
|
||||
} \
|
||||
} while (/*CONSTCOND*/ 0)
|
||||
|
||||
/*
|
||||
* Chris Torek's new bitmask format is identified by a leading \177
|
||||
*/
|
||||
sep = '<';
|
||||
if (ch != '\177') {
|
||||
/* old (standard) format. */
|
||||
for (;(bit = *p++) != 0;) {
|
||||
if (val & (1 << (bit - 1))) {
|
||||
PUTBYTE(bp, sep, left);
|
||||
for (; (ch = *p) > ' '; ++p) {
|
||||
PUTBYTE(bp, ch, left);
|
||||
}
|
||||
sep = ',';
|
||||
} else
|
||||
for (; *p > ' '; ++p)
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
/* new quad-capable format; also does fields. */
|
||||
field = val;
|
||||
while ((ch = *p++) != '\0') {
|
||||
bit = *p++; /* now 0-origin */
|
||||
switch (ch) {
|
||||
case 'b':
|
||||
if (((u_int)(val >> bit) & 1) == 0)
|
||||
goto skip;
|
||||
PUTBYTE(bp, sep, left);
|
||||
PUTSTR(bp, p, left);
|
||||
sep = ',';
|
||||
break;
|
||||
case 'f':
|
||||
case 'F':
|
||||
len = *p++; /* field length */
|
||||
field = (val >> bit) & ((1ULL << len) - 1);
|
||||
if (ch == 'F') /* just extract */
|
||||
break;
|
||||
PUTBYTE(bp, sep, left);
|
||||
sep = ',';
|
||||
PUTSTR(bp, p, left);
|
||||
PUTBYTE(bp, '=', left);
|
||||
sprintf(snbuf, sbase, field);
|
||||
q = snbuf; PUTSTR(bp, q, left);
|
||||
break;
|
||||
case '=':
|
||||
case ':':
|
||||
/*
|
||||
* Here "bit" is actually a value instead,
|
||||
* to be compared against the last field.
|
||||
* This only works for values in [0..255],
|
||||
* of course.
|
||||
*/
|
||||
if ((int)field != bit)
|
||||
goto skip;
|
||||
if (ch == '=')
|
||||
PUTBYTE(bp, '=', left);
|
||||
else {
|
||||
PUTBYTE(bp, sep, left);
|
||||
sep = ',';
|
||||
}
|
||||
PUTSTR(bp, p, left);
|
||||
break;
|
||||
default:
|
||||
skip:
|
||||
while (*p++ != '\0')
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sep != '<')
|
||||
PUTBYTE(bp, '>', left);
|
||||
|
||||
out:
|
||||
return (bf);
|
||||
|
||||
#undef PUTBYTE
|
||||
#undef PUTSTR
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kprintf.h,v 1.7 2005/12/11 12:25:20 christos Exp $ */
|
||||
/* $NetBSD: kprintf.h,v 1.8 2007/07/29 09:38:02 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1986, 1988, 1991, 1993
|
||||
@ -46,6 +46,9 @@
|
||||
* they need.
|
||||
*/
|
||||
|
||||
/* max size buffer kprintf needs to print quad_t [size in base 8 + \0] */
|
||||
#define KPRINTF_BUFSIZE (sizeof(quad_t) * NBBY / 3 + 2)
|
||||
|
||||
#if defined(MULTIPROCESSOR)
|
||||
|
||||
extern struct simplelock kprintf_slock;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user