Change third arg of tputs() from `void (*)(int)' to `int (*)(int)'.
This is in line with the Single UNIX Spec, Solaris, Linux, FreeBSD, ...
This commit is contained in:
parent
eb1c1bdb92
commit
26df59590e
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: termcap.3,v 1.15 1999/08/17 12:13:24 blymn Exp $
|
||||
.\" $NetBSD: termcap.3,v 1.16 1999/10/04 23:16:50 lukem Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1980, 1991, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
.\"
|
||||
.\" @(#)termcap.3 8.2 (Berkeley) 12/11/93
|
||||
.\"
|
||||
.Dd December 11, 1993
|
||||
.Dd September 30, 1999
|
||||
.Dt TERMCAP 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -64,7 +64,7 @@
|
|||
.Ft char *
|
||||
.Fn tgoto "char *cm" "int destcol" "int destline"
|
||||
.Ft void
|
||||
.Fn tputs "char *cp" "int affcnt" "void (*outc)(int)"
|
||||
.Fn tputs "char *cp" "int affcnt" "int (*outc)(int)"
|
||||
.Ft int
|
||||
.Fn t_getent "struct tinfo **info" "char *name"
|
||||
.Ft int
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: termcap.h,v 1.7 1999/08/16 08:34:33 blymn Exp $ */
|
||||
/* $NetBSD: termcap.h,v 1.8 1999/10/04 23:16:52 lukem Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1992, 1993
|
||||
|
@ -51,7 +51,7 @@ char *tgetstr __P((const char *, char **));
|
|||
int tgetflag __P((const char *));
|
||||
int tgetnum __P((const char *));
|
||||
char *tgoto __P((const char *, int, int));
|
||||
void tputs __P((const char *, int, void (*)(int)));
|
||||
void tputs __P((const char *, int, int (*)(int)));
|
||||
|
||||
/*
|
||||
* New interface
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tputs.c,v 1.13 1999/09/20 04:48:06 lukem Exp $ */
|
||||
/* $NetBSD: tputs.c,v 1.14 1999/10/04 23:16:52 lukem Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1993
|
||||
|
@ -38,7 +38,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)tputs.c 8.1 (Berkeley) 6/4/93";
|
||||
#else
|
||||
__RCSID("$NetBSD: tputs.c,v 1.13 1999/09/20 04:48:06 lukem Exp $");
|
||||
__RCSID("$NetBSD: tputs.c,v 1.14 1999/10/04 23:16:52 lukem Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
@ -110,7 +110,7 @@ void
|
|||
tputs(cp, affcnt, outc)
|
||||
const char *cp;
|
||||
int affcnt;
|
||||
void (*outc) __P((int));
|
||||
int (*outc) __P((int));
|
||||
{
|
||||
int i = 0;
|
||||
int mspc10;
|
||||
|
@ -127,7 +127,7 @@ tputs(cp, affcnt, outc)
|
|||
* The guts of the string.
|
||||
*/
|
||||
while (*cp)
|
||||
(*outc)(*cp++);
|
||||
(void)(*outc)(*cp++);
|
||||
|
||||
/*
|
||||
* If no delay needed, or output speed is
|
||||
|
@ -148,7 +148,7 @@ tputs(cp, affcnt, outc)
|
|||
mspc10 = tmspc10[ospeed];
|
||||
i += mspc10 / 2;
|
||||
for (i /= mspc10; i > 0; i--)
|
||||
(*outc)(PC);
|
||||
(void)(*outc)(PC);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue