summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2008-12-10 12:09:47 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2008-12-10 12:09:47 +0000
commit7eb59d72cd1ce5e52285c1c9edadf8410146490c (patch)
tree9d5f1ed42bb514374b9b0aeb3f8956d75f4842e1
parent349718f4b8e31663549686fa17aa489c79d94cf3 (diff)
downloadmandoc-7eb59d72cd1ce5e52285c1c9edadf8410146490c.tar.gz
Linted on NetBSD side.
-rw-r--r--Makefile4
-rw-r--r--html.c2
-rw-r--r--html.h4
-rw-r--r--ml.h2
-rw-r--r--mlg.c3
-rw-r--r--private.h8
-rw-r--r--roff.c31
7 files changed, 27 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index de2de11a..3887007b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
-VERSION = 1.0.1
+VERSION = 1.0.2
# FIXME
CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
-LINTFLAGS += -c -e -f -u
-
LNS = mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
compat.ln tokens.ln literals.ln tags.ln
diff --git a/html.c b/html.c
index f41634cd..6cc0c41a 100644
--- a/html.c
+++ b/html.c
@@ -959,6 +959,7 @@ html_free(void *p)
}
+/* ARGSUSED */
static ssize_t
html_beginhttp(struct md_mbuf *mbuf,
const struct md_args *args,
@@ -977,6 +978,7 @@ html_beginhttp(struct md_mbuf *mbuf,
}
+/* ARGSUSED */
static ssize_t
html_endhttp(struct md_mbuf *mbuf,
const struct md_args *args,
diff --git a/html.h b/html.h
index 66ed0cb4..148ea6f0 100644
--- a/html.h
+++ b/html.h
@@ -39,7 +39,7 @@ enum html_tag {
HTML_TAG_LI = 14,
HTML_TAG_H1 = 15,
HTML_TAG_H2 = 16,
- HTML_TAG_A = 17,
+ HTML_TAG_A = 17
};
enum html_attr {
@@ -51,7 +51,7 @@ enum html_attr {
HTML_ATTR_REL = 5,
HTML_ATTR_HREF = 6,
HTML_ATTR_WIDTH = 7,
- HTML_ATTR_ALIGN = 8,
+ HTML_ATTR_ALIGN = 8
};
enum html_type {
diff --git a/ml.h b/ml.h
index e940b337..39f43a25 100644
--- a/ml.h
+++ b/ml.h
@@ -33,7 +33,7 @@ enum md_ns {
MD_NS_HEAD,
MD_NS_BODY,
MD_NS_INLINE,
- MD_NS_DEFAULT,
+ MD_NS_DEFAULT
};
enum ml_scope {
diff --git a/mlg.c b/mlg.c
index 8e8e2956..33b99593 100644
--- a/mlg.c
+++ b/mlg.c
@@ -33,7 +33,7 @@ enum md_tok {
MD_INLINE_IN,
MD_INLINE_OUT,
MD_BLK_IN,
- MD_BLK_OUT,
+ MD_BLK_OUT
};
struct md_mlg {
@@ -498,6 +498,7 @@ mlg_ref_special(struct md_mlg *p, int tok,
}
+/* ARGSUSED */
static int
mlg_formatted_special(struct md_mlg *p, int tok, const char *start,
const int *argc, const char **argv, const char **more)
diff --git a/private.h b/private.h
index d37f6994..0b09b54f 100644
--- a/private.h
+++ b/private.h
@@ -251,7 +251,7 @@ extern const char *const *tokargnames;
enum roffmsg {
ROFF_WARN,
- ROFF_ERROR,
+ ROFF_ERROR
};
enum roffmsec {
@@ -268,7 +268,7 @@ enum roffmsec {
ROFF_MSEC_UNASS,
ROFF_MSEC_DRAFT,
ROFF_MSEC_PAPER,
- ROFF_MSEC_MAX,
+ ROFF_MSEC_MAX
};
enum roffatt {
@@ -280,7 +280,7 @@ enum roffatt {
ROFF_ATT_32V,
ROFF_ATT_V_1,
ROFF_ATT_V_4,
- ROFF_ATT_MAX,
+ ROFF_ATT_MAX
};
enum roffvol {
@@ -319,7 +319,7 @@ enum roffvol {
ROFF_ARCH_SUN3,
ROFF_ARCH_VAX,
ROFF_ARCH_ZAURUS,
- ROFF_VOL_MAX,
+ ROFF_VOL_MAX
};
#define ROFFSec_NMASK (0x07)
diff --git a/roff.c b/roff.c
index 8b9c2dc1..2ed886e9 100644
--- a/roff.c
+++ b/roff.c
@@ -59,7 +59,7 @@ enum rofferr {
ERR_PR_OOO, /* Prelude macro bad order. */
ERR_PR_REP, /* Prelude macro repeated. */
ERR_NOT_PR, /* Not allowed in prelude. */
- WRN_SECORD, /* Sections out-of-order. */
+ WRN_SECORD /* Sections out-of-order. */
};
struct rofftree {
@@ -529,63 +529,62 @@ rofffindtok(const char *buf)
static int
roffchecksec(struct rofftree *tree, const char *start, int sec)
{
- int prior;
switch (sec) {
case(ROFFSec_SYNOP):
- if ((prior = ROFFSec_NAME) & tree->asec)
+ if (ROFFSec_NAME & tree->asec)
return(1);
break;
case(ROFFSec_DESC):
- if ((prior = ROFFSec_SYNOP) & tree->asec)
+ if (ROFFSec_SYNOP & tree->asec)
return(1);
break;
case(ROFFSec_RETVAL):
- if ((prior = ROFFSec_DESC) & tree->asec)
+ if (ROFFSec_DESC & tree->asec)
return(1);
break;
case(ROFFSec_ENV):
- if ((prior = ROFFSec_RETVAL) & tree->asec)
+ if (ROFFSec_RETVAL & tree->asec)
return(1);
break;
case(ROFFSec_FILES):
- if ((prior = ROFFSec_ENV) & tree->asec)
+ if (ROFFSec_ENV & tree->asec)
return(1);
break;
case(ROFFSec_EX):
- if ((prior = ROFFSec_FILES) & tree->asec)
+ if (ROFFSec_FILES & tree->asec)
return(1);
break;
case(ROFFSec_DIAG):
- if ((prior = ROFFSec_EX) & tree->asec)
+ if (ROFFSec_EX & tree->asec)
return(1);
break;
case(ROFFSec_ERRS):
- if ((prior = ROFFSec_DIAG) & tree->asec)
+ if (ROFFSec_DIAG & tree->asec)
return(1);
break;
case(ROFFSec_SEEALSO):
- if ((prior = ROFFSec_ERRS) & tree->asec)
+ if (ROFFSec_ERRS & tree->asec)
return(1);
break;
case(ROFFSec_STAND):
- if ((prior = ROFFSec_SEEALSO) & tree->asec)
+ if (ROFFSec_SEEALSO & tree->asec)
return(1);
break;
case(ROFFSec_HIST):
- if ((prior = ROFFSec_STAND) & tree->asec)
+ if (ROFFSec_STAND & tree->asec)
return(1);
break;
case(ROFFSec_AUTH):
- if ((prior = ROFFSec_HIST) & tree->asec)
+ if (ROFFSec_HIST & tree->asec)
return(1);
break;
case(ROFFSec_CAVEATS):
- if ((prior = ROFFSec_AUTH) & tree->asec)
+ if (ROFFSec_AUTH & tree->asec)
return(1);
break;
case(ROFFSec_BUGS):
- if ((prior = ROFFSec_CAVEATS) & tree->asec)
+ if (ROFFSec_CAVEATS & tree->asec)
return(1);
break;
default: