=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.28 retrieving revision 1.34 diff -u -p -r1.28 -r1.34 --- mandoc/Attic/man_action.c 2010/03/24 03:46:02 1.28 +++ mandoc/Attic/man_action.c 2010/05/15 22:44:04 1.34 @@ -1,6 +1,6 @@ -/* $Id: man_action.c,v 1.28 2010/03/24 03:46:02 kristaps Exp $ */ +/* $Id: man_action.c,v 1.34 2010/05/15 22:44:04 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -123,8 +123,6 @@ static int post_TH(struct man *m) { struct man_node *n; - char *ep; - long lval; if (m->meta.title) free(m->meta.title); @@ -132,9 +130,11 @@ post_TH(struct man *m) free(m->meta.vol); if (m->meta.source) free(m->meta.source); + if (m->meta.msec) + free(m->meta.msec); - m->meta.title = m->meta.vol = m->meta.source = NULL; - m->meta.msec = 0; + m->meta.title = m->meta.vol = + m->meta.msec = m->meta.source = NULL; m->meta.date = 0; /* ->TITLE<- MSEC DATE SOURCE VOL */ @@ -147,20 +147,14 @@ post_TH(struct man *m) n = n->next; assert(n); + m->meta.msec = mandoc_strdup(n->string); - lval = strtol(n->string, &ep, 10); - if (n->string[0] != '\0' && *ep == '\0') - m->meta.msec = (int)lval; - else if ( ! man_nwarn(m, n, WMSEC)) - return(0); - /* TITLE MSEC ->DATE<- SOURCE VOL */ n = n->next; if (n) { m->meta.date = mandoc_a2time (MTIME_ISO_8601, n->string); - if (0 == m->meta.date) { if ( ! man_nwarn(m, n, WDATE)) return(0); @@ -179,8 +173,10 @@ post_TH(struct man *m) if (n && (n = n->next)) m->meta.vol = mandoc_strdup(n->string); - n = m->last; - man_node_unlink(m, n); - man_node_freelist(n); + /* + * Remove the `TH' node after we've processed it for our + * meta-data. + */ + man_node_delete(m, m->last); return(1); }