Adding upstream version 2:4.0.4.upstream/2%4.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 60 insertions, 0 deletions

diff --git a/local/xalloc.h b/local/xalloc.h
new file mode 100644
index 0000000..a804689
--- /dev/null
+++ b/local/xalloc.h
@@ -0,0 +1,60 @@
+/*
+ * This header was copied from util-linux at fall 2011.
+ */
+
+/*
+ * General memory allocation wrappers for malloc, realloc, calloc
+ * and strdup.
+ */
+
+#ifndef PROCPS_NG_XALLOC_H
+#define PROCPS_NG_XALLOC_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "c.h"
+
+#ifndef XALLOC_EXIT_CODE
+# define XALLOC_EXIT_CODE EXIT_FAILURE
+#endif
+
+static inline __ul_alloc_size(1)
+void *xmalloc(const size_t size)
+{
+	void *ret = malloc(size);
+	if (!ret && size)
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+	return ret;
+}
+
+static inline __ul_alloc_size(2)
+void *xrealloc(void *ptr, const size_t size)
+{
+	void *ret = realloc(ptr, size);
+	if (!ret && size)
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", size);
+	return ret;
+}
+
+static inline __ul_calloc_size(1, 2)
+void *xcalloc(const size_t nelems, const size_t size)
+{
+	void *ret = calloc(nelems, size);
+	if (!ret && size && nelems)
+		xerrx(XALLOC_EXIT_CODE, "cannot allocate %zu bytes", nelems*size);
+	return ret;
+}
+
+static inline char *xstrdup(const char *str)
+{
+	char *ret;
+	if (!str)
+		return NULL;
+	ret = strdup(str);
+	if (!ret)
+		xerrx(XALLOC_EXIT_CODE, "cannot duplicate string");
+	return ret;
+}
+
+#endif /* PROCPS_NG_XALLOC_H */