summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>1999-03-15 19:00:18 +0000
committermillert <millert@openbsd.org>1999-03-15 19:00:18 +0000
commit8bc501bbb9d06e7cb259da84fc097286ce4e35a9 (patch)
tree2c8788fec6d9ba12030fc4e223be70fd997570a1
parentPalm organizer file magic numbers (ksulliva@sludge.psc.edu, NetBSD) (diff)
downloadwireguard-openbsd-8bc501bbb9d06e7cb259da84fc097286ce4e35a9.tar.xz
wireguard-openbsd-8bc501bbb9d06e7cb259da84fc097286ce4e35a9.zip
ncurses-4.2-990314
-rw-r--r--usr.bin/tic/dump_entry.c8
-rw-r--r--usr.bin/tset/tset.c13
2 files changed, 7 insertions, 14 deletions
diff --git a/usr.bin/tic/dump_entry.c b/usr.bin/tic/dump_entry.c
index 7d3e1090d6a..aa10c56f361 100644
--- a/usr.bin/tic/dump_entry.c
+++ b/usr.bin/tic/dump_entry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump_entry.c,v 1.5 1999/03/11 21:08:08 millert Exp $ */
+/* $OpenBSD: dump_entry.c,v 1.6 1999/03/15 19:00:18 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999 Free Software Foundation, Inc. *
@@ -40,7 +40,7 @@
#include <termsort.c> /* this C file is generated */
#include <parametrized.h> /* so is this */
-MODULE_ID("$From: dump_entry.c,v 1.36 1999/03/06 23:37:55 tom Exp $")
+MODULE_ID("$From: dump_entry.c,v 1.37 1999/03/14 12:29:30 tom Exp $")
#define INDENT 8
@@ -470,7 +470,7 @@ int fmt_entry(TERMTYPE *tterm,
{
int i, j;
char buffer[MAX_TERMINFO_LENGTH];
-char * name;
+NCURSES_CONST char *name;
int predval, len;
int num_bools = 0;
int num_values = 0;
@@ -809,7 +809,7 @@ void compare_entry(void (*hook)(int t, int i, const char *name), TERMTYPE *tp GC
/* compare two entries */
{
int i, j;
- char * name;
+ NCURSES_CONST char * name;
(void) fputs(" comparing booleans.\n", stdout);
for_each_boolean(j,tp)
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 7c889c23c83..4647ca6ab06 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -103,7 +103,7 @@ char *ttyname(int fd);
#include <curses.h> /* for bool typedef */
#include <dump_entry.h>
-MODULE_ID("$From: tset.c,v 0.36 1999/02/23 11:05:30 tom Exp $")
+MODULE_ID("$From: tset.c,v 0.37 1999/03/14 12:30:02 tom Exp $")
extern char **environ;
@@ -135,15 +135,8 @@ CaselessCmp(const char *a, const char *b) /* strcasecmp isn't portable */
}
#if !HAVE_STRDUP
-static char *strdup (char *s)
-{
- char *p;
-
- p = malloc(strlen(s)+1);
- if (p)
- strcpy(p,s);
- return(p);
-}
+#define strdup _nc_strdup
+extern char *_nc_strdup(const char *);
#endif /* not HAVE_STRDUP */
static void