Fixed email address in manual AUTHOR reference.

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 7ca21e40be5db9925ccbc689722512bba2c5bc9e..e918a648d7b2e967a8648b1c018ec478028d2219 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,20 +1,18 @@
-/* $Id: mdoc_macro.c,v 1.4 2009/03/27 14:56:15 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.9 2009/06/10 20:18:43 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
 #include <ctype.h>
@@ -24,12 +22,6 @@
 
 #include "libmdoc.h"
 
-/*
- * This has scanning/parsing routines, each of which extract a macro and
- * its arguments and parameters, then know how to progress to the next
- * macro. 
- */
-
 /* FIXME: .Fl, .Ar, .Cd handling of `|'. */
 
 enum   mwarn {
@@ -334,7 +326,7 @@ lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
        int              res;
 
-       res = mdoc_tokhash_find(mdoc->htab, p);
+       res = mdoc_hash_find(mdoc->htab, p);
        if (MDOC_PARSED & mdoc_macros[from].flags)
                return(res);
        if (MDOC_MAX == res)
@@ -877,9 +869,11 @@ in_line(MACRO_PROT_ARGS)
                                                        tok, arg))
                                        return(0);
                                mdoc->next = MDOC_NEXT_SIBLING;
-                       } else if ( ! nc && 0 == cnt)
+                       } else if ( ! nc && 0 == cnt) {
+                               mdoc_argv_free(arg);
                                if ( ! pwarn(mdoc, line, ppos, WIGNE))
                                        return(0);
+                       }
                        c = mdoc_macro(mdoc, c, line, la, pos, buf);
                        if (0 == c)
                                return(0);
@@ -930,9 +924,11 @@ in_line(MACRO_PROT_ARGS)
                if (0 == c)
                        return(0);
                mdoc->next = MDOC_NEXT_SIBLING;
-       } else if ( ! nc && 0 == cnt) 
+       } else if ( ! nc && 0 == cnt) {
+               mdoc_argv_free(arg);
                if ( ! pwarn(mdoc, line, ppos, WIGNE))
                        return(0);
+       }
 
        if (ppos > 1)
                return(1);
@@ -1479,7 +1475,7 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
                 */
 
                c = quoted ? MDOC_MAX :
-                       mdoc_tokhash_find(mdoc->htab, &buf[la]);
+                       mdoc_hash_find(mdoc->htab, &buf[la]);
 
                if (MDOC_MAX != c) {
                        if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))