projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- renamed access offset functions\n- renamed entity -> ir_entity
[libfirm]
/
ir
/
adt
/
xmalloc.c
diff --git
a/ir/adt/xmalloc.c
b/ir/adt/xmalloc.c
index
b16e441
..
07252a6
100644
(file)
--- a/
ir/adt/xmalloc.c
+++ b/
ir/adt/xmalloc.c
@@
-18,23
+18,27
@@
#endif
#ifdef HAVE_ALLOCA_H
#endif
#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+#
include <alloca.h>
#endif
#ifdef HAVE_MALLOC_H
#endif
#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+#
include <malloc.h>
#endif
#ifdef HAVE_STRING_H
#endif
#ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
#endif
#endif
-
-#include <stdlib.h>
#include "xmalloc.h"
#include "xmalloc.h"
-#include "panic.h"
+#include "error.h"
+
+static NORETURN xnomem(void) {
+ panic("out of memory");
+}
-void *
-xmalloc(size_t size) {
- void *res = malloc (size);
+void *xmalloc(size_t size) {
+ void *res = malloc(size);
if (!res) xnomem();
return res;
if (!res) xnomem();
return res;
@@
-47,24
+51,15
@@
void *xcalloc(size_t num, size_t size) {
return res;
}
return res;
}
-void *
-xrealloc(void *ptr, size_t size) {
+void *xrealloc(void *ptr, size_t size) {
/* ANSI blesses realloc (0, x) but SunOS chokes on it */
void *res = ptr ? realloc (ptr, size) : malloc (size);
/* ANSI blesses realloc (0, x) but SunOS chokes on it */
void *res = ptr ? realloc (ptr, size) : malloc (size);
- if (!res) xnomem
();
+ if (!res) xnomem();
return res;
}
return res;
}
-
-char *
-xstrdup(const char *str) {
+char *xstrdup(const char *str) {
size_t len = strlen (str) + 1;
size_t len = strlen (str) + 1;
- return memcpy ((xmalloc) (len), str, len);
-}
-
-
-void
-xnomem(void) {
- panic("out of memory");
+ return memcpy((xmalloc) (len), str, len);
}
}