ncurses-4.2-980718

1 files changed, 39 insertions, 28 deletions

diff --git a/lib/libcurses/lib_printw.c b/lib/libcurses/lib_printw.c
index 7ca50e2e26b..d4f83defb4d 100644
--- a/lib/libcurses/lib_printw.c
+++ b/lib/libcurses/lib_printw.c
@@ -1,25 +1,36 @@
-/*	$OpenBSD: lib_printw.c,v 1.5 1997/12/03 05:21:27 millert Exp $	*/
-
-/******************************************************************************
- * Copyright 1997 by Thomas E. Dickey <dickey@clark.net>                      *
- * All Rights Reserved.                                                       *
- *                                                                            *
- * Permission to use, copy, modify, and distribute this software and its      *
- * documentation for any purpose and without fee is hereby granted, provided  *
- * that the above copyright notice appear in all copies and that both that    *
- * copyright notice and this permission notice appear in supporting           *
- * documentation, and that the name of the above listed copyright holder(s)   *
- * not be used in advertising or publicity pertaining to distribution of the  *
- * software without specific, written prior permission.                       *
- *                                                                            *
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD   *
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND  *
- * FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE  *
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES          *
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN      *
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR *
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                *
- ******************************************************************************/
+/*	$OpenBSD: lib_printw.c,v 1.6 1998/07/23 21:19:13 millert Exp $	*/
+
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ ****************************************************************************/
 
 /*
 **	lib_printw.c
@@ -30,9 +41,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("Id: lib_printw.c,v 1.5 1997/08/31 21:22:33 tom Exp $")
+MODULE_ID("$From: lib_printw.c,v 1.7 1998/04/11 22:53:44 tom Exp $")
 
-int printw(const char *fmt, ...)
+int printw(NCURSES_CONST char *fmt, ...)
 {
 	va_list argp;
 	int code;
@@ -46,7 +57,7 @@ int printw(const char *fmt, ...)
 	return code;
 }
 
-int wprintw(WINDOW *win, const char *fmt, ...)
+int wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
 {
 	va_list argp;
 	int code;
@@ -60,7 +71,7 @@ int wprintw(WINDOW *win, const char *fmt, ...)
 	return code;
 }
 
-int mvprintw(int y, int x, const char *fmt, ...)
+int mvprintw(int y, int x, NCURSES_CONST char *fmt, ...)
 {
 	va_list argp;
 	int code = move(y, x);
@@ -73,7 +84,7 @@ int mvprintw(int y, int x, const char *fmt, ...)
 	return code;
 }
 
-int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...)
+int mvwprintw(WINDOW *win, int y, int x, NCURSES_CONST char *fmt, ...)
 {
 	va_list argp;
 	int code = wmove(win, y, x);
@@ -86,7 +97,7 @@ int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...)
 	return code;
 }
 
-int vwprintw(WINDOW *win, const char *fmt, va_list argp)
+int vwprintw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp)
 {
 	char *buf = _nc_printf_string(fmt, argp);
 	int code = ERR;