More lint fixes.

[mandoc.git] / mdoc_argv.c

diff --git a/mdoc_argv.c b/mdoc_argv.c
index 3c707bda7d33e7fdeafd58bc15a0135e3f26790d..71fa94088ba28d8c4ebf999d6e27ba3263b4d76d 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.28 2009/10/15 01:33:12 kristaps Exp $ */
+/*     $Id: mdoc_argv.c,v 1.32 2009/10/30 05:58:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "libmdoc.h"
+#include "libmandoc.h"
 
 /*
  * Routines to parse arguments of macros.  Arguments follow the syntax
@@ -59,7 +60,7 @@ static        int mdoc_argvflags[MDOC_ARG_MAX] = {
        ARGV_NONE,      /* MDOC_Ragged */
        ARGV_NONE,      /* MDOC_Unfilled */
        ARGV_NONE,      /* MDOC_Literal */
-       ARGV_NONE,      /* MDOC_File */
+       ARGV_SINGLE,    /* MDOC_File */
        ARGV_OPT_SINGLE, /* MDOC_Offset */
        ARGV_NONE,      /* MDOC_Bullet */
        ARGV_NONE,      /* MDOC_Dash */
@@ -203,6 +204,7 @@ static      int mdoc_argflags[MDOC_MAX] = {
        0, /* %Q */
        0, /* br */
        0, /* sp */
+       0, /* %U */
 };
 
 
@@ -265,23 +267,12 @@ mdoc_argv(struct mdoc *m, int line, int tok,
        if ( ! argv(m, line, &tmp, pos, buf))
                return(ARGV_ERROR);
 
-       if (NULL == (arg = *v)) {
-               *v = calloc(1, sizeof(struct mdoc_arg));
-               if (NULL == *v) {
-                       (void)mdoc_nerr(m, m->last, EMALLOC);
-                       return(ARGV_ERROR);
-               }
-               arg = *v;
-       } 
+       if (NULL == (arg = *v))
+               arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg));
 
        arg->argc++;
-       arg->argv = realloc(arg->argv, arg->argc * 
-                       sizeof(struct mdoc_argv));
-
-       if (NULL == arg->argv) {
-               (void)mdoc_nerr(m, m->last, EMALLOC);
-               return(ARGV_ERROR);
-       }
+       arg->argv = mandoc_realloc
+               (arg->argv, arg->argc * sizeof(struct mdoc_argv));
 
        (void)memcpy(&arg->argv[(int)arg->argc - 1], 
                        &tmp, sizeof(struct mdoc_argv));
@@ -672,16 +663,11 @@ argv_multi(struct mdoc *m, int line,
                else if (ARGS_EOLN == c)
                        break;
 
-               if (0 == v->sz % MULTI_STEP) {
-                       v->value = realloc(v->value, 
+               if (0 == v->sz % MULTI_STEP)
+                       v->value = mandoc_realloc(v->value, 
                                (v->sz + MULTI_STEP) * sizeof(char *));
-                       if (NULL == v->value) {
-                               (void)mdoc_nerr(m, m->last, EMALLOC);
-                               return(ARGV_ERROR);
-                       }
-               }
-               if (NULL == (v->value[(int)v->sz] = strdup(p)))
-                       return(mdoc_nerr(m, m->last, EMALLOC));
+
+               v->value[(int)v->sz] = mandoc_strdup(p);
        }
 
        return(1);
@@ -705,10 +691,8 @@ argv_opt_single(struct mdoc *m, int line,
                return(1);
 
        v->sz = 1;
-       if (NULL == (v->value = calloc(1, sizeof(char *))))
-               return(mdoc_nerr(m, m->last, EMALLOC));
-       if (NULL == (v->value[0] = strdup(p)))
-               return(mdoc_nerr(m, m->last, EMALLOC));
+       v->value = mandoc_malloc(sizeof(char *));
+       v->value[0] = mandoc_strdup(p);
 
        return(1);
 }
@@ -733,10 +717,8 @@ argv_single(struct mdoc *m, int line,
                return(mdoc_perr(m, line, ppos, EARGVAL));
 
        v->sz = 1;
-       if (NULL == (v->value = calloc(1, sizeof(char *))))
-               return(mdoc_nerr(m, m->last, EMALLOC));
-       if (NULL == (v->value[0] = strdup(p)))
-               return(mdoc_nerr(m, m->last, EMALLOC));
+       v->value = mandoc_malloc(sizeof(char *));
+       v->value[0] = mandoc_strdup(p);
 
        return(1);
 }