Update to ncurses-5.0-20000108:

+ add prototype for erase() to curses.h
+ add TRACE_DATABASE flag for trace().
+ formatting changes (style)

2 files changed, 25 insertions, 26 deletions

diff --git a/lib/libcurses/base/lib_mouse.c b/lib/libcurses/base/lib_mouse.c
index e3ef84222d5..29cec56f17e 100644
--- a/lib/libcurses/base/lib_mouse.c
+++ b/lib/libcurses/base/lib_mouse.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: lib_mouse.c,v 1.6 1999/12/28 15:57:59 millert Exp $	*/
+/*	$OpenBSD: lib_mouse.c,v 1.7 2000/01/09 05:06:02 millert Exp $	*/
 
 /****************************************************************************
- * Copyright (c) 1998,1999 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2000 Free Software Foundation, Inc.                   *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -66,8 +66,7 @@
  */
 
 #ifdef __EMX__
-#  include "io.h"
-#  include "fcntl.h"
+#  include <io.h>
 #  define  INCL_DOS
 #  define  INCL_VIO
 #  define  INCL_KBD
@@ -87,7 +86,7 @@
 #endif
 #endif
 
-MODULE_ID("$From: lib_mouse.c,v 1.47 1999/12/19 01:49:40 tom Exp $")
+MODULE_ID("$From: lib_mouse.c,v 1.48 2000/01/08 17:34:43 tom Exp $");
 
 #define MY_TRACE TRACE_ICALLS|TRACE_IEVENT
 
@@ -422,7 +421,7 @@ _nc_mouse_inline(SCREEN * sp)
 	kbuf[3] = '\0';
 
 	TR(TRACE_IEVENT,
-		("_nc_mouse_inline sees the following xterm data: '%s'", kbuf));
+	    ("_nc_mouse_inline sees the following xterm data: '%s'", kbuf));
 
 	eventp->id = 0;		/* there's only one mouse... */
 
@@ -491,7 +490,7 @@ _nc_mouse_inline(SCREEN * sp)
 	eventp->x = (kbuf[1] - ' ') - 1;
 	eventp->y = (kbuf[2] - ' ') - 1;
 	TR(MY_TRACE,
-		("_nc_mouse_inline: primitive mouse-event %s has slot %ld",
+	    ("_nc_mouse_inline: primitive mouse-event %s has slot %ld",
 		_tracemouse(eventp),
 		(long) (eventp - events)));
 
@@ -601,7 +600,7 @@ _nc_mouse_parse(int runcount)
      */
     if (runcount == 1) {
 	TR(MY_TRACE,
-		("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
+	    ("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
 		_tracemouse(prev),
 		(long) (prev - events)));
 	return (prev->id >= 0)
@@ -789,7 +788,7 @@ _nc_mouse_parse(int runcount)
     for (ep = runp; ep != eventp; ep = NEXT(ep))
 	if (ep->id != INVALID_EVENT)
 	    TR(MY_TRACE,
-		    ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
+		("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
 		    _tracemouse(ep),
 		    (long) (ep - events)));
 #endif /* TRACE */
diff --git a/lib/libcurses/base/lib_nl.c b/lib/libcurses/base/lib_nl.c
index 9895d1d6f8a..5e69c25e300 100644
--- a/lib/libcurses/base/lib_nl.c
+++ b/lib/libcurses/base/lib_nl.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: lib_nl.c,v 1.2 1999/11/28 17:49:53 millert Exp $	*/
+/*	$OpenBSD: lib_nl.c,v 1.3 2000/01/09 05:06:02 millert Exp $	*/
 
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2000 Free Software Foundation, Inc.                   *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -33,7 +33,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
 /*
  *	nl.c
  *
@@ -45,37 +44,38 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$From: lib_nl.c,v 1.4 1999/10/22 22:31:51 tom Exp $")
+MODULE_ID("$From: lib_nl.c,v 1.5 2000/01/08 17:33:30 tom Exp $")
 
 #ifdef __EMX__
 #include <io.h>
-#include <fcntl.h>
 #endif
 
-int nl(void)
+int
+nl(void)
 {
-	T((T_CALLED("nl()")));
+    T((T_CALLED("nl()")));
 
-	SP->_nl = TRUE;
+    SP->_nl = TRUE;
 
 #ifdef __EMX__
-	_nc_flush();
-	_fsetmode(NC_OUTPUT, "t");
+    _nc_flush();
+    _fsetmode(NC_OUTPUT, "t");
 #endif
 
-	returnCode(OK);
+    returnCode(OK);
 }
 
-int nonl(void)
+int
+nonl(void)
 {
-	T((T_CALLED("nonl()")));
+    T((T_CALLED("nonl()")));
 
-	SP->_nl = FALSE;
+    SP->_nl = FALSE;
 
 #ifdef __EMX__
-	_nc_flush();
-	_fsetmode(NC_OUTPUT, "b");
+    _nc_flush();
+    _fsetmode(NC_OUTPUT, "b");
 #endif
 
-	returnCode(OK);
+    returnCode(OK);
 }