summaryrefslogtreecommitdiff
path: root/inotail.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2007-06-17 12:21:59 +0200
committerTobias Klauser <tklauser@xenon.tklauser.home>2007-06-17 12:21:59 +0200
commite7dd7209b8b3c7fcf0a2ca681470d33a9cb09267 (patch)
tree31321f7469221dc75f61e4b70b5dd4b272a5ac6c /inotail.c
parent72d3076d685075808fa9b1533fbaf9ea385df289 (diff)
inotail.c: emalloc should return void *
Also add the unlikely() to the check of the malloc retval. This patch seems to have gotten lost during a merge.
Diffstat (limited to 'inotail.c')
-rw-r--r--inotail.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/inotail.c b/inotail.c
index 3643c13..a9282c5 100644
--- a/inotail.c
+++ b/inotail.c
@@ -63,11 +63,11 @@ static const struct option long_opts[] = {
{ NULL, 0, NULL, 0 }
};
-static char *emalloc(size_t size)
+static void *emalloc(size_t size)
{
- char *ret = malloc(size);
+ void *ret = malloc(size);
- if (!ret) {
+ if (unlikely(!ret)) {
fprintf(stderr, "Error: Failed to allocate %d bytes of memory (%s)\n", size, strerror(errno));
exit(EXIT_FAILURE);
}