From 6dc1e7e0ba35c078b533d06a4933edae38fd94ad Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 26 Jul 2012 14:23:49 +0200 Subject: log: out-of-line __log_oom() The callers' code gets smaller. --- src/shared/log.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/shared/log.h') diff --git a/src/shared/log.h b/src/shared/log.h index 7c3376c31e..ab894df172 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) -- cgit v1.2.3-54-g00ecf