update after change to return value of tputs() third argument

This commit is contained in:
lukem 1999-10-04 23:26:59 +00:00
parent 332ab876a2
commit 88d3d7c59e
22 changed files with 71 additions and 66 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: back.h,v 1.11 1999/07/26 20:56:03 hubertf Exp $ */
/* $NetBSD: back.h,v 1.12 1999/10/04 23:26:59 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@ -133,7 +133,7 @@ extern int curc; /* column position of cursor */
extern int begscr; /* 'beginning' of screen
(not including board) */
void addbuf __P((int));
int addbuf __P((int));
void backone __P((int));
void bsect __P((int, int, int, int));
void buflush __P((void));

View File

@ -1,4 +1,4 @@
/* $NetBSD: subs.c,v 1.12 1999/09/08 21:45:25 jsm Exp $ */
/* $NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: subs.c,v 1.12 1999/09/08 21:45:25 jsm Exp $");
__RCSID("$NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $");
#endif
#endif /* not lint */
@ -73,7 +73,7 @@ errexit(s)
getout(0);
}
void
int
addbuf(c)
int c;
{
@ -84,6 +84,7 @@ addbuf(c)
buffnum = 0;
}
outbuff[buffnum] = c;
return (0);
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.1 1997/10/19 16:57:28 christos Exp $ */
/* $NetBSD: extern.h,v 1.2 1999/10/04 23:27:01 lukem Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -507,7 +507,7 @@ void end_screen __P((void));
void curs __P((int, int));
void nocmov __P((int, int));
void cmov __P((int, int));
void xputc __P((int));
int xputc __P((int));
void xputs __P((char *));
void cl_end __P((void));
void clear_screen __P((void));

View File

@ -1,4 +1,4 @@
/* $NetBSD: hack.termcap.c,v 1.8 1999/08/14 16:36:42 tron Exp $ */
/* $NetBSD: hack.termcap.c,v 1.9 1999/10/04 23:27:01 lukem Exp $ */
/*
* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: hack.termcap.c,v 1.8 1999/08/14 16:36:42 tron Exp $");
__RCSID("$NetBSD: hack.termcap.c,v 1.9 1999/10/04 23:27:01 lukem Exp $");
#endif /* not lint */
#include <string.h>
@ -185,11 +185,11 @@ cmov(x, y)
curx = x;
}
void
int
xputc(c)
char c;
{
(void) fputc(c, stdout);
return (fputc(c, stdout));
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.1 1997/10/18 20:03:17 christos Exp $ */
/* $NetBSD: extern.h,v 1.2 1999/10/04 23:27:02 lukem Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -154,7 +154,7 @@ void cl_dn __P((int, int));
void standout __P((char *));
void set_score_output __P((void));
void lflush __P((void));
void xputchar __P((int));
int xputchar __P((int));
void flush_buf __P((void));
char *tmcapcnv __P((char *, char *));
void beep __P((void));

View File

@ -1,4 +1,4 @@
/* $NetBSD: io.c,v 1.7 1997/10/18 20:03:26 christos Exp $ */
/* $NetBSD: io.c,v 1.8 1999/10/04 23:27:02 lukem Exp $ */
/*
* io.c Larn is copyrighted 1986 by Noah Morgan.
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: io.c,v 1.7 1997/10/18 20:03:26 christos Exp $");
__RCSID("$NetBSD: io.c,v 1.8 1999/10/04 23:27:02 lukem Exp $");
#endif /* not lint */
#include "header.h"
@ -1047,13 +1047,14 @@ static int vindex = 0;
/*
* xputchar(ch) Print one character in decoded output buffer.
*/
void
int
xputchar(c)
int c;
{
outbuf[vindex++] = c;
if (vindex >= BUFBIG)
flush_buf();
return (0);
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.11 1999/09/12 09:02:22 jsm Exp $ */
/* $NetBSD: main.c,v 1.12 1999/10/04 23:27:02 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: main.c,v 1.11 1999/09/12 09:02:22 jsm Exp $");
__RCSID("$NetBSD: main.c,v 1.12 1999/10/04 23:27:02 lukem Exp $");
#endif
#endif /* not lint */
@ -193,11 +193,11 @@ main(ac, av)
return(0);
}
void
int
__cputchar(ch)
int ch;
{
(void)putchar(ch);
return (putchar(ch));
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.c,v 1.12 1999/09/08 21:45:31 jsm Exp $ */
/* $NetBSD: screen.c,v 1.13 1999/10/04 23:27:03 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -127,12 +127,12 @@ static char combuf[1024], tbuf[1024];
/*
* Routine used by tputs().
*/
void
int
put(c)
int c;
{
(void) putchar(c);
return (putchar(c));
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.h,v 1.3 1997/10/14 01:14:34 lukem Exp $ */
/* $NetBSD: screen.h,v 1.4 1999/10/04 23:27:03 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -49,7 +49,7 @@ char *SOstr; /* begin standout mode */
*/
#define putpad(s) tputs(s, 1, put)
void put __P((int)); /* just calls putchar; for tputs */
int put __P((int)); /* just calls putchar; for tputs */
void scr_clear __P((void));
void scr_end __P((void));
void scr_init __P((void));

View File

@ -1,4 +1,4 @@
/* $NetBSD: funcs.h,v 1.3 1999/04/06 05:57:35 mrg Exp $ */
/* $NetBSD: funcs.h,v 1.4 1999/10/04 23:34:05 lukem Exp $ */
/* brac.c */
@ -219,7 +219,7 @@ public int isatty __P((int));
/* output.c */
public void put_line __P((void));
public void flush __P((void));
public void putchr __P((int));
public int putchr __P((int));
public void putstr __P((char *));
public void get_return __P((void));
public void error __P((char *, PARG *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: output.c,v 1.3 1999/04/06 05:57:36 mrg Exp $ */
/* $NetBSD: output.c,v 1.4 1999/10/04 23:34:05 lukem Exp $ */
/*
* Copyright (c) 1984,1985,1989,1994,1995,1996,1999 Mark Nudelman
@ -239,7 +239,7 @@ flush()
/*
* Output a character.
*/
public void
public int
putchr(c)
int c;
{
@ -267,6 +267,7 @@ putchr(c)
if (ob >= &obuf[sizeof(obuf)-1])
flush();
*ob++ = c;
return (0);
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.c,v 1.8 1999/04/06 05:57:36 mrg Exp $ */
/* $NetBSD: screen.c,v 1.9 1999/10/04 23:34:06 lukem Exp $ */
/*
* Copyright (c) 1984,1985,1989,1994,1995,1996,1999 Mark Nudelman
@ -224,7 +224,7 @@ static void get_clock __P((void));
static void dummy_func __P((void));
static void delay __P((int));
#endif
static void inc_costcount __P((int));
static int inc_costcount __P((int));
static int cost __P((char *));
static char *cheaper __P((char *, char *, char *));
static void tmodes __P((char *, char *, char **, char **, char *, char *, char **));
@ -1330,12 +1330,12 @@ get_term()
static int costcount;
/*ARGSUSED*/
static void
static int
inc_costcount(c)
int c;
{
costcount++;
return;
return (0);
}
static int

View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.c,v 1.3 1999/04/12 06:02:26 ross Exp $ */
/* $NetBSD: screen.c,v 1.4 1999/10/04 23:33:45 lukem Exp $ */
/*
* Top users/processes display for Unix
@ -490,12 +490,12 @@ go_home()
/* This has to be defined as a subroutine for tputs (instead of a macro) */
void
int
putstdout(ch)
int ch;
{
putchar(ch);
return (putchar(ch));
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.h,v 1.3 1999/04/12 06:02:26 ross Exp $ */
/* $NetBSD: screen.h,v 1.4 1999/10/04 23:33:45 lukem Exp $ */
/*
* top - a top users display for Unix 4.2
@ -42,4 +42,4 @@ void standout __P((char *));
void clear __P((void));
int clear_eol __P((int));
void go_home __P((void));
void putstdout __P((int));
int putstdout __P((int));

View File

@ -1,4 +1,4 @@
/* $NetBSD: tput.c,v 1.10 1997/10/20 00:50:53 lukem Exp $ */
/* $NetBSD: tput.c,v 1.11 1999/10/04 23:33:43 lukem Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
#endif
__RCSID("$NetBSD: tput.c,v 1.10 1997/10/20 00:50:53 lukem Exp $");
__RCSID("$NetBSD: tput.c,v 1.11 1999/10/04 23:33:43 lukem Exp $");
#endif /* not lint */
#include <termios.h>
@ -55,7 +55,7 @@ __RCSID("$NetBSD: tput.c,v 1.10 1997/10/20 00:50:53 lukem Exp $");
#include <unistd.h>
int main __P((int, char **));
static void outc __P((int));
static int outc __P((int));
static void prlongname __P((char *));
static void setospeed __P((void));
static void usage __P((void));
@ -224,11 +224,11 @@ setospeed()
ospeed = cfgetospeed(&t);
}
static void
static int
outc(c)
int c;
{
(void)putchar(c);
return (putchar(c));
}
static void

View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.6 1998/07/26 23:09:50 mycroft Exp $ */
/* $NetBSD: extern.h,v 1.7 1999/10/04 23:33:24 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -47,7 +47,7 @@ void add_mapping __P((const char *, char *));
void cat __P((char *));
const char *get_termcap_entry __P((const char *, char **));
const char *mapped __P((const char *));
void outc __P((int));
int outc __P((int));
void reset_mode __P((void));
void set_control_chars __P((void));
void set_conversions __P((int));

View File

@ -1,4 +1,4 @@
/* $NetBSD: misc.c,v 1.5 1997/10/20 01:07:52 lukem Exp $ */
/* $NetBSD: misc.c,v 1.6 1999/10/04 23:33:25 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93";
#endif
__RCSID("$NetBSD: misc.c,v 1.5 1997/10/20 01:07:52 lukem Exp $");
__RCSID("$NetBSD: misc.c,v 1.6 1999/10/04 23:33:25 lukem Exp $");
#endif /* not lint */
#include <err.h>
@ -68,9 +68,9 @@ cat(file)
(void)close(fd);
}
void
int
outc(c)
int c;
{
(void)putc(c, stderr);
return (putc(c, stderr));
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: ul.c,v 1.7 1998/12/19 23:21:24 christos Exp $ */
/* $NetBSD: ul.c,v 1.8 1999/10/04 23:32:54 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: ul.c,v 1.7 1998/12/19 23:21:24 christos Exp $");
__RCSID("$NetBSD: ul.c,v 1.8 1999/10/04 23:32:54 lukem Exp $");
#endif /* not lint */
#include <stdio.h>
@ -92,7 +92,7 @@ void iattr __P((void));
void initbuf __P((void));
void initcap __P((void));
void outc __P((int));
void outchar __P((int));
int outchar __P((int));
void overstrike __P((void));
void reverse __P((void));
void setulmode __P((int));
@ -470,11 +470,11 @@ initcap()
must_use_uc = (UNDER_CHAR && !ENTER_UNDERLINE);
}
void
int
outchar(c)
int c;
{
putchar(c & 0177);
return (putchar(c & 0177));
}
static int curmode = 0;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cl_term.c,v 1.2 1998/01/09 08:06:26 perry Exp $ */
/* $NetBSD: cl_term.c,v 1.3 1999/10/04 23:31:49 lukem Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -430,9 +430,9 @@ noterm: if (row == 0)
*
* PUBLIC: int cl_putchar __P((int));
*/
void
int
cl_putchar(ch)
int ch;
{
putchar(ch);
return (putchar(ch));
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: cl_extern.h,v 1.2 1998/01/09 08:08:17 perry Exp $ */
/* $NetBSD: cl_extern.h,v 1.3 1999/10/04 23:31:51 lukem Exp $ */
#ifndef HAVE_CURSES_ADDNSTR
int addnstr __P((char *, int));
@ -53,4 +53,4 @@ int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
int cl_optchange __P((SCR *, int, char *, u_long *));
int cl_omesg __P((SCR *, CL_PRIVATE *, int));
int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
void cl_putchar __P((int));
int cl_putchar __P((int));

View File

@ -1,4 +1,4 @@
/* $NetBSD: tt.h,v 1.5 1998/10/14 00:58:48 wsanchez Exp $ */
/* $NetBSD: tt.h,v 1.6 1999/10/04 23:31:30 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@ -157,9 +157,9 @@ void ttpgoto __P((struct tt_str *, int, int, int));
void ttputs __P((char *));
int ttstrcmp __P((struct tt_str *, struct tt_str *));
void tttgoto __P((struct tt_str *, int, int));
void tttputc __P((int));
int tttputc __P((int));
void ttwrite __P((char *, int));
void ttxputc __P((int));
int ttxputc __P((int));
#define tttputs(s, n) tputs((s)->ts_str, (n), tttputc)
#define ttxputs(s) ttwrite((s)->ts_str, (s)->ts_n)

View File

@ -1,4 +1,4 @@
/* $NetBSD: tttermcap.c,v 1.4 1997/11/21 08:36:35 lukem Exp $ */
/* $NetBSD: tttermcap.c,v 1.5 1999/10/04 23:31:30 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)tttermcap.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: tttermcap.c,v 1.4 1997/11/21 08:36:35 lukem Exp $");
__RCSID("$NetBSD: tttermcap.c,v 1.5 1999/10/04 23:31:30 lukem Exp $");
#endif
#endif /* not lint */
@ -49,18 +49,20 @@ __RCSID("$NetBSD: tttermcap.c,v 1.4 1997/11/21 08:36:35 lukem Exp $");
#include <termcap.h>
#include "tt.h"
void
int
tttputc(c)
int c;
{
ttputc(c);
return (0);
}
void
int
ttxputc(c)
int c;
{
*tt_strp++ = c;
return (0);
}
struct tt_str *