Remove unused function forgotten during the switch to the interactive

bootloader and make use of strrchr() in hfs_open because we have it.

ok krw@

2 files changed, 2 insertions, 61 deletions

diff --git a/sys/arch/macppc/stand/hfs.c b/sys/arch/macppc/stand/hfs.c
index 1cb959b81ec..2462cd08378 100644
--- a/sys/arch/macppc/stand/hfs.c
+++ b/sys/arch/macppc/stand/hfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfs.c,v 1.4 2005/09/26 19:55:47 kettenis Exp $	*/
+/*	$OpenBSD: hfs.c,v 1.5 2011/11/19 16:15:11 mpi Exp $	*/
 /*	$NetBSD: hfs.c,v 1.1 2000/11/14 11:25:35 tsubai Exp $	*/
 
 /*-
@@ -47,18 +47,7 @@ hfs_open(char *path, struct open_file *f)
 	bzero(bootpath, sizeof bootpath);
 	OF_getprop(chosen, "bootpath", bootpath, sizeof bootpath);
 
-#ifdef HAVE_STAND_STRRCHR
 	cp = strrchr(bootpath, ',');
-#else
-	cp = bootpath;
-	cp += strlen(bootpath);
-	for (; *cp != ','; cp--) {
-		if (cp == bootpath) {
-			cp = NULL;
-			break;
-		}
-	}
-#endif
 	if (cp == NULL)
 		return ENXIO;
 
diff --git a/sys/arch/macppc/stand/main.c b/sys/arch/macppc/stand/main.c
index a238ac5ce1c..ea7786ed63e 100644
--- a/sys/arch/macppc/stand/main.c
+++ b/sys/arch/macppc/stand/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.5 2008/05/25 16:55:31 miod Exp $	*/
+/*	$OpenBSD: main.c,v 1.6 2011/11/19 16:15:11 mpi Exp $	*/
 /*	$NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $	*/
 
 /*
@@ -84,54 +84,6 @@ prom2boot(char *dev)
 }
 
 static void
-parseargs(char *str, int *howtop)
-{
-	char *cp;
-
-	/* Allow user to drop back to the PROM. */
-	if (strcmp(str, "exit") == 0)
-		_rtt();
-
-	*howtop = 0;
-	if (str[0] == '\0')
-		return;
-
-	cp = str;
-	while (*cp != 0) {
-		/* check for - */
-		if (*cp == '-')
-			break;	/* start of options found */
-
-		while (*cp != 0 && *cp != ' ')
-			cp++;	/* character in the middle of the name, skip */
-
-		while (*cp == ' ')
-			*cp++ = 0;
-	}
-	if (!*cp)
-		return;
-
-	*cp++ = 0;
-	while (*cp) {
-		switch (*cp++) {
-		case 'a':
-			*howtop |= RB_ASKNAME;
-			break;
-		case 'c':
-			*howtop |= RB_CONFIG;
-			break;
-		case 's':
-			*howtop |= RB_SINGLE;
-			break;
-		case 'd':
-			*howtop |= RB_KDB;
-			debug = 1;
-			break;
-		}
-	}
-}
-
-static void
 chain(void (*entry)(), char *args, void *ssym, void *esym)
 {
 	extern char end[];