diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/elink3.c | 6 | ||||
-rw-r--r-- | sys/kern/subr_userconf.c | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 6e343d1a2ad..93ed4997cb5 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.134 2000/06/16 21:47:11 provos Exp $ */ +/* $OpenBSD: machdep.c,v 1.135 2000/07/06 00:59:00 todd Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -321,7 +321,7 @@ cpu_startup() VM_PROT_READ|VM_PROT_WRITE); initmsgbuf((caddr_t)msgbufp, round_page(MSGBUFSIZE)); - printf(version); + printf("%s", version); startrtclock(); identifycpu(); diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 7700492f105..4b750403021 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.40 2000/06/29 03:22:31 aaron Exp $ */ +/* $OpenBSD: elink3.c,v 1.41 2000/07/06 00:59:01 todd Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -476,7 +476,7 @@ ep_isa_probemedia(sc) ifmedia_add(ifm, epm->epm_ifmedia, epm->epm_ifdata, 0); if (conn) printf("/"); - printf(epm->epm_name); + printf("%s", epm->epm_name); conn |= epm->epm_conn; } } @@ -539,7 +539,7 @@ ep_vortex_probemedia(sc) if ((reset_options & epm->epm_eeprom_data) != 0) { if (conn) printf("/"); - printf(epm->epm_name); + printf("%s", epm->epm_name); conn |= epm->epm_conn; ifmedia_add(ifm, epm->epm_ifmedia, epm->epm_ifdata, 0); } diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c index d52132e99b9..14afc3a9e86 100644 --- a/sys/kern/subr_userconf.c +++ b/sys/kern/subr_userconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_userconf.c,v 1.20 2000/05/19 17:07:05 maja Exp $ */ +/* $OpenBSD: subr_userconf.c,v 1.21 2000/07/06 00:59:01 todd Exp $ */ /* * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se> @@ -1228,13 +1228,11 @@ userconf_parse(cmd) void user_config() { - char prompt[] = "UKC> "; - userconf_init(); printf("User Kernel Config\n"); while (1) { - printf(prompt); + printf("UKC> "); if (getsn(userconf_cmdbuf, sizeof(userconf_cmdbuf)) > 0 && userconf_parse(userconf_cmdbuf)) break; |