make various strings ("can't map mem space" and similar) more consistent

between instances, saving space in the kernel. feedback from many (some
incorporated, some left for future work).

ok deraadt, kettenis, "why not" miod.

6 files changed, 17 insertions, 17 deletions

diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c
index 8c6faccb7a3..cc4e9a16728 100644
--- a/sys/arch/mac68k/dev/asc.c
+++ b/sys/arch/mac68k/dev/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.25 2006/09/16 10:42:23 miod Exp $	*/
+/*	$OpenBSD: asc.c,v 1.26 2009/03/29 21:53:52 sthen Exp $	*/
 /*	$NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $	*/
 
 /*
@@ -157,7 +157,7 @@ ascattach(parent, self, aux)
 		addr = (bus_addr_t)MAC68K_ASC_BASE;
 	if (bus_space_map(sc->sc_tag, addr, MAC68K_ASC_LEN, 0,
 	    &sc->sc_handle)) {
-		printf(": can't map memory space\n");
+		printf(": can't map mem space\n");
 		return;
 	}
 	sc->sc_open = 0;
diff --git a/sys/arch/mac68k/dev/if_ae_nubus.c b/sys/arch/mac68k/dev/if_ae_nubus.c
index 39664052df3..46353b65501 100644
--- a/sys/arch/mac68k/dev/if_ae_nubus.c
+++ b/sys/arch/mac68k/dev/if_ae_nubus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ae_nubus.c,v 1.18 2007/09/10 20:29:46 miod Exp $	*/
+/*	$OpenBSD: if_ae_nubus.c,v 1.19 2009/03/29 21:53:52 sthen Exp $	*/
 /*	$NetBSD: if_ae_nubus.c,v 1.17 1997/05/01 18:17:16 briggs Exp $	*/
 
 /*
@@ -143,7 +143,7 @@ ae_nubus_attach(parent, self, aux)
 	bst = na->na_tag;
 	if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE,
 	    0, &bsh)) {
-		printf(": can't map memory space\n");
+		printf(": can't map mem space\n");
 		return;
 	}
 
diff --git a/sys/arch/mac68k/dev/if_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c
index dd38e5e2055..7d0f1664a6e 100644
--- a/sys/arch/mac68k/dev/if_mc_obio.c
+++ b/sys/arch/mac68k/dev/if_mc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc_obio.c,v 1.6 2006/06/24 13:23:27 miod Exp $	*/
+/*	$OpenBSD: if_mc_obio.c,v 1.7 2009/03/29 21:53:52 sthen Exp $	*/
 /*	$NetBSD: if_mc_obio.c,v 1.13 2004/03/26 12:15:46 wiz Exp $	*/
 
 /*-
@@ -145,7 +145,7 @@ mc_obio_attach(parent, self, aux)
 	}
 	sc->sc_txbuf = (u_char *)uvm_km_valloc(kernel_map, PAGE_SIZE);
 	if (sc->sc_txbuf == NULL) {
-		printf(": could not map transmit buffer memory\n");
+		printf(": can't map transmit buffer memory\n");
 		goto out2;
 	}
 	pg = TAILQ_FIRST(&txlist);
@@ -166,7 +166,7 @@ mc_obio_attach(parent, self, aux)
 	sc->sc_rxbuf = (u_char *)(va = uvm_km_valloc(kernel_map,
 	    MC_NPAGES * PAGE_SIZE));
 	if (sc->sc_rxbuf == NULL) {
-		printf(": could not map receive buffer memory\n");
+		printf(": can't map receive buffer memory\n");
 		goto out4;
 	}
 	pg = TAILQ_FIRST(&rxlist);
diff --git a/sys/arch/mac68k/dev/if_sm_nubus.c b/sys/arch/mac68k/dev/if_sm_nubus.c
index 16b47774682..447c814ce9a 100644
--- a/sys/arch/mac68k/dev/if_sm_nubus.c
+++ b/sys/arch/mac68k/dev/if_sm_nubus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_nubus.c,v 1.2 2007/09/10 20:29:46 miod Exp $	*/
+/*	$OpenBSD: if_sm_nubus.c,v 1.3 2009/03/29 21:53:52 sthen Exp $	*/
 /*	$NetBSD: if_sm_nubus.c,v 1.2 2000/08/01 13:08:39 briggs Exp $	*/
 
 /*
@@ -115,7 +115,7 @@ sm_nubus_attach(parent, self, aux)
 
 	bst = na->na_tag;
 	if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) {
-		printf(": failed to map memory space.\n");
+		printf(": can't map mem space.\n");
 		return;
 	}
 
@@ -131,7 +131,7 @@ sm_nubus_attach(parent, self, aux)
 	switch (na->drsw) {
 	case NUBUS_DRSW_FOCUS:
 		if (bus_space_subregion(bst, bsh, 0xFF8000, 0x20, &prom_bsh)) {
-			printf(": failed to map EEPROM space.\n");
+			printf(": can't map EEPROM space\n");
 			break;
 		}
 
@@ -139,7 +139,7 @@ sm_nubus_attach(parent, self, aux)
 		break;
 	case NUBUS_DRSW_ASANTEF:
 		if (bus_space_subregion(bst, bsh, 0xFE0000, 0x20, &prom_bsh)) {
-			printf(": failed to map EEPROM space.\n");
+			printf(": can't map EEPROM space\n");
 			break;
 		}
 
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index 3a9bca02128..c9eb7a0c297 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_sn.c,v 1.51 2009/03/15 20:40:25 miod Exp $        */
+/*    $OpenBSD: if_sn.c,v 1.52 2009/03/29 21:53:52 sthen Exp $        */
 /*    $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $        */
 
 /*
@@ -125,7 +125,7 @@ snsetup(struct sn_softc *sc, u_int8_t *lladdr)
 	 */
 	sc->space = uvm_km_valloc(kernel_map, SN_NPAGES * PAGE_SIZE);
 	if (sc->space == NULL) {
-		printf(": could not map descriptor memory\n");
+		printf(": can't map descriptor memory\n");
 		uvm_pglistfree(&pglist);
 		return (ENOMEM);
 	}
