* mdocml: Make return(man_nmsg(...)) by a simple declaration.
@ 2010-12-06 13:56 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-12-06 13:56 UTC (permalink / raw)
To: source
Log Message:
-----------
Make return(man_nmsg(...)) by a simple declaration.
Make non-uppercase warning only occur once.
Make scope-open-on-error warning only occur once.
Modified Files:
--------------
mdocml:
man_validate.c
Revision Data
-------------
Index: man_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_validate.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lman_validate.c -Lman_validate.c -u -p -r1.53 -r1.54
--- man_validate.c
+++ man_validate.c
@@ -163,9 +163,9 @@ check_root(CHKARGS)
{
if (MAN_BLINE & m->flags)
- return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
- if (MAN_ELINE & m->flags)
- return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
+ man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
+ else if (MAN_ELINE & m->flags)
+ man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
m->flags &= ~MAN_BLINE;
m->flags &= ~MAN_ELINE;
@@ -174,14 +174,13 @@ check_root(CHKARGS)
man_nmsg(m, n, MANDOCERR_NODOCBODY);
return(0);
} else if (NULL == m->meta.title) {
- if ( ! man_nmsg(m, n, MANDOCERR_NOTITLE))
- return(0);
+ man_nmsg(m, n, MANDOCERR_NOTITLE);
+
/*
* If a title hasn't been set, do so now (by
* implication, date and section also aren't set).
- *
- * FIXME: this should be in man_action.c.
*/
+
m->meta.title = mandoc_strdup("unknown");
m->meta.date = time(NULL);
m->meta.msec = mandoc_strdup("1");
@@ -204,9 +203,11 @@ check_title(CHKARGS)
}
for (p = n->child->string; '\0' != *p; p++)
- if (isalpha((u_char)*p) && ! isupper((u_char)*p))
- if ( ! man_nmsg(m, n, MANDOCERR_UPPERCASE))
- return(0);
+ /* Only warn about this once... */
+ if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
+ man_nmsg(m, n, MANDOCERR_UPPERCASE);
+ break;
+ }
return(1);
}
@@ -276,7 +277,7 @@ check_sec(CHKARGS)
man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
return(0);
} else if (MAN_BODY == n->type && 0 == n->nchild)
- return(man_nmsg(m, n, MANDOCERR_NOBODY));
+ man_nmsg(m, n, MANDOCERR_NOBODY);
return(1);
}
@@ -287,7 +288,8 @@ check_part(CHKARGS)
{
if (MAN_BODY == n->type && 0 == n->nchild)
- return(man_nmsg(m, n, MANDOCERR_NOBODY));
+ man_nmsg(m, n, MANDOCERR_NOBODY);
+
return(1);
}
@@ -306,9 +308,9 @@ check_par(CHKARGS)
/* Body-less lists are ok. */
break;
default:
- if (n->nchild)
- break;
- return(man_nmsg(m, n, MANDOCERR_NOBODY));
+ if (0 == n->nchild)
+ man_nmsg(m, n, MANDOCERR_NOBODY);
+ break;
}
if (MAN_HEAD == n->type)
switch (n->tok) {
@@ -317,9 +319,9 @@ check_par(CHKARGS)
case (MAN_P):
/* FALLTHROUGH */
case (MAN_LP):
- if (0 == n->nchild)
- break;
- return(man_nmsg(m, n, MANDOCERR_ARGSLOST));
+ if (n->nchild)
+ man_nmsg(m, n, MANDOCERR_ARGSLOST);
+ break;
default:
break;
}
--
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:[~2010-12-06 13:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-06 13:56 mdocml: Make return(man_nmsg(...)) by a simple declaration 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).