summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man_html.c6
-rw-r--r--mdoc_html.c7
-rw-r--r--tbl_data.c1
-rw-r--r--tbl_opts.c4
-rw-r--r--tbl_term.c19
5 files changed, 20 insertions, 17 deletions
diff --git a/man_html.c b/man_html.c
index 2d69f100..2495c8cd 100644
--- a/man_html.c
+++ b/man_html.c
@@ -505,7 +505,6 @@ man_IP_pre(MAN_ARGS)
struct roffsu su;
struct htmlpair tag;
const struct man_node *nn;
- int width;
/*
* This scattering of 1-BU margins and pads is to make sure that
@@ -523,13 +522,12 @@ man_IP_pre(MAN_ARGS)
n->head->child : n->parent->head->child;
SCALE_HS_INIT(&su, INDENT);
- width = 0;
/* Width is the second token. */
if (MAN_IP == n->tok && NULL != nn)
if (NULL != (nn = nn->next))
- width = a2width(nn, &su);
+ a2width(nn, &su);
/* Width is the first token. */
@@ -538,7 +536,7 @@ man_IP_pre(MAN_ARGS)
while (nn && MAN_TEXT != nn->type)
nn = nn->next;
if (nn)
- width = a2width(nn, &su);
+ a2width(nn, &su);
}
if (MAN_BLOCK == n->type) {
diff --git a/mdoc_html.c b/mdoc_html.c
index 093b5607..4de1115d 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -830,6 +830,7 @@ mdoc_bx_pre(MDOC_ARGS)
return(0);
}
+/* ARGSUSED */
static int
mdoc_it_pre(MDOC_ARGS)
{
@@ -944,7 +945,7 @@ mdoc_it_pre(MDOC_ARGS)
static int
mdoc_bl_pre(MDOC_ARGS)
{
- size_t i;
+ int i;
struct htmlpair tag[3];
struct roffsu su;
char buf[BUFSIZ];
@@ -966,10 +967,10 @@ mdoc_bl_pre(MDOC_ARGS)
* screen and we want to preserve that behaviour.
*/
- for (i = 0; i < n->norm->Bl.ncols; i++) {
+ for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
a2width(n->norm->Bl.cols[i], &su);
bufinit(h);
- if (i < n->norm->Bl.ncols - 1)
+ if (i < (int)n->norm->Bl.ncols - 1)
bufcat_su(h, "width", &su);
else
bufcat_su(h, "min-width", &su);
diff --git a/tbl_data.c b/tbl_data.c
index cb17bb2f..e0d80230 100644
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -112,6 +112,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
return(1);
}
+/* ARGSUSED */
int
tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
{
diff --git a/tbl_opts.c b/tbl_opts.c
index 1f750cb9..227deb1f 100644
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -72,12 +72,12 @@ static const struct tbl_phrase keys[KEY_MAXKEYS] = {
};
static int arg(struct tbl_node *, int,
- const char *, int *, int);
+ const char *, int *, enum tbl_ident);
static void opt(struct tbl_node *, int,
const char *, int *);
static int
-arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
+arg(struct tbl_node *tbl, int ln, const char *p, int *pos, enum tbl_ident key)
{
int i;
char buf[KEY_MAXNUMSZ];
diff --git a/tbl_term.c b/tbl_term.c
index 0430577a..ab1a4f62 100644
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -32,7 +32,7 @@
static size_t term_tbl_len(size_t, void *);
static size_t term_tbl_strlen(const char *, void *);
-static void tbl_char(struct termp *, char, int);
+static void tbl_char(struct termp *, char, size_t);
static void tbl_data(struct termp *, const struct tbl *,
const struct tbl_dat *,
const struct roffcol *);
@@ -67,7 +67,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
const struct tbl_head *hp;
const struct tbl_dat *dp;
struct roffcol *col;
- int rmargin, maxrmargin;
+ size_t rmargin, maxrmargin;
rmargin = tp->rmargin;
maxrmargin = tp->maxrmargin;
@@ -165,7 +165,7 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp)
{
const struct tbl_head *hp;
char c;
- int width;
+ size_t width;
/*
* An hrule extends across the entire table and is demarked by a
@@ -202,7 +202,7 @@ static void
tbl_hframe(struct termp *tp, const struct tbl_span *sp)
{
const struct tbl_head *hp;
- int width;
+ size_t width;
if ( ! (TBL_OPT_BOX & sp->tbl->opts ||
TBL_OPT_DBOX & sp->tbl->opts))
@@ -324,10 +324,13 @@ tbl_vframe(struct termp *tp, const struct tbl *tbl)
}
static void
-tbl_char(struct termp *tp, char c, int len)
+tbl_char(struct termp *tp, char c, size_t len)
{
- int i, sz;
- const char cp[2] = {c, '\0'};
+ size_t i, sz;
+ char cp[2];
+
+ cp[0] = c;
+ cp[1] = '\0';
sz = term_strlen(tp, cp);
@@ -339,7 +342,7 @@ static void
tbl_literal(struct termp *tp, const struct tbl_dat *dp,
const struct roffcol *col)
{
- int padl, padr, ssz;
+ size_t padl, padr, ssz;
enum tbl_cellt pos;
padl = padr = 0;