Import ncurses-5.2-20010512 onto the vendor branch

Obtained from: ftp://dickey.his.com/ncurses/

1 files changed, 29 insertions, 29 deletions

diff --git a/contrib/ncurses/ncurses/tinfo/setbuf.c b/contrib/ncurses/ncurses/tinfo/setbuf.c
index c0e735656907..6d0201bfb2aa 100644
--- a/contrib/ncurses/ncurses/tinfo/setbuf.c
+++ b/contrib/ncurses/ncurses/tinfo/setbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * 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            *
@@ -31,8 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **	setbuf.c
 **
@@ -42,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: setbuf.c,v 1.5 1999/02/27 20:00:15 tom Exp $")
+MODULE_ID("$Id: setbuf.c,v 1.7 2000/12/10 02:55:08 tom Exp $")
 
 /*
  * If the output file descriptor is connected to a tty (the typical case) it
@@ -99,45 +97,47 @@ MODULE_ID("$Id: setbuf.c,v 1.5 1999/02/27 20:00:15 tom Exp $")
  * do indeed get confused by changing setbuf on/off, and will overrun the
  * buffer.  So we disable this by default (there may yet be a workaround).
  */
-void _nc_set_buffer(FILE *ofp, bool buffered)
+NCURSES_EXPORT(void)
+_nc_set_buffer(FILE * ofp, bool buffered)
 {
-	/* optional optimization hack -- do before any output to ofp */
+    /* optional optimization hack -- do before any output to ofp */
 #if HAVE_SETVBUF || HAVE_SETBUFFER
-	unsigned buf_len;
-	char *buf_ptr;
+    unsigned buf_len;
+    char *buf_ptr;
 
-	if (getenv("NCURSES_NO_SETBUF") != 0)
-		return;
+    if (getenv("NCURSES_NO_SETBUF") != 0)
+	return;
 
-	fflush(ofp);
-	if ((SP->_buffered = buffered) != 0) {
-		buf_len = min(LINES * (COLS + 6), 2800);
-	 	if ((buf_ptr = SP->_setbuf) == 0) {
-			if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
-				return;
-			SP->_setbuf = buf_ptr;
-			/* Don't try to free this! */
-		}
+    fflush(ofp);
+    if ((SP->_buffered = buffered) != 0) {
+	buf_len = min(LINES * (COLS + 6), 2800);
+	if ((buf_ptr = SP->_setbuf) == 0) {
+	    if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
+		  return;
+	    SP->_setbuf = buf_ptr;
+	    /* Don't try to free this! */
+	}
 #if !USE_SETBUF_0
-		else return;
+	else
+	    return;
 #endif
-	} else {
+    } else {
 #if !USE_SETBUF_0
-		return;
+	return;
 #else
-		buf_len = 0;
-		buf_ptr = 0;
+	buf_len = 0;
+	buf_ptr = 0;
 #endif
-	}
+    }
 
 #if HAVE_SETVBUF
-#ifdef SETVBUF_REVERSED	/* pre-svr3? */
-	(void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF);
+#ifdef SETVBUF_REVERSED		/* pre-svr3? */
+    (void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF);
 #else
-	(void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len);
+    (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len);
 #endif
 #elif HAVE_SETBUFFER
-	(void) setbuffer(ofp, buf_ptr, (int)buf_len);
+    (void) setbuffer(ofp, buf_ptr, (int) buf_len);
 #endif
 
 #endif /* HAVE_SETVBUF || HAVE_SETBUFFER */