Remove db_check_interrupt() related logic, since it was dummied in practice.

3 files changed, 4 insertions, 50 deletions

diff --git a/sys/ddb/db_extern.h b/sys/ddb/db_extern.h
index 740590673b1..25673d9ad3b 100644
--- a/sys/ddb/db_extern.h
+++ b/sys/ddb/db_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_extern.h,v 1.12 2004/04/25 03:21:50 itojun Exp $	*/
+/*	$OpenBSD: db_extern.h,v 1.13 2006/07/06 18:14:14 miod Exp $	*/
 /*	$NetBSD: db_extern.h,v 1.1 1996/02/05 01:57:00 christos Exp $	*/
 
 /*
@@ -62,7 +62,6 @@ void db_delete(int, int);
 void db_delete_line(void);
 int db_inputchar(int);
 int db_readline(char *, int);
-void db_check_interrupt(void);
 
 /* db_print.c */
 void db_show_regs(db_expr_t, boolean_t, db_expr_t, char *);
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index af3a12412e6..2e8e44ef0ca 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_input.c,v 1.10 2006/03/13 06:23:20 jsg Exp $	*/
+/*	$OpenBSD: db_input.c,v 1.11 2006/07/06 18:14:14 miod Exp $	*/
 /*	$NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $	*/
 
 /* 
@@ -72,8 +72,6 @@ char *  db_history_prev = (char *) 0;	/* start of previous line */
 #define	BLANK		' '
 #define	BACKUP		'\b'
 
-static int cnmaygetc(void);
-
 void
 db_putstring(char *s, int count)
 {
@@ -344,38 +342,3 @@ db_readline(char *lstart, int lsize)
 	*db_le = 0;
 	return (db_le - db_lbuf_start);
 }
-
-void
-db_check_interrupt(void)
-{
-	int	c;
-
-	c = cnmaygetc();
-	switch (c) {
-	    case -1:		/* no character */
-		return;
-
-	    case CTRL('c'):
-		db_error((char *)0);
-		/*NOTREACHED*/
-
-	    case CTRL('s'):
-		do {
-		    c = cnmaygetc();
-		    if (c == CTRL('c'))
-			db_error(NULL);
-			/*NOTREACHED*/
-		} while (c != CTRL('q'));
-		break;
-
-	    default:
-		/* drop on floor */
-		break;
-	}
-}
-
-static int
-cnmaygetc(void)
-{
-	return (-1);
-}
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 6cb92fadc21..37d745373ec 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_output.c,v 1.24 2006/03/13 06:23:20 jsg Exp $	*/
+/*	$OpenBSD: db_output.c,v 1.25 2006/07/06 18:14:14 miod Exp $	*/
 /*	$NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $	*/
 
 /* 
@@ -80,9 +80,7 @@ int	db_max_line = DB_MAX_LINE;	/* output max lines */
 int	db_max_width = DB_MAX_WIDTH;	/* output line width */
 int	db_radix = 16;			/* output numbers radix */
 
-#ifdef DDB
 static void db_more(void);
-#endif
 
 /*
  * Force pending whitespace.
@@ -109,7 +107,6 @@ db_force_whitespace(void)
 	db_last_non_space = db_output_position;
 }
 
-#ifdef DDB
 static void
 db_more(void)
 {
@@ -139,7 +136,6 @@ db_more(void)
 	    /* NOTREACHED */
 	}
 }
-#endif
 
 /*
  * Output character.  Buffer whitespace.
@@ -147,10 +143,9 @@ db_more(void)
 void
 db_putchar(int c)
 {
-#ifdef DDB
 	if (db_max_line >= DB_MIN_MAX_LINE && db_output_line >= db_max_line-1)
 	    db_more();
-#endif
+
 	if (c > ' ' && c <= '~') {
 	    /*
 	     * Printing character.
@@ -176,9 +171,6 @@ db_putchar(int c)
 	    db_output_position = 0;
 	    db_last_non_space = 0;
 	    db_output_line++;
-#ifdef DDB
-	    db_check_interrupt();
-#endif
 	}
 	else if (c == '\t') {
 	    /* assume tabs every 8 positions */