From 8a11019331905f2ee9db28cc4a61f016d169de4e Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 22 Mar 2009 19:10:48 +0000 Subject: Lint fixes. --- Makefile | 1 + main.c | 3 ++- terminal.c | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 147f7ad0..b357c99f 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ CFLAGS += $(VFLAGS) # If you want to strip `Xo/Xc' macro pairs, enable this. Really, only # OpenBSD should be doing this while it kicks its cruft. CFLAGS += -DSTRIP_XO +LINTFLAGS += -DSTRIP_XO LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \ validate.ln action.ln lib.ln att.ln arch.ln vol.ln \ diff --git a/main.c b/main.c index d7a95c6c..79d696b8 100644 --- a/main.c +++ b/main.c @@ -401,13 +401,14 @@ fdesc(struct buf *blk, struct buf *ln, lnn++; continue; } + macro = 0; #endif /* STRIP_XO */ ln->buf[pos] = 0; if ( ! mdoc_parseln(mdoc, lnn, ln->buf)) return(0); lnn++; - macro = pos = 0; + pos = 0; } } diff --git a/terminal.c b/terminal.c index ab596b03..f7bfd301 100644 --- a/terminal.c +++ b/terminal.c @@ -46,8 +46,8 @@ static void term_nescape(struct termp *, static void term_chara(struct termp *, char); static void term_stringa(struct termp *, const char *, size_t); -static int term_isopendelim(const char *, size_t); -static int term_isclosedelim(const char *, size_t); +static int term_isopendelim(const char *, int); +static int term_isclosedelim(const char *, int); static void sanity(const struct mdoc_node *); /* XXX */ @@ -129,7 +129,7 @@ term_alloc(enum termenc enc) static int -term_isclosedelim(const char *p, size_t len) +term_isclosedelim(const char *p, int len) { if (1 != len) @@ -163,7 +163,7 @@ term_isclosedelim(const char *p, size_t len) static int -term_isopendelim(const char *p, size_t len) +term_isopendelim(const char *p, int len) { if (1 != len) -- cgit