diff --git a/sys/arch/mac68k/dev/if_sn_nubus.c b/sys/arch/mac68k/dev/if_sn_nubus.c
index 5a2f6698961..5da3bcd0714 100644
--- a/sys/arch/mac68k/dev/if_sn_nubus.c
+++ b/sys/arch/mac68k/dev/if_sn_nubus.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_sn_nubus.c,v 1.19 2007/09/10 20:29:46 miod Exp $  */
+/*    $OpenBSD: if_sn_nubus.c,v 1.20 2009/03/29 21:53:52 sthen Exp $  */
 /*    $NetBSD: if_sn_nubus.c,v 1.13 1997/05/11 19:11:34 scottr Exp $  */
 /*
  * Copyright (C) 1997 Allen Briggs
@@ -115,7 +115,7 @@ sn_nubus_attach(struct device *parent, struct device *self, void *aux)
 
 	bst = na->na_tag;
 	if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) {
-		printf(": failed to map memory space.\n");
+		printf(": can't map mem space\n");
 		return;
 	}
 
@@ -137,13 +137,13 @@ sn_nubus_attach(struct device *parent, struct device *self, void *aux)
 
 		if (bus_space_subregion(bst, bsh,
 		    0x00180000, SN_REGSIZE, &sc->sc_regh)) {
-			printf(": failed to map register space.\n");
+			printf(": can't map register space\n");
 			break;
 		}
 
 		if (bus_space_subregion(bst, bsh,
 		    0x00ffe004, ETHER_ADDR_LEN, &tmp_bsh)) {
-			printf(": failed to map ROM space.\n");
+			printf(": can't map ROM space\n");
 			break;
 		}