Missed changes in ncurses-5.2-20010114 commit

1 files changed, 66 insertions, 60 deletions

diff --git a/lib/libcurses/tinfo/comp_error.c b/lib/libcurses/tinfo/comp_error.c
index cfa5dfd59be..13d427c9379 100644
--- a/lib/libcurses/tinfo/comp_error.c
+++ b/lib/libcurses/tinfo/comp_error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comp_error.c,v 1.3 2001/01/22 18:01:50 millert Exp $	*/
+/*	$OpenBSD: comp_error.c,v 1.4 2001/01/22 18:05:43 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
@@ -42,92 +42,98 @@
 
 #include <tic.h>
 
-MODULE_ID("$From: comp_error.c,v 1.17 1999/10/30 23:00:16 tom Exp $")
+MODULE_ID("$From: comp_error.c,v 1.21 2000/12/10 02:55:07 tom Exp $")
 
-bool	_nc_suppress_warnings = FALSE;
-int	_nc_curr_line = 0;	/* current line # in input */
-int	_nc_curr_col = 0;	/* current column # in input */
+NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
+NCURSES_EXPORT_VAR(int)
+_nc_curr_line = 0;		/* current line # in input */
+NCURSES_EXPORT_VAR(int)
+_nc_curr_col = 0;		/* current column # in input */
 
-static const char *sourcename;
-static char termtype[MAX_NAME_SIZE+1];
+     static const char *sourcename;
+     static char termtype[MAX_NAME_SIZE + 1];
 
-void _nc_set_source(const char *const name)
+NCURSES_EXPORT(void)
+_nc_set_source(const char *const name)
 {
-	sourcename = name;
+    sourcename = name;
 }
 
-void _nc_set_type(const char *const name)
+NCURSES_EXPORT(void)
+_nc_set_type(const char *const name)
 {
-	if (name)
-		strlcpy( termtype, name, sizeof(termtype) );
-	else
-		termtype[0] = '\0';
+    termtype[0] = '\0';
+    if (name)
+	strncat(termtype, name, sizeof(termtype) - 1);
 }
 
-void _nc_get_type(char *name)
+NCURSES_EXPORT(void)
+_nc_get_type(char *name)
 {
-	strcpy( name, termtype );
+    strcpy(name, termtype);
 }
 
-static inline void where_is_problem(void)
+static inline void
+where_is_problem(void)
 {
-	fprintf (stderr, "\"%s\"", sourcename);
-	if (_nc_curr_line >= 0)
-		fprintf (stderr, ", line %d", _nc_curr_line);
-	if (_nc_curr_col >= 0)
-		fprintf (stderr, ", col %d", _nc_curr_col);
-	if (termtype[0])
-		fprintf (stderr, ", terminal '%s'", termtype);
-	fputc(':', stderr);
-	fputc(' ', stderr);
+    fprintf(stderr, "\"%s\"", sourcename);
+    if (_nc_curr_line >= 0)
+	fprintf(stderr, ", line %d", _nc_curr_line);
+    if (_nc_curr_col >= 0)
+	fprintf(stderr, ", col %d", _nc_curr_col);
+    if (termtype[0])
+	fprintf(stderr, ", terminal '%s'", termtype);
+    fputc(':', stderr);
+    fputc(' ', stderr);
 }
 
-void _nc_warning(const char *const fmt, ...)
+NCURSES_EXPORT(void)
+_nc_warning(const char *const fmt,...)
 {
-va_list argp;
+    va_list argp;
 
-	if (_nc_suppress_warnings)
-	    return;
+    if (_nc_suppress_warnings)
+	return;
 
-	where_is_problem();
-	va_start(argp,fmt);
-	vfprintf (stderr, fmt, argp);
-	fprintf (stderr, "\n");
-	va_end(argp);
+    where_is_problem();
+    va_start(argp, fmt);
+    vfprintf(stderr, fmt, argp);
+    fprintf(stderr, "\n");
+    va_end(argp);
 }
 
-
-void _nc_err_abort(const char *const fmt, ...)
+NCURSES_EXPORT(void)
+_nc_err_abort(const char *const fmt,...)
 {
-va_list argp;
-
-	where_is_problem();
-	va_start(argp,fmt);
-	vfprintf (stderr, fmt, argp);
-	fprintf (stderr, "\n");
-	va_end(argp);
-	exit(EXIT_FAILURE);
+    va_list argp;
+
+    where_is_problem();
+    va_start(argp, fmt);
+    vfprintf(stderr, fmt, argp);
+    fprintf(stderr, "\n");
+    va_end(argp);
+    exit(EXIT_FAILURE);
 }
 
-
-void _nc_syserr_abort(const char *const fmt, ...)
+NCURSES_EXPORT(void)
+_nc_syserr_abort(const char *const fmt,...)
 {
-va_list argp;
+    va_list argp;
 
-	where_is_problem();
-	va_start(argp,fmt);
-	vfprintf (stderr, fmt, argp);
-	fprintf (stderr, "\n");
-	va_end(argp);
+    where_is_problem();
+    va_start(argp, fmt);
+    vfprintf(stderr, fmt, argp);
+    fprintf(stderr, "\n");
+    va_end(argp);
 
-	/* If we're debugging, try to show where the problem occurred - this
-	 * will dump core.
-	 */
+    /* If we're debugging, try to show where the problem occurred - this
+     * will dump core.
+     */
 #if defined(TRACE) || !defined(NDEBUG)
-	abort();
+    abort();
 #else
-	/* Dumping core in production code is not a good idea.
-	 */
-	exit(EXIT_FAILURE);
+    /* Dumping core in production code is not a good idea.
+     */
+    exit(EXIT_FAILURE);
 #endif
 }