Strings abstracted into dynamically-created C files.

[mandoc.git] / xstd.c

diff --git a/xstd.c b/xstd.c
index eb36b404f85deaebc23b4e9266d7ac0a2bbd8c58..d41cb69617e7862b5389dffc481af7c7576f84ef 100644 (file)
--- a/xstd.c
+++ b/xstd.c
@@ -1,4 +1,4 @@
-/* $Id: xstd.c,v 1.3 2009/01/17 16:15:27 kristaps Exp $ */
+/* $Id: xstd.c,v 1.7 2009/03/06 14:13:47 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -23,12 +23,24 @@
 
 #include "private.h"
 
 
 #include "private.h"
 

+/*
+ * Contains wrappers for common functions to simplify their general
+ * usage throughout this codebase.
+ */
+

 #ifdef __linux__
 extern size_t           strlcat(char *, const char *, size_t);
 extern size_t           strlcpy(char *, const char *, size_t);
 #endif
 
 
 #ifdef __linux__
 extern size_t           strlcat(char *, const char *, size_t);
 extern size_t           strlcpy(char *, const char *, size_t);
 #endif
 
 

+int
+xstrncmp(const char *p1, const char *p2, size_t sz)
+{
+
+       return(0 == strncmp(p1, p2, sz));
+}
+

 int
 xstrcmp(const char *p1, const char *p2)
 {
 int
 xstrcmp(const char *p1, const char *p2)
 {


@@ -36,7 +48,6 @@ xstrcmp(const char *p1, const char *p2)
        return(0 == strcmp(p1, p2));
 }
 
        return(0 == strcmp(p1, p2));
 }
 

-

 int
 xstrlcat(char *dst, const char *src, size_t sz)
 {
 int
 xstrlcat(char *dst, const char *src, size_t sz)
 {


@@ -44,7 +55,6 @@ xstrlcat(char *dst, const char *src, size_t sz)
        return(strlcat(dst, src, sz) < sz);
 }
 
        return(strlcat(dst, src, sz) < sz);
 }
 

-

 int
 xstrlcpy(char *dst, const char *src, size_t sz)
 {
 int
 xstrlcpy(char *dst, const char *src, size_t sz)
 {


@@ -52,7 +62,15 @@ xstrlcpy(char *dst, const char *src, size_t sz)
        return(strlcpy(dst, src, sz) < sz);
 }
 
        return(strlcpy(dst, src, sz) < sz);
 }
 

+void *
+xrealloc(void *ptr, size_t sz)
+{
+       void            *p;

 
 

+       if (NULL == (p = realloc(ptr, sz)))
+               err(EXIT_FAILURE, "realloc");
+       return(p);
+}

 
 void *
 xcalloc(size_t num, size_t sz)
 
 void *
 xcalloc(size_t num, size_t sz)


@@ -64,7 +82,6 @@ xcalloc(size_t num, size_t sz)
        return(p);
 }
 
        return(p);
 }
 

-

 char *
 xstrdup(const char *p)
 {
 char *
 xstrdup(const char *p)
 {


@@ -75,9 +92,8 @@ xstrdup(const char *p)
        return(pp);
 }
 
        return(pp);
 }
 

-

 int
 int

-xstrlcats(char *buf, const struct mdoc_node *n, size_t sz)
+xstrlcpys(char *buf, const struct mdoc_node *n, size_t sz)

 {
        char             *p;
 
 {
        char             *p;
 


@@ -97,9 +113,6 @@ xstrlcats(char *buf, const struct mdoc_node *n, size_t sz)
        return(1);
 }
 
        return(1);
 }
 

-
-
-

 #ifdef __linux__
 /*     $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $      */
 
 #ifdef __linux__
 /*     $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $      */
 


@@ -151,7 +164,6 @@ strlcat(char *dst, const char *src, size_t siz)
        return(dlen + (s - src));       /* count does not include NUL */
 }
 
        return(dlen + (s - src));       /* count does not include NUL */
 }
 

-

 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {