kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_con: allow for NULL to do nothing.

This commit is contained in:
Cedric Bail 2018-05-17 14:08:05 -07:00 committed by Cedric BAIL
parent 13ae5b1f0c
commit 301340baf6
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/ecore_con/ecore_con_legacy.c
View File

@ -88,15 +88,16 @@ typedef struct _Ecore_Con_Lookup_Ctx {
} Ecore_Con_Lookup_Ctx; } Ecore_Con_Lookup_Ctx;
/* allows delete_me to be true */ /* allows delete_me to be true */
#define ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, ...) \ #define ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, ...) \
do \ do \
{ \ { \
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ if (!svr) return __VA_ARGS__; \
{ \ if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \
{ \
ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \
return __VA_ARGS__; \ return __VA_ARGS__; \
} \ } \
} \ } \
while (0) while (0)
#define ECORE_CON_SERVER_CHECK_RETURN(svr, ...) \ #define ECORE_CON_SERVER_CHECK_RETURN(svr, ...) \
@ -107,15 +108,16 @@ typedef struct _Ecore_Con_Lookup_Ctx {
} \ } \
while (0) while (0)
#define ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, ...) \ #define ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, ...) \
do \ do \
{ \ { \
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ if (!cl) return __VA_ARGS__; \
{ \ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \
{ \
ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \
return __VA_ARGS__; \ return __VA_ARGS__; \
} \ } \
} \ } \
while (0) while (0)
#define ECORE_CON_CLIENT_CHECK_RETURN(cl, ...) \ #define ECORE_CON_CLIENT_CHECK_RETURN(cl, ...) \