From: Lennart Poettering Date: Fri, 22 Mar 2013 20:05:42 +0000 (+0100) Subject: udev: no need to output OOM, if we call log_oom() anyway X-Git-Tag: v199~76 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2852ae213402930b868d366b38c717991c97785c udev: no need to output OOM, if we call log_oom() anyway --- diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c index 6580a091e..f95ee23b7 100644 --- a/src/udev/collect/collect.c +++ b/src/udev/collect/collect.c @@ -35,8 +35,8 @@ #include "libudev-private.h" #include "macro.h" -#define BUFSIZE 16 -#define UDEV_ALARM_TIMEOUT 180 +#define BUFSIZE 16 +#define UDEV_ALARM_TIMEOUT 180 enum collect_state { STATE_NONE, @@ -140,10 +140,8 @@ static int checkout(int fd) restart: len = bufsize >> 1; buf = malloc(bufsize + 1); - if (!buf) { - fprintf(stderr, "Out of memory.\n"); + if (!buf) return log_oom(); - } memset(buf, ' ', bufsize); buf[bufsize] = '\0';