avoid repetitive code for asprintf error handling

[mandoc.git] / mansearch.c

diff --git a/mansearch.c b/mansearch.c
index d53cc2a67000c68dc47db0e16b2b33d11bdbcd53..2fb196c9c5d7cd4c5a4b7cbffe81d38ea31404f6 100644 (file)
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.c,v 1.23 2014/03/23 11:25:26 schwarze Exp $ */
+/*     $Id: mansearch.c,v 1.24 2014/03/23 12:11:18 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -338,11 +338,8 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
                    (strcmp(sec, prevsec) ||
                     strcmp(arch, prevarch))) {
                        sep2 = '\0' == *prevarch ? "" : "/";
-                       if (-1 == asprintf(&newnames, "%s(%s%s%s)",
-                           oldnames, prevsec, sep2, prevarch)) {
-                               perror(0);
-                               exit((int)MANDOCLEVEL_SYSERR);
-                       }
+                       mandoc_asprintf(&newnames, "%s(%s%s%s)",
+                           oldnames, prevsec, sep2, prevarch);
                        free(mpage->names);
                        oldnames = mpage->names = newnames;
                        free(prevsec);
@@ -359,11 +356,8 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 
                /* Append the new name. */
 
-               if (-1 == asprintf(&newnames, "%s%s%s",
-                   oldnames, sep1, name)) {
-                       perror(0);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               mandoc_asprintf(&newnames, "%s%s%s",
+                   oldnames, sep1, name);
                free(mpage->names);
                mpage->names = newnames;
 
@@ -380,11 +374,8 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
                        fsec = "0";
                }
                sep2 = '\0' == *arch ? "" : "/";
-               if (-1 == asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
-                   path, sep1, sec, sep2, arch, name, fsec)) {
-                       perror(0);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
+                   path, sep1, sec, sep2, arch, name, fsec);
        }
        if (SQLITE_DONE != c)
                fprintf(stderr, "%s\n", sqlite3_errmsg(db));
@@ -394,11 +385,8 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 
        if (NULL != prevsec) {
                sep2 = '\0' == *prevarch ? "" : "/";
-               if (-1 == asprintf(&newnames, "%s(%s%s%s)",
-                   mpage->names, prevsec, sep2, prevarch)) {
-                       perror(0);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               mandoc_asprintf(&newnames, "%s(%s%s%s)",
+                   mpage->names, prevsec, sep2, prevarch);
                free(mpage->names);
                mpage->names = newnames;
                free(prevsec);
@@ -427,11 +415,8 @@ buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit)
                        sep1 = " # ";
                }
                data = sqlite3_column_text(s, 1);
-               if (-1 == asprintf(&newoutput, "%s%s%s",
-                   oldoutput, sep1, data)) {
-                       perror(0);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               mandoc_asprintf(&newoutput, "%s%s%s",
+                   oldoutput, sep1, data);
                free(output);
                output = newoutput;
        }
@@ -603,10 +588,7 @@ exprspec(struct expr *cur, uint64_t key, const char *value,
        if (NULL == value)
                return(cur);
 
-       if (-1 == asprintf(&cp, format, value)) {
-               perror(0);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
+       mandoc_asprintf(&cp, format, value);
        cur->next = mandoc_calloc(1, sizeof(struct expr));
        cur = cur->next;
        cur->and = 1;