projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.setoutfile name file command added
[libfirm]
/
ir
/
adt
/
xmalloc.c
diff --git
a/ir/adt/xmalloc.c
b/ir/adt/xmalloc.c
index
89ab63a
..
b16e441
100644
(file)
--- a/
ir/adt/xmalloc.c
+++ b/
ir/adt/xmalloc.c
@@
-14,29
+14,41
@@
[reimplement xstrdup, ... ] */
#ifdef HAVE_CONFIG_H
[reimplement xstrdup, ... ] */
#ifdef HAVE_CONFIG_H
-# include
<config.h>
+# include
"config.h"
#endif
#endif
-#include <stdlib.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
#include <string.h>
+#endif
+
+#include <stdlib.h>
#include "xmalloc.h"
#include "panic.h"
#include "xmalloc.h"
#include "panic.h"
-
void *
void *
-(xmalloc) (size_t size)
-{
+xmalloc(size_t size) {
void *res = malloc (size);
void *res = malloc (size);
- if (!res) xnomem
();
+ if (!res) xnomem();
return res;
}
return res;
}
+void *xcalloc(size_t num, size_t size) {
+ void *res = calloc(num, size);
+
+ if (!res) xnomem();
+ return res;
+}
void *
void *
-(xrealloc) (void *ptr, size_t size)
-{
+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);
@@
-46,15
+58,13
@@
void *
char *
char *
-(xstrdup) (const char *str)
-{
+xstrdup(const char *str) {
size_t len = strlen (str) + 1;
return memcpy ((xmalloc) (len), str, len);
}
void
size_t len = strlen (str) + 1;
return memcpy ((xmalloc) (len), str, len);
}
void
-xnomem (void)
-{
- panic ("out of memory");
+xnomem(void) {
+ panic("out of memory");
}
}