Mention the manual page name and section in the HTML page <title>.

[mandoc.git] / mandoc_aux.c

diff --git a/mandoc_aux.c b/mandoc_aux.c
index 25666a275ddb402dd03c962759c628b19e02660c..cc74b7e720586f6c55cd3e7d29781cc314771153 100644 (file)
--- a/mandoc_aux.c
+++ b/mandoc_aux.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc_aux.c,v 1.1 2014/03/23 11:59:17 schwarze Exp $ */
+/*     $Id: mandoc_aux.c,v 1.9 2015/11/07 14:22:29 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -15,8 +15,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+

 #include <sys/types.h>
 
 #include <sys/types.h>
 

+#if HAVE_ERR
+#include <err.h>
+#endif

 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>


@@ -25,6 +30,7 @@
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 

+

 int
 mandoc_asprintf(char **dest, const char *fmt, ...)
 {
 int
 mandoc_asprintf(char **dest, const char *fmt, ...)
 {


@@ -35,11 +41,9 @@ mandoc_asprintf(char **dest, const char *fmt, ...)
        ret = vasprintf(dest, fmt, ap);
        va_end(ap);
 
        ret = vasprintf(dest, fmt, ap);
        va_end(ap);
 

-       if (-1 == ret) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       return(ret);
+       if (ret == -1)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return ret;

 }
 
 void *
 }
 
 void *


@@ -48,11 +52,9 @@ mandoc_calloc(size_t num, size_t size)
        void    *ptr;
 
        ptr = calloc(num, size);
        void    *ptr;
 
        ptr = calloc(num, size);

-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       return(ptr);
+       if (ptr == NULL)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return ptr;

 }
 
 void *
 }
 
 void *


@@ -61,11 +63,9 @@ mandoc_malloc(size_t size)
        void    *ptr;
 
        ptr = malloc(size);
        void    *ptr;
 
        ptr = malloc(size);

-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       return(ptr);
+       if (ptr == NULL)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return ptr;

 }
 
 void *
 }
 
 void *


@@ -73,11 +73,19 @@ mandoc_realloc(void *ptr, size_t size)
 {
 
        ptr = realloc(ptr, size);
 {
 
        ptr = realloc(ptr, size);

-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       return(ptr);
+       if (ptr == NULL)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return ptr;
+}
+
+void *
+mandoc_reallocarray(void *ptr, size_t num, size_t size)
+{
+
+       ptr = reallocarray(ptr, num, size);
+       if (ptr == NULL)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return ptr;

 }
 
 char *
 }
 
 char *


@@ -86,11 +94,9 @@ mandoc_strdup(const char *ptr)
        char    *p;
 
        p = strdup(ptr);
        char    *p;
 
        p = strdup(ptr);

-       if (NULL == p) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       return(p);
+       if (p == NULL)
+               err((int)MANDOCLEVEL_SYSERR, NULL);
+       return p;

 }
 
 char *
 }
 
 char *


@@ -101,5 +107,5 @@ mandoc_strndup(const char *ptr, size_t sz)
        p = mandoc_malloc(sz + 1);
        memcpy(p, ptr, sz);
        p[(int)sz] = '\0';
        p = mandoc_malloc(sz + 1);
        memcpy(p, ptr, sz);
        p[(int)sz] = '\0';

-       return(p);
+       return p;

 }
 }