summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2017-04-02 21:47:03 +0200
committerDaniel Friesel <derf@finalrewind.org>2017-04-02 21:47:03 +0200
commit03a649231e5016b81e49a76880bade8925dc816c (patch)
tree90c3e6e7cda8b734717117864059546f52ee3c90
parent3b23637b1cc27120febcec6d8a3fea4cda9c1bda (diff)
replace _emalloc with emalloc (is the same unless DMALLOC is used)
-rw-r--r--src/timers.c2
-rw-r--r--src/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/timers.c b/src/timers.c
index 3343445..1cac94b 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -95,7 +95,7 @@ void feh_add_timer(void (*func) (void *data), void *data, double in, char *name)
D(("adding timer %s for %f seconds time\n", name, in));
feh_remove_timer(name);
- ft = malloc(sizeof(_fehtimer));
+ ft = emalloc(sizeof(_fehtimer));
ft->next = NULL;
ft->func = func;
ft->data = data;
diff --git a/src/utils.c b/src/utils.c
index e02d807..4c06a48 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -122,7 +122,7 @@ char *estrjoin(const char *separator, ...)
s = va_arg(args, char *);
}
va_end(args);
- string = _emalloc(sizeof(char) * (len + 1));
+ string = emalloc(sizeof(char) * (len + 1));
*string = 0;
va_start(args, separator);