summaryrefslogtreecommitdiff
path: root/ddb/db_input.c
diff options
context:
space:
mode:
Diffstat (limited to 'ddb/db_input.c')
-rw-r--r--ddb/db_input.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/ddb/db_input.c b/ddb/db_input.c
index ce6a3103..6b6db764 100644
--- a/ddb/db_input.c
+++ b/ddb/db_input.c
@@ -32,6 +32,7 @@
#include <mach/boolean.h>
#include <machine/db_machdep.h>
+#include <device/cons.h>
#include <ddb/db_command.h>
#include <ddb/db_input.h>
#include <ddb/db_output.h>
@@ -68,8 +69,8 @@ char * db_history_prev = (char *) 0; /* start of previous line */
void
db_putstring(s, count)
- char *s;
- int count;
+ const char *s;
+ int count;
{
while (--count >= 0)
cnputc(*s++);
@@ -90,11 +91,11 @@ db_putnchars(c, count)
#define DEL_FWD 0
#define DEL_BWD 1
void
-db_delete(n, bwd)
- int n;
- int bwd;
+db_delete(
+ int n,
+ int bwd)
{
- register char *p;
+ char *p;
if (bwd) {
db_lc -= n;
@@ -110,7 +111,7 @@ db_delete(n, bwd)
}
void
-db_delete_line()
+db_delete_line(void)
{
db_delete(db_le - db_lc, DEL_FWD);
db_delete(db_lc - db_lbuf_start, DEL_BWD);
@@ -132,12 +133,11 @@ db_delete_line()
db_history_curr = db_history + \
db_history_size - 1; \
} while (0)
-#endif
+#endif /* DB_HISTORY_SIZE */
/* returns TRUE at end-of-line */
boolean_t
-db_inputchar(c)
- int c;
+db_inputchar(int c)
{
switch (c) {
case CTRL('b'):
@@ -213,7 +213,7 @@ db_inputchar(c)
INC_DB_CURR();
db_le = db_lc = db_lbuf_start;
} else {
- register char *p;
+ char *p;
INC_DB_CURR();
for (p = db_history_curr, db_le = db_lbuf_start;
*p; ) {
@@ -236,7 +236,7 @@ db_inputchar(c)
INC_DB_CURR();
db_delete_line();
if (db_history_curr != db_history_last) {
- register char *p;
+ char *p;
for (p = db_history_curr,
db_le = db_lbuf_start; *p;) {
*db_le++ = *p++;
@@ -250,7 +250,7 @@ db_inputchar(c)
db_putstring(db_lbuf_start, db_le - db_lbuf_start);
}
break;
-#endif
+#endif /* DB_HISTORY_SIZE */
case CTRL('r'):
db_putstring("^R\n", 3);
if (db_le > db_lbuf_start) {
@@ -267,7 +267,7 @@ db_inputchar(c)
* save it.
*/
if (db_history_curr == db_history_prev) {
- register char *pp, *pc;
+ char *pp, *pc;
/*
* Is it the same?
@@ -291,7 +291,7 @@ db_inputchar(c)
}
}
if (db_le != db_lbuf_start) {
- register char *p;
+ char *p;
db_history_prev = db_history_last;
for (p = db_lbuf_start; p != db_le; p++) {
*db_history_last++ = *p;
@@ -303,7 +303,7 @@ db_inputchar(c)
*db_history_last++ = '\0';
}
db_history_curr = db_history_last;
-#endif
+#endif /* DB_HISTORY_SIZE */
*db_le++ = c;
return (TRUE);
default:
@@ -311,7 +311,7 @@ db_inputchar(c)
cnputc('\007');
}
else if (c >= ' ' && c <= '~') {
- register char *p;
+ char *p;
for (p = db_le; p > db_lc; p--)
*p = *(p-1);
@@ -327,9 +327,9 @@ db_inputchar(c)
}
int
-db_readline(lstart, lsize)
- char * lstart;
- int lsize;
+db_readline(
+ char * lstart,
+ int lsize)
{
db_force_whitespace(); /* synch output position */
@@ -348,9 +348,9 @@ db_readline(lstart, lsize)
}
void
-db_check_interrupt()
+db_check_interrupt(void)
{
- register int c;
+ int c;
c = cnmaygetc();
switch (c) {