X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flog.h;h=ab894df172ef724776cce154847684e681336fbb;hb=e627440b41bb0284e4892f7aa9d84c77972487e2;hp=7c3376c31e5efdda0ecc2eb7106294635c6a6eff;hpb=cd6f1c0f87fd3e3345e51476e25cd1104efb7fa3;p=elogind.git diff --git a/src/shared/log.h b/src/shared/log.h index 7c3376c31..ab894df17 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -103,11 +103,8 @@ int log_dump_internal( #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__) #define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__, __VA_ARGS__) -/* This must be a macro for __LINE__ etc. to work */ -#define log_oom() ({ \ - log_error("Out of memory."); \ - -ENOMEM; \ -}) +int __log_oom(const char *file, int line, const char *func); +#define log_oom() __log_oom(__FILE__, __LINE__, __func__) /* This modifies the buffer passed! */ #define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)