Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:34:12 UTC 2011
Modified Files:
src/usr.bin/tset: extern.h map.c set.c term.c tset.c wrterm.c
Log Message:
ANSIfy. Sprinkle static and __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/tset/extern.h
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/tset/map.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/tset/set.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/tset/term.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tset/tset.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/tset/wrterm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tset/extern.h
diff -u src/usr.bin/tset/extern.h:1.13 src/usr.bin/tset/extern.h:1.14
--- src/usr.bin/tset/extern.h:1.13 Wed Feb 10 10:33:45 2010
+++ src/usr.bin/tset/extern.h Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.13 2010/02/10 10:33:45 roy Exp $ */
+/* $NetBSD: extern.h,v 1.14 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,13 +34,13 @@
extern struct termios mode, oldmode;
extern int ncolumns, isreset, nlines;
-void add_mapping __P((const char *, char *));
-void tset_cat __P((const char *));
-const char *get_terminfo_entry __P((const char *));
-const char *mapped __P((const char *));
-int outc __P((int));
-void reset_mode __P((void));
-void set_control_chars __P((int, int, int));
-void set_conversions __P((int));
-void set_init __P((void));
-void wrtermcap __P((char *));
+void add_mapping(const char *, char *);
+void tset_cat(const char *);
+const char *get_terminfo_entry(const char *);
+const char *mapped(const char *);
+int outc(int);
+void reset_mode(void);
+void set_control_chars(int, int, int);
+void set_conversions(int);
+void set_init(void);
+void wrtermcap(char *);
Index: src/usr.bin/tset/map.c
diff -u src/usr.bin/tset/map.c:1.12 src/usr.bin/tset/map.c:1.13
--- src/usr.bin/tset/map.c:1.12 Wed Feb 3 15:34:46 2010
+++ src/usr.bin/tset/map.c Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.12 2010/02/03 15:34:46 roy Exp $ */
+/* $NetBSD: map.c,v 1.13 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: map.c,v 1.12 2010/02/03 15:34:46 roy Exp $");
+__RCSID("$NetBSD: map.c,v 1.13 2011/09/06 18:34:12 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -46,7 +46,7 @@
#include <termios.h>
#include "extern.h"
-int baudrate __P((char *));
+static int baudrate(char *);
/* Baud rate conditionals for mapping. */
#define GT 0x01
@@ -64,7 +64,7 @@
int speed; /* Baud rate to compare against. */
} MAP;
-MAP *cur, *maplist;
+static MAP *cur, *maplist;
/*
* Syntax for -m:
@@ -72,9 +72,7 @@
* The baud rate tests are: >, <, @, =, !
*/
void
-add_mapping(port, arg)
- const char *port;
- char *arg;
+add_mapping(const char *port, char *arg)
{
MAP *mapp;
char *copy, *p, *termp;
@@ -188,8 +186,7 @@
* 'type'.
*/
const char *
-mapped(type)
- const char *type;
+mapped(const char *type)
{
MAP *mapp;
int match;
@@ -224,9 +221,8 @@
return (type);
}
-int
-baudrate(rate)
- char *rate;
+static int
+baudrate(char *rate)
{
/* The baudrate number can be preceded by a 'B', which is ignored. */
Index: src/usr.bin/tset/set.c
diff -u src/usr.bin/tset/set.c:1.14 src/usr.bin/tset/set.c:1.15
--- src/usr.bin/tset/set.c:1.14 Wed Feb 10 10:34:59 2010
+++ src/usr.bin/tset/set.c Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.14 2010/02/10 10:34:59 roy Exp $ */
+/* $NetBSD: set.c,v 1.15 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: set.c,v 1.14 2010/02/10 10:34:59 roy Exp $");
+__RCSID("$NetBSD: set.c,v 1.15 2011/09/06 18:34:12 joerg Exp $");
#include <err.h>
#include <stdio.h>
@@ -41,14 +41,14 @@
#define CHK(val, dft) (val <= 0 ? dft : val)
-int set_tabs __P((void));
+static int set_tabs(void);
/*
* Reset the terminal mode bits to a sensible state. Very useful after
* a child program dies in raw mode.
*/
void
-reset_mode()
+reset_mode(void)
{
tcgetattr(STDERR_FILENO, &mode);
@@ -198,10 +198,9 @@
mode.c_lflag |= (ECHOE | ECHOK);
}
-#
/* Output startup string. */
void
-set_init()
+set_init(void)
{
const char *bp;
int settle;
@@ -242,8 +241,8 @@
* This is done before if and is, so they can patch in case we blow this.
* Return nonzero if we set any tab stops, zero if not.
*/
-int
-set_tabs()
+static int
+set_tabs(void)
{
int c;
char *out;
Index: src/usr.bin/tset/term.c
diff -u src/usr.bin/tset/term.c:1.16 src/usr.bin/tset/term.c:1.17
--- src/usr.bin/tset/term.c:1.16 Wed Feb 3 15:34:46 2010
+++ src/usr.bin/tset/term.c Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.16 2010/02/03 15:34:46 roy Exp $ */
+/* $NetBSD: term.c,v 1.17 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: term.c,v 1.16 2010/02/03 15:34:46 roy Exp $");
+__RCSID("$NetBSD: term.c,v 1.17 2011/09/06 18:34:12 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -48,10 +48,7 @@
#include <unistd.h>
#include "extern.h"
-char *tbuf; /* Termcap entry. */
-
-const char *askuser __P((const char *));
-char *ttys __P((char *));
+static const char *askuser(const char *);
/*
* Figure out what kind of terminal we're dealing with, and then read in
@@ -124,9 +121,8 @@
}
/* Prompt the user for a terminal type. */
-const char *
-askuser(dflt)
- const char *dflt;
+static const char *
+askuser(const char *dflt)
{
static char answer[256];
char *p;
Index: src/usr.bin/tset/tset.c
diff -u src/usr.bin/tset/tset.c:1.19 src/usr.bin/tset/tset.c:1.20
--- src/usr.bin/tset/tset.c:1.19 Wed Feb 10 10:34:31 2010
+++ src/usr.bin/tset/tset.c Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tset.c,v 1.19 2010/02/10 10:34:31 roy Exp $ */
+/* $NetBSD: tset.c,v 1.20 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: tset.c,v 1.19 2010/02/10 10:34:31 roy Exp $");
+__RCSID("$NetBSD: tset.c,v 1.20 2011/09/06 18:34:12 joerg Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -47,10 +47,9 @@
#include <unistd.h>
#include "extern.h"
-int main __P((int, char *[]));
-void obsolete __P((char *[]));
-void report __P((const char *, int, u_int));
-void usage __P((void));
+static void obsolete(char *[]);
+static void report(const char *, int, u_int);
+__dead static void usage(void);
struct termios mode, oldmode;
@@ -58,9 +57,7 @@
int nlines, ncolumns; /* window size */
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
#ifdef TIOCGWINSZ
struct winsize win;
@@ -221,11 +218,8 @@
/*
* Tell the user if a control key has been changed from the default value.
*/
-void
-report(name, which, def)
- const char *name;
- int which;
- u_int def;
+static void
+report(const char *name, int which, u_int def)
{
u_int old, new;
@@ -257,8 +251,7 @@
* This means that -e, -i and -k get default arguments supplied for them.
*/
void
-obsolete(argv)
- char *argv[];
+obsolete(char *argv[])
{
static char earg[5] = { '-', 'e', '^', 'H', '\0' };
static char iarg[5] = { '-', 'i', '^', 'C', '\0' };
@@ -283,8 +276,8 @@
}
}
-void
-usage()
+static void
+usage(void)
{
(void)fprintf(stderr,
"usage: %s [-EIQrSs] [-] [-e ch] [-i ch] [-k ch] [-m mapping] [terminal]\n",
Index: src/usr.bin/tset/wrterm.c
diff -u src/usr.bin/tset/wrterm.c:1.8 src/usr.bin/tset/wrterm.c:1.9
--- src/usr.bin/tset/wrterm.c:1.8 Tue Apr 14 05:45:23 2009
+++ src/usr.bin/tset/wrterm.c Tue Sep 6 18:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wrterm.c,v 1.8 2009/04/14 05:45:23 lukem Exp $ */
+/* $NetBSD: wrterm.c,v 1.9 2011/09/06 18:34:12 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)wrterm.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: wrterm.c,v 1.8 2009/04/14 05:45:23 lukem Exp $");
+__RCSID("$NetBSD: wrterm.c,v 1.9 2011/09/06 18:34:12 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -49,8 +49,7 @@
* shell problems and omitting empty fields.
*/
void
-wrtermcap(bp)
- char *bp;
+wrtermcap(char *bp)
{
int ch;
char *p;
