Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 841617e
Move xmalloc.h out of private
Baptiste Daroussin committed 9 years ago
commit 841617e2809168f9ec9c5d789f5911a2bcb89287
parent 23d8386
8 files changed +64 -64
modified libpkg/Makefile.am
@@ -144,7 +144,7 @@ noinst_HEADERS= private/db_upgrades.h \
			private/utils.h \

			private/pkg_jobs.h \

			private/pkg_deps.h \
- 
			private/xmalloc.h \
+ 
			xmalloc.h \

			sha256.h



SUBDIRS = repo .
modified libpkg/diff.c
@@ -25,7 +25,7 @@
#include <utstring.h>



#include "private/utils.h"
- 
#include "private/xmalloc.h"
+ 
#include "xmalloc.h"



/*

** Maximum length of a line in a text file, in bytes.  (2**13 = 8192 bytes)
modified libpkg/dns_utils.c
@@ -79,7 +79,7 @@


#include <bsd_compat.h>

#include "private/utils.h"
- 
#include "private/xmalloc.h"
+ 
#include "xmalloc.h"

#include "pkg.h"



#ifndef HAVE_LDNS
modified libpkg/pkg_deps.c
@@ -37,7 +37,7 @@
#include "pkg.h"

#include "private/event.h"

#include "private/pkg_deps.h"
- 
#include "private/xmalloc.h"
+ 
#include "xmalloc.h"

#include "utlist.h"



struct pkg_dep_formula *
modified libpkg/private/pkg.h
@@ -44,7 +44,7 @@
#include <utstring.h>

#include <ucl.h>
- 
#include "private/xmalloc.h"
+ 
#include "xmalloc.h"

#include "private/utils.h"



#define UCL_COUNT(obj) ((obj)?((obj)->len):0)
deleted libpkg/private/xmalloc.h
@@ -1,58 +0,0 @@
- 
#ifndef XMALLOC_H
- 
#define XMALLOC_H
-
- 
static inline void *xmalloc(size_t size)
- 
{
- 
	void *ptr = malloc(size);
- 
	if (ptr == NULL)
- 
		abort();
- 
	return (ptr);
- 
}
-
- 
static inline void *xcalloc(size_t n, size_t size)
- 
{
- 
	void *ptr = calloc(n, size);
- 
	if (ptr == NULL)
- 
		abort();
- 
	return (ptr);
- 
}
-
- 
static inline void *xrealloc(void *ptr, size_t size)
- 
{
- 
	ptr = realloc(ptr, size);
- 
	if (ptr == NULL)
- 
		abort();
- 
	return (ptr);
- 
}
-
- 
static inline char *xstrdup(const char *str)
- 
{
- 
	char *s = strdup(str);
- 
	if (s == NULL)
- 
		abort();
- 
	return (s);
- 
}
-
- 
static inline char *xstrndup(const char *str, size_t n)
- 
{
- 
	char *s = strndup(str, n);
- 
	if (s == NULL)
- 
		abort();
- 
	return (s);
- 
}
-
- 
static inline int xasprintf(char **ret, const char *fmt, ...)
- 
{
- 
	va_list ap;
- 
	int i;
-
- 
	va_start(ap, fmt);
- 
	i = vasprintf(ret, fmt, ap);
- 
	va_end(ap);
-
- 
	if (i < 0 || *ret == NULL)
- 
		abort();
-
- 
	return (i);
- 
}
- 
#endif
modified libpkg/utils.c
@@ -51,7 +51,7 @@
#include "pkg.h"

#include "private/event.h"

#include "private/utils.h"
- 
#include "private/xmalloc.h"
+ 
#include "xmalloc.h"



int

mkdirs(const char *_path)
added libpkg/xmalloc.h
@@ -0,0 +1,58 @@
+ 
#ifndef XMALLOC_H
+ 
#define XMALLOC_H
+
+ 
static inline void *xmalloc(size_t size)
+ 
{
+ 
	void *ptr = malloc(size);
+ 
	if (ptr == NULL)
+ 
		abort();
+ 
	return (ptr);
+ 
}
+
+ 
static inline void *xcalloc(size_t n, size_t size)
+ 
{
+ 
	void *ptr = calloc(n, size);
+ 
	if (ptr == NULL)
+ 
		abort();
+ 
	return (ptr);
+ 
}
+
+ 
static inline void *xrealloc(void *ptr, size_t size)
+ 
{
+ 
	ptr = realloc(ptr, size);
+ 
	if (ptr == NULL)
+ 
		abort();
+ 
	return (ptr);
+ 
}
+
+ 
static inline char *xstrdup(const char *str)
+ 
{
+ 
	char *s = strdup(str);
+ 
	if (s == NULL)
+ 
		abort();
+ 
	return (s);
+ 
}
+
+ 
static inline char *xstrndup(const char *str, size_t n)
+ 
{
+ 
	char *s = strndup(str, n);
+ 
	if (s == NULL)
+ 
		abort();
+ 
	return (s);
+ 
}
+
+ 
static inline int xasprintf(char **ret, const char *fmt, ...)
+ 
{
+ 
	va_list ap;
+ 
	int i;
+
+ 
	va_start(ap, fmt);
+ 
	i = vasprintf(ret, fmt, ap);
+ 
	va_end(ap);
+
+ 
	if (i < 0 || *ret == NULL)
+ 
		abort();
+
+ 
	return (i);
+ 
}
+ 
#endif