Make all the global variables and functions static.
While there, remove unused variables and function prototypes. Ok from christos
This commit is contained in:
parent
21d6f4c7cd
commit
8dc887f792
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: ul.c,v 1.18 2016/06/13 14:58:57 abhinav Exp $ */
|
/* $NetBSD: ul.c,v 1.19 2016/06/23 03:58:13 abhinav Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1980, 1993
|
* Copyright (c) 1980, 1993
|
||||||
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
|
|||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
|
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
|
||||||
#endif
|
#endif
|
||||||
__RCSID("$NetBSD: ul.c,v 1.18 2016/06/13 14:58:57 abhinav Exp $");
|
__RCSID("$NetBSD: ul.c,v 1.19 2016/06/23 03:58:13 abhinav Exp $");
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
@ -65,34 +65,29 @@ __RCSID("$NetBSD: ul.c,v 1.18 2016/06/13 14:58:57 abhinav Exp $");
|
|||||||
#define UNDERL 010 /* Ul */
|
#define UNDERL 010 /* Ul */
|
||||||
#define BOLD 020 /* Bold */
|
#define BOLD 020 /* Bold */
|
||||||
|
|
||||||
struct tinfo *info;
|
static int must_overstrike;
|
||||||
int must_overstrike;
|
|
||||||
const char *CURS_UP, *CURS_RIGHT, *CURS_LEFT,
|
|
||||||
*ENTER_STANDOUT, *EXIT_STANDOUT, *ENTER_UNDERLINE, *EXIT_UNDERLINE,
|
|
||||||
*ENTER_DIM, *ENTER_BOLD, *ENTER_REVERSE, *UNDER_CHAR, *EXIT_ATTRIBUTES;
|
|
||||||
|
|
||||||
struct CHAR {
|
struct CHAR {
|
||||||
char c_mode;
|
char c_mode;
|
||||||
char c_char;
|
char c_char;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
size_t col, maxcol;
|
static size_t col, maxcol;
|
||||||
int mode;
|
static int mode;
|
||||||
int halfpos;
|
static int halfpos;
|
||||||
int upln;
|
static int upln;
|
||||||
int iflag;
|
static int iflag;
|
||||||
|
|
||||||
void filter(FILE *);
|
static void filter(FILE *);
|
||||||
void flushln(struct CHAR *, size_t);
|
static void flushln(struct CHAR *, size_t);
|
||||||
void fwd(struct CHAR *, size_t);
|
static void fwd(struct CHAR *, size_t);
|
||||||
void iattr(struct CHAR *);
|
static void iattr(struct CHAR *);
|
||||||
void initbuf(struct CHAR *, size_t);
|
static void initbuf(struct CHAR *, size_t);
|
||||||
void initcap(void);
|
static void outc(int);
|
||||||
void outc(int);
|
static int outchar(int);
|
||||||
int outchar(int);
|
static void overstrike(struct CHAR *);
|
||||||
void overstrike(struct CHAR *);
|
static void reverse(struct CHAR *, size_t);
|
||||||
void reverse(struct CHAR *, size_t);
|
static void setulmode(int);
|
||||||
void setulmode(int);
|
|
||||||
static void alloc_buf(struct CHAR **, size_t *);
|
static void alloc_buf(struct CHAR **, size_t *);
|
||||||
static void set_mode(void);
|
static void set_mode(void);
|
||||||
|
|
||||||
@ -147,7 +142,7 @@ main(int argc, char **argv)
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
filter(FILE *f)
|
filter(FILE *f)
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
@ -270,7 +265,7 @@ filter(FILE *f)
|
|||||||
free(obuf);
|
free(obuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
flushln(struct CHAR *obuf, size_t obuf_size)
|
flushln(struct CHAR *obuf, size_t obuf_size)
|
||||||
{
|
{
|
||||||
int lastmode;
|
int lastmode;
|
||||||
@ -312,7 +307,7 @@ flushln(struct CHAR *obuf, size_t obuf_size)
|
|||||||
* For terminals that can overstrike, overstrike underlines and bolds.
|
* For terminals that can overstrike, overstrike underlines and bolds.
|
||||||
* We don't do anything with halfline ups and downs, or Greek.
|
* We don't do anything with halfline ups and downs, or Greek.
|
||||||
*/
|
*/
|
||||||
void
|
static void
|
||||||
overstrike(struct CHAR *obuf)
|
overstrike(struct CHAR *obuf)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -350,7 +345,7 @@ overstrike(struct CHAR *obuf)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
iattr(struct CHAR *obuf)
|
iattr(struct CHAR *obuf)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -374,7 +369,7 @@ iattr(struct CHAR *obuf)
|
|||||||
putchar('\n');
|
putchar('\n');
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
initbuf(struct CHAR *obuf, size_t obuf_size)
|
initbuf(struct CHAR *obuf, size_t obuf_size)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -390,7 +385,7 @@ set_mode(void)
|
|||||||
mode &= ALTSET;
|
mode &= ALTSET;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
fwd(struct CHAR *obuf, size_t obuf_size)
|
fwd(struct CHAR *obuf, size_t obuf_size)
|
||||||
{
|
{
|
||||||
int oldcol, oldmax;
|
int oldcol, oldmax;
|
||||||
@ -402,7 +397,7 @@ fwd(struct CHAR *obuf, size_t obuf_size)
|
|||||||
maxcol = oldmax;
|
maxcol = oldmax;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
reverse(struct CHAR *obuf, size_t obuf_size)
|
reverse(struct CHAR *obuf, size_t obuf_size)
|
||||||
{
|
{
|
||||||
upln++;
|
upln++;
|
||||||
@ -412,7 +407,7 @@ reverse(struct CHAR *obuf, size_t obuf_size)
|
|||||||
upln++;
|
upln++;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
static int
|
||||||
outchar(int c)
|
outchar(int c)
|
||||||
{
|
{
|
||||||
return (putchar(c & 0177));
|
return (putchar(c & 0177));
|
||||||
@ -420,7 +415,7 @@ outchar(int c)
|
|||||||
|
|
||||||
static int curmode = 0;
|
static int curmode = 0;
|
||||||
|
|
||||||
void
|
static void
|
||||||
outc(int c)
|
outc(int c)
|
||||||
{
|
{
|
||||||
putchar(c);
|
putchar(c);
|
||||||
@ -433,7 +428,7 @@ outc(int c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
setulmode(int newmode)
|
setulmode(int newmode)
|
||||||
{
|
{
|
||||||
if (!iflag) {
|
if (!iflag) {
|
||||||
|
Loading…
Reference in New Issue
Block a user