diff options
author | ed <ed@FreeBSD.org> | 2012-10-19 14:49:42 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2012-10-19 14:49:42 +0000 |
commit | af31e8843c2cc0ba388a33f341de8da1b50de433 (patch) | |
tree | ddffe542a2e921ec48c73d322a2046f559a9d74f /usr.bin/tset | |
parent | b1462253851ab8c1f6dde48bb7796b15d3f38253 (diff) | |
download | FreeBSD-src-af31e8843c2cc0ba388a33f341de8da1b50de433.zip FreeBSD-src-af31e8843c2cc0ba388a33f341de8da1b50de433.tar.gz |
More -Wmissing-variable-declarations fixes.
In addition to adding `static' where possible:
- bin/date: Move `retval' into extern.h to make it visible to date.c.
- bin/ed: Move globally used variables into ed.h.
- sbin/camcontrol: Move `verbose' into camcontrol.h and fix shadow warnings.
- usr.bin/calendar: Remove unneeded variables.
- usr.bin/chat: Make `line' local instead of global.
- usr.bin/elfdump: Comment out unneeded function.
- usr.bin/rlogin: Use _Noreturn instead of __dead2.
- usr.bin/tset: Pull `Ospeed' into extern.h.
- usr.sbin/mfiutil: Put global variables in mfiutil.h.
- usr.sbin/pkg: Remove unused `os_corres'.
- usr.sbin/quotaon, usr.sbin/repquota: Remove unused `qfname'.
Diffstat (limited to 'usr.bin/tset')
-rw-r--r-- | usr.bin/tset/extern.h | 3 | ||||
-rw-r--r-- | usr.bin/tset/map.c | 9 | ||||
-rw-r--r-- | usr.bin/tset/term.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h index 833870e..f4a6514 100644 --- a/usr.bin/tset/extern.h +++ b/usr.bin/tset/extern.h @@ -30,9 +30,12 @@ * $FreeBSD$ */ +#include <termios.h> + extern struct termios mode, oldmode; extern int Columns, isreset, Lines; extern int erasech, intrchar, killch; +extern speed_t Ospeed; void add_mapping(const char *, char *); void cat(char *); diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c index 8de594f..715f514 100644 --- a/usr.bin/tset/map.c +++ b/usr.bin/tset/map.c @@ -44,8 +44,7 @@ static const char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93"; #include "extern.h" -extern speed_t Ospeed; -speed_t tset_baudrate(char *); +static speed_t tset_baudrate(char *); /* Baud rate conditionals for mapping. */ #define GT 0x01 @@ -63,7 +62,7 @@ typedef struct map { speed_t speed; /* Baud rate to compare against. */ } MAP; -MAP *cur, *maplist; +static MAP *cur, *maplist; /* * Syntax for -m: @@ -224,7 +223,7 @@ typedef struct speeds { speed_t speed; } SPEEDS; -SPEEDS speeds[] = { +static SPEEDS speeds[] = { { "0", B0 }, { "134.5", B134 }, { "exta", B19200 }, @@ -232,7 +231,7 @@ SPEEDS speeds[] = { { NULL, 0 } }; -speed_t +static speed_t tset_baudrate(char *rate) { SPEEDS *sp; diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c index 544e928..106c98f 100644 --- a/usr.bin/tset/term.c +++ b/usr.bin/tset/term.c @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/9/93"; #include <ttyent.h> #include "extern.h" -char tbuf[1024]; /* Termcap entry. */ +static char tbuf[1024]; /* Termcap entry. */ const char *askuser(const char *); char *ttys(char *); |