Module Name: src
Committed By: christos
Date: Tue May 24 17:42:54 UTC 2016
Modified Files:
src/lib/libedit: Makefile read.c
Log Message:
remove debug read (Ingo Schwarze)
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/lib/libedit/Makefile
cvs rdiff -u -r1.98 -r1.99 src/lib/libedit/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.62 src/lib/libedit/Makefile:1.63
--- src/lib/libedit/Makefile:1.62 Mon May 9 17:38:27 2016
+++ src/lib/libedit/Makefile Tue May 24 13:42:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2016/05/09 21:38:27 christos Exp $
+# $NetBSD: Makefile,v 1.63 2016/05/24 17:42:54 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -75,7 +75,7 @@ CLEANFILES+=help.h.tmp vi.h.tmp tc1.o tc
CPPFLAGS+=-I. -I${LIBEDITDIR}
CPPFLAGS+=-I. -I${.CURDIR}
-#CPPFLAGS+=-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
+#CPPFLAGS+=-DDEBUG_TTY -DDEBUG_KEY -DDEBUG -DDEBUG_REFRESH
#CPPFLAGS+=-DDEBUG_PASTE -DDEBUG_EDIT
AHDR=vi.h emacs.h common.h
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.98 src/lib/libedit/read.c:1.99
--- src/lib/libedit/read.c:1.98 Tue May 24 11:00:45 2016
+++ src/lib/libedit/read.c Tue May 24 13:42:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.98 2016/05/24 15:00:45 christos Exp $ */
+/* $NetBSD: read.c,v 1.99 2016/05/24 17:42:54 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: read.c,v 1.98 2016/05/24 15:00:45 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.99 2016/05/24 17:42:54 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -137,25 +137,6 @@ el_read_getfn(struct el_read_t *el_read)
}
-#ifdef DEBUG_EDIT
-static void
-read_debug(EditLine *el)
-{
-
- if (el->el_line.cursor > el->el_line.lastchar)
- (void) fprintf(el->el_errfile, "cursor > lastchar\r\n");
- if (el->el_line.cursor < el->el_line.buffer)
- (void) fprintf(el->el_errfile, "cursor < buffer\r\n");
- if (el->el_line.cursor > el->el_line.limit)
- (void) fprintf(el->el_errfile, "cursor > limit\r\n");
- if (el->el_line.lastchar > el->el_line.limit)
- (void) fprintf(el->el_errfile, "lastchar > limit\r\n");
- if (el->el_line.limit != &el->el_line.buffer[EL_BUFSIZ - 2])
- (void) fprintf(el->el_errfile, "limit != &buffer[EL_BUFSIZ-2]\r\n");
-}
-#endif /* DEBUG_EDIT */
-
-
/* read__fixio():
* Try to recover from a read error
*/
@@ -428,15 +409,9 @@ el_wgetc(EditLine *el, wchar_t *cp)
return 1;
}
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile, "Turning raw mode on\n");
-#endif /* DEBUG_READ */
if (tty_rawmode(el) < 0)/* make sure the tty is set up correctly */
return 0;
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile, "Reading a character\n");
-#endif /* DEBUG_READ */
num_read = (*el->el_read->read_char)(el, cp);
/*
@@ -447,9 +422,6 @@ el_wgetc(EditLine *el, wchar_t *cp)
if (num_read < 0)
el->el_read->read_errno = errno;
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile, "Got it %lc\n", *cp);
-#endif /* DEBUG_READ */
return num_read;
}
@@ -574,39 +546,12 @@ el_wgets(EditLine *el, int *nread)
}
for (num = -1; num == -1;) { /* while still editing this line */
-#ifdef DEBUG_EDIT
- read_debug(el);
-#endif /* DEBUG_EDIT */
/* if EOF or error */
- if (read_getcmd(el, &cmdnum, &ch) == -1) {
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile,
- "Returning from el_gets\n");
-#endif /* DEBUG_READ */
+ if (read_getcmd(el, &cmdnum, &ch) == -1)
break;
- }
- if ((size_t)cmdnum >= el->el_map.nfunc) { /* BUG CHECK command */
-#ifdef DEBUG_EDIT
- (void) fprintf(el->el_errfile,
- "ERROR: illegal command from key 0%o\r\n", ch);
-#endif /* DEBUG_EDIT */
+ if ((size_t)cmdnum >= el->el_map.nfunc) /* BUG CHECK command */
continue; /* try again */
- }
/* now do the real command */
-#ifdef DEBUG_READ
- {
- el_bindings_t *b;
- for (b = el->el_map.help; b->name; b++)
- if (b->func == cmdnum)
- break;
- if (b->name)
- (void) fprintf(el->el_errfile,
- "Executing %ls\n", b->name);
- else
- (void) fprintf(el->el_errfile,
- "Error command = %d\n", cmdnum);
- }
-#endif /* DEBUG_READ */
/* vi redo needs these way down the levels... */
el->el_state.thiscmd = cmdnum;
el->el_state.thisch = ch;
@@ -621,10 +566,6 @@ el_wgets(EditLine *el, int *nread)
*el->el_chared.c_redo.pos++ = ch;
}
retval = (*el->el_map.func[cmdnum]) (el, ch);
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile,
- "Returned state %d\n", retval );
-#endif /* DEBUG_READ */
/* save the last command here */
el->el_state.lastcmd = cmdnum;
@@ -671,10 +612,6 @@ el_wgets(EditLine *el, int *nread)
break;
case CC_FATAL: /* fatal error, reset to known state */
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile,
- "*** editor fatal ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
/* put (real) cursor in a known place */
re_clear_display(el); /* reset the display stuff */
ch_reset(el); /* reset the input pointers */
@@ -684,10 +621,6 @@ el_wgets(EditLine *el, int *nread)
case CC_ERROR:
default: /* functions we don't know about */
-#ifdef DEBUG_READ
- (void) fprintf(el->el_errfile,
- "*** editor ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
terminal_beep(el);
terminal__flush(el);
break;
