* mdocml: Quiesce lint with some type handling.
@ 2011-01-07 13:20 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-01-07 13:20 UTC (permalink / raw)
To: source
Log Message:
-----------
Quiesce lint with some type handling. Does not change anything.
Modified Files:
--------------
mdocml:
man_html.c
mdoc_html.c
tbl_data.c
tbl_opts.c
tbl_term.c
Revision Data
-------------
Index: tbl_data.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/tbl_data.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -Ltbl_data.c -Ltbl_data.c -u -p -r1.12 -r1.13
--- tbl_data.c
+++ tbl_data.c
@@ -112,6 +112,7 @@ data(struct tbl_node *tbl, struct tbl_sp
return(1);
}
+/* ARGSUSED */
int
tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
{
Index: man_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lman_html.c -Lman_html.c -u -p -r1.61 -r1.62
--- man_html.c
+++ 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) {
Index: tbl_opts.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/tbl_opts.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ltbl_opts.c -Ltbl_opts.c -u -p -r1.6 -r1.7
--- tbl_opts.c
+++ tbl_opts.c
@@ -72,12 +72,12 @@ static const struct tbl_phrase keys[KEY_
};
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];
Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.141 -r1.142
--- mdoc_html.c
+++ 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);
Index: tbl_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/tbl_term.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.11 -r1.12
--- tbl_term.c
+++ 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
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
{
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 struc
}
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;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-07 13:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-07 13:20 mdocml: Quiesce lint with some type handling kristaps
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).