projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move (void) parameter detection into a separate function, simplify daisy chaining...
[cparser]
/
adt
/
xmalloc.c
diff --git
a/adt/xmalloc.c
b/adt/xmalloc.c
index
4d91c77
..
bf3af9f
100644
(file)
--- a/
adt/xmalloc.c
+++ b/
adt/xmalloc.c
@@
-42,11
+42,13
@@
#include "util.h"
static inline __attribute__((noreturn))
#include "util.h"
static inline __attribute__((noreturn))
-void out_of_memory(void) {
+void out_of_memory(void)
+{
panic("out of memory");
}
panic("out of memory");
}
-void *xmalloc(size_t size) {
+void *xmalloc(size_t size)
+{
void *res = malloc(size);
if (UNLIKELY(res == NULL))
void *res = malloc(size);
if (UNLIKELY(res == NULL))
@@
-55,7
+57,8
@@
void *xmalloc(size_t size) {
return res;
}
return res;
}
-void *xcalloc(size_t num, size_t size) {
+void *xcalloc(size_t num, size_t size)
+{
void *res = calloc(num, size);
if (UNLIKELY(res == NULL))
void *res = calloc(num, size);
if (UNLIKELY(res == NULL))
@@
-64,7
+67,8
@@
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)
+{
void *res = realloc (ptr, size);
if (UNLIKELY(res == NULL))
void *res = realloc (ptr, size);
if (UNLIKELY(res == NULL))
@@
-73,7
+77,8
@@
void *xrealloc(void *ptr, size_t size) {
return res;
}
return res;
}
-char *xstrdup(const char *str) {
+char *xstrdup(const char *str)
+{
size_t len = strlen(str) + 1;
char *res = xmalloc(len);
memcpy(res, str, len);
size_t len = strlen(str) + 1;
char *res = xmalloc(len);
memcpy(res, str, len);