diff options
| -rw-r--r-- | gnu/egcs/gcc/c-common.c | 2 | ||||
| -rw-r--r-- | share/man/man9/printf.9 | 26 | ||||
| -rw-r--r-- | sys/kern/subr_prf.c | 25 | ||||
| -rw-r--r-- | sys/netccitt/pk_subr.c | 5 |
4 files changed, 5 insertions, 53 deletions
diff --git a/gnu/egcs/gcc/c-common.c b/gnu/egcs/gcc/c-common.c index 1f76a3381e1..6072d40c0e1 100644 --- a/gnu/egcs/gcc/c-common.c +++ b/gnu/egcs/gcc/c-common.c @@ -1466,8 +1466,6 @@ static format_char_info kprintf_char_table[] = { { "p", 1, T_V, NULL, NULL, NULL, NULL, NULL, NULL, "-w" }, /* Kernel bitmap formatting */ { "b", 1, T_C, NULL, NULL, NULL, NULL, NULL, NULL, "" }, -/* Kernel recursive format */ - { ":", 1, T_V, NULL, NULL, NULL, NULL, NULL, NULL, "" }, /* Kernel debugger auto-radix printing */ { "nrz", 0, T_I, T_I, T_I, T_L, T_LL, T_LL, NULL, "-wp0# +" }, { NULL } diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 39eed2eb0d4..04b3c969bb0 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: printf.9,v 1.10 2003/06/13 01:14:54 tedu Exp $ +.\" $OpenBSD: printf.9,v 1.11 2003/12/21 15:30:20 miod Exp $ .\" $NetBSD: kprintf.9,v 1.6 1999/03/16 00:40:47 garbled Exp $ .\" .\" Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -173,13 +173,6 @@ Description strings are delimited by the next bit position value character encountered .Pq "distinguishable by its value being \(<= 32" , or the end of the decoding directive string itself. -.It Li %: -Inline format continuation. -This format specifier allows for recursive formatted output. -Its argument is the new formatting string to obey and the argument which -follows it is a -.Va va_list -argument vector from which to obtain the data to be formatted. .It Li %r Displays an integer using the current .Tn DDB @@ -216,23 +209,6 @@ printf("enablereg=%b\en", 0xe860, "\ex06IOCACHE\ex05LOOPBACK\ex04DBGCACHE") \(rA "enablereg=e860<NOTBOOT,FPP,SDVMA,VIDEO,CACHE,IOCACHE>" .Ed -.Pp -Use of the -.Li %: -format specifier for recursive formatting. -.Bd -literal -offset indent -void -bail(char *fmt, ...) -{ - va_list ap; - va_start (ap, fmt); - printf("bailing out: %:\en", fmt, ap); - va_end(ap); -} - -bail("descriptor %d is invalid.", 5) -\(rA "bailing out: descriptor 5 is invalid" -.Ed .Sh SEE ALSO .Xr revoke 2 , .Xr printf 3 , diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 940dd6257d6..f7d9f2e08bc 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.56 2003/06/28 01:52:17 tedu Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.57 2003/12/21 15:30:21 miod Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -601,19 +601,6 @@ vsnprintf(char *buf, size_t size, const char *fmt, va_list ap) * * reg=3<BITTWO,BITONE> * - * The format %: passes an additional format string and argument list - * recursively. Its usage is: - * - * fn(char *fmt, ...) - * { - * va_list ap; - * va_start(ap, fmt); - * printf("prefix: %: suffix\n", fmt, ap); - * va_end(ap); - * } - * - * this is the actual printf innards - * * This code is large and complicated... */ @@ -714,16 +701,6 @@ kprintf(const char *fmt0, int oflags, void *vp, char *sbuf, va_list ap) rflag: ch = *fmt++; reswitch: switch (ch) { - /* XXX: non-standard '%:' format */ -#ifndef __powerpc__ - case ':': - if (!(oflags & TOBUFONLY)) { - cp = va_arg(ap, char *); - kprintf(cp, oflags, vp, - NULL, va_arg(ap, va_list)); - } - continue; /* no output */ -#endif /* XXX: non-standard '%b' format */ case 'b': { char *b, *z; diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c index c15ac6f9462..8634e5ce165 100644 --- a/sys/netccitt/pk_subr.c +++ b/sys/netccitt/pk_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk_subr.c,v 1.9 2003/12/10 07:22:43 itojun Exp $ */ +/* $OpenBSD: pk_subr.c,v 1.10 2003/12/21 15:30:21 miod Exp $ */ /* $NetBSD: pk_subr.c,v 1.12 1996/03/30 21:54:33 christos Exp $ */ /* @@ -1153,8 +1153,9 @@ pk_message(int lcn, struct x25config * xcp, char * fmt,...) printf("X.25: "); va_start(ap, fmt); - printf("%:\n", fmt, ap); + vprintf(fmt, ap); va_end(ap); + printf("\n"); } int |