diff options
author | ache <ache@FreeBSD.org> | 1994-12-10 22:56:53 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1994-12-10 22:56:53 +0000 |
commit | d571d9fa43df302ad1c18b0506b30e2d302e1428 (patch) | |
tree | fadc9b7183a528492cae17cf4ad3904d2061cf93 | |
parent | a950c0c1b837fcfabe4a5a8102ddafeab8275a66 (diff) | |
download | FreeBSD-src-d571d9fa43df302ad1c18b0506b30e2d302e1428.zip FreeBSD-src-d571d9fa43df302ad1c18b0506b30e2d302e1428.tar.gz |
Prototypes...
-rw-r--r-- | lib/libmytinfo/term.h | 2 | ||||
-rw-r--r-- | lib/libmytinfo/term.tail | 2 | ||||
-rw-r--r-- | lib/libmytinfo/tparm.c | 5 | ||||
-rw-r--r-- | lib/libmytinfo/tputs.c | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/lib/libmytinfo/term.h b/lib/libmytinfo/term.h index 9911a98..e91aefa 100644 --- a/lib/libmytinfo/term.h +++ b/lib/libmytinfo/term.h @@ -638,7 +638,7 @@ extern TERMINAL _term_buf; extern char *tparm __P((const char *, ...)); extern int setupterm __P((char *, int, int *)), set_curterm __P((TERMINAL *)); -extern int del_curterm __P((TERMINAL *)), tputs __P((const char *, int, int (*)(char))); +extern int del_curterm __P((TERMINAL *)), tputs __P((const char *, int, int (*)(int))); extern int putp __P((char *)); extern int tigetflag __P((char *)), tigetnum __P((char *)); extern char *tigetstr __P((char *)); diff --git a/lib/libmytinfo/term.tail b/lib/libmytinfo/term.tail index 6ef3af6..dd5b6ad 100644 --- a/lib/libmytinfo/term.tail +++ b/lib/libmytinfo/term.tail @@ -111,7 +111,7 @@ extern TERMINAL _term_buf; extern char *tparm __P((const char *, ...)); extern int setupterm __P((char *, int, int *)), set_curterm __P((TERMINAL *)); -extern int del_curterm __P((TERMINAL *)), tputs __P((const char *, int, int (*)(char))); +extern int del_curterm __P((TERMINAL *)), tputs __P((const char *, int, int (*)(int))); extern int putp __P((char *)); extern int tigetflag __P((char *)), tigetnum __P((char *)); extern char *tigetstr __P((char *)); diff --git a/lib/libmytinfo/tparm.c b/lib/libmytinfo/tparm.c index 573f788..cdc4297 100644 --- a/lib/libmytinfo/tparm.c +++ b/lib/libmytinfo/tparm.c @@ -240,7 +240,7 @@ char *str; { #else /* lint */ #ifdef USE_STDARG #ifdef USE_PROTOTYPES -char *tparm(char *str, ...) { +char *tparm(const char *str, ...) { #else /* USE_PROTOTYPES */ char *tparm(str) char *str; { @@ -253,8 +253,9 @@ va_dcl { #endif static char OOPS[] = "OOPS"; static char buf[MAX_LINE]; - register char *sp, *dp; + register char *dp; register char *fmt; + const char *sp; char conv_char; char scan_for; int scan_depth = 0, if_depth; diff --git a/lib/libmytinfo/tputs.c b/lib/libmytinfo/tputs.c index d6fd3fa..efdda8a 100644 --- a/lib/libmytinfo/tputs.c +++ b/lib/libmytinfo/tputs.c @@ -36,17 +36,17 @@ static const char SCCSid[] = "@(#) mytinfo tputs.c 3.3 92/06/04 public domain, B #endif #ifdef USE_PROTOTYPES -#define PUTCHAR(c) (outc == (int (*)(char)) 0 ? (putchar(c)):(*outc)(c)) +#define PUTCHAR(c) (outc == (int (*)(int)) NULL ? (putchar(c)):(*outc)(c)) #else -#define PUTCHAR(c) (outc == (int (*)()) 0 ? (putchar(c)):(*outc)(c)) +#define PUTCHAR(c) (outc == (int (*)()) NULL ? (putchar(c)):(*outc)(c)) #endif int tputs(sp, count, outc) -register char *sp; +register const char *sp; int count; #ifdef USE_PROTOTYPES -register int (*outc)(char); +register int (*outc)(int); #else register int (*outc)(); #endif @@ -207,9 +207,9 @@ int putp(str) char *str; { #ifdef USE_PROTOTYPES - return(tputs(str, 1,(int (*)(char)) 0)); + return(tputs(str, 1,(int (*)(int)) NULL)); #else - return(tputs(str, 1,(int (*)()) 0)); + return(tputs(str, 1,(int (*)()) NULL)); #endif } |