* mdocml: Clean-up in libman: make all calls to man_*msg not check return
@ 2011-03-17 11:56 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-03-17 11:56 UTC (permalink / raw)
To: source
Log Message:
-----------
Clean-up in libman: make all calls to man_*msg not check return value.
Also convert man_vmsg to return void.
Modified Files:
--------------
mdocml:
libman.h
man.c
man_macro.c
man_validate.c
Revision Data
-------------
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -Lman.c -Lman.c -u -p -r1.102 -r1.103
--- man.c
+++ man.c
@@ -622,7 +622,7 @@ err: /* Error out. */
}
-int
+void
man_vmsg(struct man *man, enum mandocerr t,
int ln, int pos, const char *fmt, ...)
{
@@ -632,7 +632,7 @@ man_vmsg(struct man *man, enum mandocerr
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap);
- return((*man->msg)(t, man->data, ln, pos, buf));
+ (*man->msg)(t, man->data, ln, pos, buf);
}
Index: libman.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/libman.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -Llibman.h -Llibman.h -u -p -r1.45 -r1.46
--- libman.h
+++ libman.h
@@ -81,7 +81,7 @@ int man_args(struct man *, int, int *
#define ARGS_EOLN (0)
#define ARGS_WORD (1)
#define ARGS_QWORD (1)
-int man_vmsg(struct man *, enum mandocerr,
+void man_vmsg(struct man *, enum mandocerr,
int, int, const char *, ...);
int man_valid_post(struct man *);
int man_valid_pre(struct man *, struct man_node *);
Index: man_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_validate.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -Lman_validate.c -Lman_validate.c -u -p -r1.63 -r1.64
--- man_validate.c
+++ man_validate.c
@@ -223,9 +223,8 @@ check_text(CHKARGS)
if ('\t' == *p) {
if (MAN_LITERAL & m->flags)
continue;
- if (man_pmsg(m, n->line, pos, MANDOCERR_BADTAB))
- continue;
- return(0);
+ man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);
+ continue;
}
/* Check the special character. */
Index: man_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lman_macro.c -Lman_macro.c -u -p -r1.55 -r1.56
--- man_macro.c
+++ man_macro.c
@@ -43,7 +43,7 @@ static enum rew rew_dohalt(enum mant, e
const struct man_node *);
static enum rew rew_block(enum mant, enum man_type,
const struct man_node *);
-static int rew_warn(struct man *,
+static void rew_warn(struct man *,
struct man_node *, enum mandocerr);
const struct man_macro __man_macros[MAN_MAX] = {
@@ -88,17 +88,19 @@ const struct man_macro * const man_macro
/*
* Warn when "n" is an explicit non-roff macro.
*/
-static int
+static void
rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
{
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
- return(1);
+ return;
if (MAN_VALID & n->flags)
- return(1);
+ return;
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
- return(1);
- return(man_nmsg(m, n, er));
+ return;
+
+ assert(er < MANDOCERR_FATAL);
+ man_nmsg(m, n, er);
}
@@ -123,16 +125,14 @@ man_unscope(struct man *m, const struct
* out to be lost.
*/
n = m->last->parent;
- if ( ! rew_warn(m, m->last, er))
- return(0);
+ rew_warn(m, m->last, er);
if ( ! man_valid_post(m))
return(0);
m->last = n;
assert(m->last);
}
- if ( ! rew_warn(m, m->last, er))
- return(0);
+ rew_warn(m, m->last, er);
if ( ! man_valid_post(m))
return(0);
@@ -279,8 +279,7 @@ blk_close(MACRO_PROT_ARGS)
break;
if (NULL == nn)
- if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE))
- return(0);
+ man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
if ( ! rew_scope(MAN_BODY, m, ntok))
return(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-03-17 11:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-17 11:56 mdocml: Clean-up in libman: make all calls to man_*msg not check return 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).