diff options
| author | Cedric Bail <cedric.bail@free.fr> | 2018-05-17 14:08:05 -0700 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-05-22 16:55:09 -0700 |
| commit | a7e8dec27662224969ebbd4b395c7e9fdde8cfd4 (patch) | |
| tree | b675f067fab190e7921b405804b2c0e6e0e0abfe | |
| parent | e5f5cd8387621d8dbcec253892ce778dc01cf54d (diff) | |
| download | efl-a7e8dec27662224969ebbd4b395c7e9fdde8cfd4.tar.gz | |
ecore_con: allow for NULL to do nothing.
| -rw-r--r-- | src/lib/ecore_con/ecore_con_legacy.c | 34 |
1 files 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, ...) \ |