=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- mandoc/Attic/man_action.c 2009/06/16 19:55:28 1.12 +++ mandoc/Attic/man_action.c 2009/06/18 10:53:58 1.13 @@ -1,4 +1,4 @@ -/* $Id: man_action.c,v 1.12 2009/06/16 19:55:28 kristaps Exp $ */ +/* $Id: man_action.c,v 1.13 2009/06/18 10:53:58 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -108,8 +108,7 @@ post_TH(struct man *m) assert(n); if (NULL == (m->meta.title = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); + return(man_nerr(m, n, WNMEM)); /* TITLE ->MSEC<- DATE SOURCE VOL */ @@ -120,7 +119,7 @@ post_TH(struct man *m) lval = strtol(n->string, &ep, 10); if (n->string[0] != '\0' && *ep == '\0') m->meta.msec = (int)lval; - else if ( ! man_vwarn(m, n->line, n->pos, "invalid section")) + else if ( ! man_nwarn(m, n, WMSEC)) return(0); /* TITLE MSEC ->DATE<- SOURCE VOL */ @@ -128,7 +127,7 @@ post_TH(struct man *m) if (NULL == (n = n->next)) m->meta.date = time(NULL); else if (0 == (m->meta.date = man_atotime(n->string))) { - if ( ! man_vwarn(m, n->line, n->pos, "invalid date")) + if ( ! man_nwarn(m, n, WDATE)) return(0); m->meta.date = time(NULL); } @@ -137,15 +136,13 @@ post_TH(struct man *m) if (n && (n = n->next)) if (NULL == (m->meta.source = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); + return(man_nerr(m, n, WNMEM)); /* TITLE MSEC DATE SOURCE ->VOL<- */ if (n && (n = n->next)) if (NULL == (m->meta.vol = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); + return(man_nerr(m, n, WNMEM)); /* * The end document shouldn't have the prologue macros as part @@ -178,7 +175,7 @@ man_atotime(const char *p) struct tm tm; char *pp; - (void)memset(&tm, 0, sizeof(struct tm)); + bzero(&tm, sizeof(struct tm)); if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp) return(mktime(&tm));