From 301340baf688e297fbe57e880f9f75e7d85ea577 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Thu, 17 May 2018 14:08:05 -0700 Subject: [PATCH] ecore_con: allow for NULL to do nothing. --- src/lib/ecore_con/ecore_con_legacy.c | 34 +++++++++++++++------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index f5643bbc00..e4e631c922 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -88,15 +88,16 @@ typedef struct _Ecore_Con_Lookup_Ctx { } Ecore_Con_Lookup_Ctx; /* allows delete_me to be true */ -#define ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, ...) \ - do \ - { \ - if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ - { \ +#define ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, ...) \ + do \ + { \ + if (!svr) return __VA_ARGS__; \ + if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ + { \ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ - return __VA_ARGS__; \ - } \ - } \ + return __VA_ARGS__; \ + } \ + } \ while (0) #define ECORE_CON_SERVER_CHECK_RETURN(svr, ...) \ @@ -107,15 +108,16 @@ typedef struct _Ecore_Con_Lookup_Ctx { } \ while (0) -#define ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, ...) \ - do \ - { \ - if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ - { \ +#define ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, ...) \ + do \ + { \ + if (!cl) return __VA_ARGS__; \ + if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ + { \ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ - return __VA_ARGS__; \ - } \ - } \ + return __VA_ARGS__; \ + } \ + } \ while (0) #define ECORE_CON_CLIENT_CHECK_RETURN(cl, ...) \