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

efl: Unified eina critical manro to CRI. 

Being annoyed by different types of eina critical macros - CRI, CRIT,
 CRITICAL -, I concluded to unify them to one. Discussed on IRC and
 finally, CRI was chosen to meet the consistency with other macros -
 ERR, WRN, INF, DBG - in terms of the number of characters.
If there is any missing bits, please let me know.
This commit is contained in:
Daniel Juyung Seo 2013-12-26 12:22:05 +09:00
parent 10dd650d90
commit 76d8532b54
94 changed files with 289 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/edje/edje_cc.h
View File

@ -30,10 +30,10 @@ extern int _edje_cc_log_dom ;
# undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
#ifdef DBG
# undef DBG
#endif

2
src/bin/edje/edje_cc_parse.c
View File

@ -808,7 +808,7 @@ compile(void)
fd = mkstemp(tmpn);
if (fd < 0)
{
CRIT("Unable to open temp file \"%s\" for pre-processor.", tmpn);
CRI("Unable to open temp file \"%s\" for pre-processor.", tmpn);
exit(-1);
}

6
src/bin/edje/edje_decc.h
View File

@ -19,10 +19,10 @@ extern int _edje_cc_log_dom ;
# undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
#ifdef DBG
# undef DBG
#endif

2
src/bin/edje/edje_external_inspector.c
View File

@ -15,7 +15,7 @@ static int _log_dom;
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
#define CRIT(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define INDENT " "
#define INDENT2 INDENT INDENT

2
src/bin/edje/edje_inspector.c
View File

@ -20,7 +20,7 @@ static int _log_dom;
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
#define CRIT(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define INDENT " "
#define INDENT2 INDENT INDENT

8
src/bin/eet/eet_main.c
View File

@ -35,10 +35,10 @@ static int _eet_main_log_dom = -1;
#undef WRN
#endif /* ifdef WRN */
#define WRN(...) EINA_LOG_DOM_WARN(_eet_main_log_dom, __VA_ARGS__)
#ifdef CRIT
#undef CRIT
#endif /* ifdef CRIT */
#define CRIT(...) EINA_LOG_DOM_CRIT(_eet_main_log_dom, __VA_ARGS__)
#ifdef CRI
#undef CRI
#endif /* ifdef CRI */
#define CRI(...) EINA_LOG_DOM_CRIT(_eet_main_log_dom, __VA_ARGS__)
static void
do_eet_list(const char *file, Eina_Bool verbose)

6
src/bin/efreet/efreetd.h
View File

@ -8,10 +8,10 @@
extern int efreetd_log_dom;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(efreetd_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(efreetd_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR
#endif

8
src/bin/ethumb_client/ethumbd.c
View File

@ -51,7 +51,7 @@
#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__)
#define CRIT(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
static const char _ethumb_dbus_bus_name[] = "org.enlightenment.Ethumb";
static const char _ethumb_dbus_interface[] = "org.enlightenment.Ethumb";
@ -786,7 +786,7 @@ _ethumb_table_append(Ethumbd *ed)
tmp = realloc(q->table, new_max * sizeof(Ethumbd_Object));
if (!tmp)
{
CRIT("could not realloc q->table to %zd bytes: %s",
CRI("could not realloc q->table to %zd bytes: %s",
new_max * sizeof(Ethumbd_Object), strerror(errno));
return -1;
}
@ -796,7 +796,7 @@ _ethumb_table_append(Ethumbd *ed)
tmp = realloc(q->list, new_max * sizeof(int));
if (!tmp)
{
CRIT("could not realloc q->list to %zd bytes: %s",
CRI("could not realloc q->list to %zd bytes: %s",
new_max * sizeof(int), strerror(errno));
return -1;
}
@ -813,7 +813,7 @@ _ethumb_table_append(Ethumbd *ed)
if (i >= q->max_count)
{
CRIT("cannot find free table slot in table of %i", q->max_count);
CRI("cannot find free table slot in table of %i", q->max_count);
return -1;
}

8
src/bin/evas/evas_cserve2.h
View File

@ -8,13 +8,13 @@
#define CSERVE2_LOG_LEVEL 4
#endif
#ifdef CRIT
#undef CRIT
#ifdef CRI
#undef CRI
#endif
#if CSERVE2_LOG_LEVEL >= 0
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_cserve2_bin_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_cserve2_bin_log_dom, __VA_ARGS__)
#else
#define CRIT(...) do {} while(0)
#define CRI(...) do {} while(0)
#endif
#ifdef ERR

4
src/bin/evas/evas_cserve2_cache.c
View File

@ -1054,7 +1054,7 @@ _image_entry_free(Image_Entry *ientry)
idata = _image_data_find(ENTRYID(ientry));
if (!idata || !idata->refcount)
{
CRIT("Trying to free already freed object: %u", ENTRYID(ientry));
CRI("Trying to free already freed object: %u", ENTRYID(ientry));
return;
}
@ -2795,7 +2795,7 @@ do_scaling:
{
if (orig_entry->base.id != image_id)
{
CRIT("Entry IDs mismatch");
CRI("Entry IDs mismatch");
return -1;
}
orig_entry->base.request = cserve2_request_add(

8
src/bin/evas/evas_cserve2_index.c
View File

@ -820,7 +820,7 @@ _shared_mempool_buffer_del(Shared_Mempool *sm, int bufferid)
ie = _shared_index_entry_get_by_id(sm->index, bufferid);
if (!ie || ie->refcount <= 0)
{
CRIT("Tried to delete invalid buffer or with refcount 0");
CRI("Tried to delete invalid buffer or with refcount 0");
return NULL;
}
@ -857,7 +857,7 @@ cserve2_shared_mempool_buffer_get(Shared_Mempool *sm, int bufferid)
ie = _shared_index_entry_get_by_id(sm->index, bufferid);
if (!ie || ie->refcount <= 0)
{
CRIT("Tried to access invalid buffer or with refcount 0");
CRI("Tried to access invalid buffer or with refcount 0");
return NULL;
}
@ -874,7 +874,7 @@ cserve2_shared_mempool_buffer_offset_get(Shared_Mempool *sm, int bufferid)
ie = _shared_index_entry_get_by_id(sm->index, bufferid);
if (!ie || ie->refcount <= 0)
{
CRIT("Tried to access invalid buffer or with refcount 0");
CRI("Tried to access invalid buffer or with refcount 0");
return -1;
}
@ -1000,7 +1000,7 @@ cserve2_shared_string_del(int id)
if (!eina_hash_del_by_key(_string_entries, data))
{
if (!eina_hash_del_by_data(_string_entries, (void *) (intptr_t) id))
CRIT("Invalid free");
CRI("Invalid free");
}
}
_shared_strings_unref_items++;

2
src/bin/evas/evas_cserve2_requests.c
View File

@ -296,7 +296,7 @@ cserve2_request_dependents_drop(Slave_Request *req, Slave_Request_Type type)
if (type != CSERVE2_REQ_IMAGE_SPEC_LOAD)
{
CRIT("Only CSERVE2_REQ_IMAGE_SPEC_LOAD is supported.");
CRI("Only CSERVE2_REQ_IMAGE_SPEC_LOAD is supported.");
return;
}

4
src/bin/evas/evas_cserve2_shm.c
View File

@ -168,13 +168,13 @@ cserve2_shm_resize(Shm_Handle *shm, size_t newsize)
if (shm->map_offset || shm->image_offset)
{
CRIT("Can not resize shm with non-zero offset");
CRI("Can not resize shm with non-zero offset");
return NULL;
}
if (eina_inlist_count(shm->mapping->segments) > 1)
{
CRIT("Can not resize shm with more than one segment");
CRI("Can not resize shm with more than one segment");
return NULL;
}

2
src/edje_external/emotion/emotion.c
View File

@ -44,7 +44,7 @@ struct _External_Emotion_Signals_Proxy_Context
};
static int _log_dom = -1;
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)

6
src/examples/ephysics/ephysics_test.h
View File

@ -33,10 +33,10 @@
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_test_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ephysics_test_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ephysics_test_log_dom, __VA_ARGS__)
#define EPHYSICS_TEST_THEME "ephysics_test"
#define WIDTH (512)

2
src/lib/ecore/ecore_main.c
View File

@ -858,7 +858,7 @@ _ecore_main_loop_init(void)
#ifdef USE_G_MAIN_LOOP
ecore_glib_source = g_source_new(&ecore_gsource_funcs, sizeof (GSource));
if (!ecore_glib_source)
CRIT("Failed to create glib source for epoll!");
CRI("Failed to create glib source for epoll!");
else
{
g_source_set_priority(ecore_glib_source, G_PRIORITY_HIGH_IDLE + 20);

6
src/lib/ecore/ecore_private.h
View File

@ -34,10 +34,10 @@ extern int _ecore_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
#ifndef PATH_MAX
# define PATH_MAX 4096

8
src/lib/ecore/ecore_time.c
View File

@ -57,7 +57,7 @@ ecore_time_get(void)
if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t)))
{
CRIT("Cannot get current time.");
CRI("Cannot get current time.");
/* Try to at least return the latest value retrieved*/
return _ecore_time_loop_time;
}
@ -152,7 +152,7 @@ _ecore_time_init(void)
else
{
_ecore_time_clock_id = -2;
CRIT("Cannot get a valid clock_gettime() clock id! "
CRI("Cannot get a valid clock_gettime() clock id! "
"Fallback to unix time.");
}
#else
@ -170,8 +170,8 @@ _ecore_time_init(void)
}
# else
# warning "Your platform isn't supported yet"
CRIT("Platform does not support clock_gettime. "
"Fallback to unix time.");
CRI("Platform does not support clock_gettime. "
"Fallback to unix time.");
# endif
# endif
#endif

6
src/lib/ecore_audio/ecore_audio_private.h
View File

@ -57,10 +57,10 @@ extern int _ecore_audio_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_audio_log_dom, __VA_ARGS__)
#ifdef CRIT
#undef CRIT
#ifdef CRI
#undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_audio_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_audio_log_dom, __VA_ARGS__)
/**
* @defgroup Ecore_Audio_Module_API_Group Ecore_Audio_Module_API - API for modules

6
src/lib/ecore_con/ecore_con_private.h
View File

@ -47,10 +47,10 @@ extern int _ecore_con_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_con_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_con_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_con_log_dom, __VA_ARGS__)
typedef struct _Ecore_Con_Lookup Ecore_Con_Lookup;
typedef struct _Ecore_Con_Info Ecore_Con_Info;

2
src/lib/ecore_con/ecore_con_socks.c
View File

@ -355,7 +355,7 @@ _ecore_con_socks_read_v5(Ecore_Con_Server *svr, Ecore_Con_Socks_v5 *v5, const un
switch (v5->method)
{
case ECORE_CON_SOCKS_V5_METHOD_NONE:
CRIT("HOW DID THIS HAPPEN?????????");
CRI("HOW DID THIS HAPPEN?????????");
goto error;
case ECORE_CON_SOCKS_V5_METHOD_GSSAPI:

2
src/lib/ecore_evas/ecore_evas.c
View File

@ -171,7 +171,7 @@ _ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname)
return i;
}
CRIT("Ecore_Evas %p (engine: %s) does not have interface '%s'",
CRI("Ecore_Evas %p (engine: %s) does not have interface '%s'",
ee, ee->driver, iname);
return NULL;

6
src/lib/ecore_evas/ecore_evas_private.h
View File

@ -28,10 +28,10 @@ EAPI extern int _ecore_evas_log_dom;
# undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_evas_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
#define IDLE_FLUSH_TIME 0.5

2
src/lib/ecore_file/ecore_file_download.c
View File

@ -93,7 +93,7 @@ _ecore_file_download(const char *url,
{
if (!url)
{
CRIT("Download URL is null");
CRI("Download URL is null");
return EINA_FALSE;
}

6
src/lib/ecore_file/ecore_file_private.h
View File

@ -48,10 +48,10 @@ extern int _ecore_file_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_file_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_file_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_file_log_dom, __VA_ARGS__)
/* ecore_file_monitor */
int ecore_file_monitor_init(void);

6
src/lib/ecore_imf/ecore_imf_private.h
View File

@ -29,10 +29,10 @@ extern int _ecore_imf_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_imf_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_imf_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_imf_log_dom, __VA_ARGS__)
typedef struct _Ecore_IMF_Module Ecore_IMF_Module;
typedef struct _Ecore_IMF_Func_Node Ecore_IMF_Func_Node;

6
src/lib/ecore_input/ecore_input_private.h
View File

@ -29,9 +29,9 @@ extern int _ecore_input_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__)
#endif

6
src/lib/ecore_input_evas/ecore_input_evas_private.h
View File

@ -29,9 +29,9 @@ extern int _ecore_input_evas_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_evas_log_dom, __VA_ARGS__)
#ifdef CRIT
#undef CRIT
#ifdef CRI
#undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_evas_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_input_evas_log_dom, __VA_ARGS__)
#endif

6
src/lib/ecore_ipc/ecore_ipc_private.h
View File

@ -29,10 +29,10 @@ extern int _ecore_ipc_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_ipc_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_ipc_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_ipc_log_dom, __VA_ARGS__)
#define ECORE_MAGIC_IPC_SERVER 0x87786556
#define ECORE_MAGIC_IPC_CLIENT 0x78875665

6
src/lib/ecore_psl1ght/ecore_psl1ght_private.h
View File

@ -28,9 +28,9 @@ extern int _ecore_psl1ght_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_ecore_psl1ght_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_psl1ght_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_psl1ght_log_dom, __VA_ARGS__)
#endif

6
src/lib/ecore_sdl/ecore_sdl_private.h
View File

@ -28,9 +28,9 @@ extern int _ecore_sdl_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__)
#endif

6
src/lib/ecore_wayland/ecore_wl_private.h
View File

@ -45,10 +45,10 @@ extern Ecore_Wl_Display *_ecore_wl_disp;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_ecore_wl_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__)
struct _Ecore_Wl_Display

2
src/lib/ecore_x/xcb/ecore_xcb.c
View File

@ -203,7 +203,7 @@ ecore_x_init(const char *name)
if (xcb_connection_has_error(_ecore_xcb_conn))
{
CRIT("XCB Connection has error");
CRI("XCB Connection has error");
eina_log_domain_unregister(_ecore_xcb_log_dom);
_ecore_xcb_log_dom = -1;
ecore_event_shutdown();

6
src/lib/ecore_x/xcb/ecore_xcb_error.c
View File

@ -100,11 +100,11 @@ _ecore_xcb_error_handle(xcb_generic_error_t *err)
int
_ecore_xcb_io_error_handle(xcb_generic_error_t *err)
{
CRIT("IO Error:");
CRI("IO Error:");
if (err)
{
CRIT("\tRequest: %d", err->sequence);
CRIT("\tCode: %d", err->error_code);
CRI("\tRequest: %d", err->sequence);
CRI("\tCode: %d", err->error_code);
}
if (_io_error_func)
_io_error_func(_io_error_data);

6
src/lib/ecore_x/xcb/ecore_xcb_private.h
View File

@ -57,10 +57,10 @@ extern int _ecore_xcb_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_ecore_xcb_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_xcb_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_xcb_log_dom, __VA_ARGS__)
# ifdef LOGFNS
# include <stdio.h>

8
src/lib/ecore_x/xlib/ecore_x_private.h
View File

@ -93,10 +93,10 @@ extern Eina_Bool _ecore_xlib_sync;
#endif /* ifdef WRN */
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_xlib_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#endif /* ifdef CRIT */
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_xlib_log_dom, __VA_ARGS__)
#ifdef CRI
# undef CRI
#endif /* ifdef CRI */
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_xlib_log_dom, __VA_ARGS__)
typedef struct _Ecore_X_Selection_Intern Ecore_X_Selection_Intern;

18
src/lib/edje/edje_convert.c
View File

@ -37,15 +37,15 @@ _edje_collection_string_free(void *data)
edf = (Edje_File*) _edje_file_get();
if (!edf->warning)
CRITICAL("This program as probably called edje_shutdown() with "
"active Edje objects still around. "
"This can cause problems as both Evas and Edje retain "
"references to the objects. "
"You should shut down all canvases and objects "
"before calling edje_shutdown(). "
"The following errors are the edje object files and "
"parts that are still hanging around, with their reference "
"counts");
CRI("This program as probably called edje_shutdown() with "
"active Edje objects still around. "
"This can cause problems as both Evas and Edje retain "
"references to the objects. "
"You should shut down all canvases and objects "
"before calling edje_shutdown(). "
"The following errors are the edje object files and "
"parts that are still hanging around, with their reference "
"counts");
edf->warning = 1;
ERR("file: '%s', references: %i, part: '%s', references: %i",

2
src/lib/edje/edje_lua.c
View File

@ -120,7 +120,7 @@ jmp_buf _edje_lua_panic_jmp;
static int
_edje_lua_custom_panic(EINA_UNUSED lua_State *L)
{
CRITICAL("PANIC");
CRI("PANIC");
longjmp(_edje_lua_panic_jmp, 1);
return 1; /* longjmp() never returns, but this keep gcc happy */
}

6
src/lib/edje/edje_private.h
View File

@ -77,10 +77,10 @@ EAPI extern int _edje_default_log_dom ;
# undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_edje_default_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
#ifdef DBG
# undef DBG
#endif

8
src/lib/eet/Eet_private.h
View File

@ -219,10 +219,10 @@ extern int _eet_log_dom_global;
# undef WRN
#endif /* ifdef WRN */
#define WRN(...) EINA_LOG_DOM_WARN(_eet_log_dom_global, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#endif /* ifdef CRIT */
#define CRIT(...) EINA_LOG_DOM_CRIT(_eet_log_dom_global, __VA_ARGS__)
#ifdef CRI
# undef CRI
#endif /* ifdef CRI */
#define CRI(...) EINA_LOG_DOM_CRIT(_eet_log_dom_global, __VA_ARGS__)
Eet_Dictionary *
eet_dictionary_add(void);

10
src/lib/eet/eet_data.c
View File

@ -2133,30 +2133,30 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
if (type < EET_T_UNKNOW ||
type >= EET_T_LAST)
{
CRIT("Preventing later bug due to unknow type: %i", type);
CRI("Preventing later bug due to unknow type: %i", type);
return;
}
if (offset < 0)
{
CRIT("Preventing later buffer underrun : offset = %i", offset);
CRI("Preventing later buffer underrun : offset = %i", offset);
return;
}
if (offset > edd->size)
{
CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
CRI("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
return;
}
if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW)
{
if (offset + eet_basic_codec[type - 1].size > edd->size)
{
CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
CRI("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
return;
}
}
else if ((offset + sizeof (void*)) > (unsigned int) edd->size)
{
CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
CRI("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
return;
}

10
src/lib/eet/eet_lib.c
View File

@ -234,7 +234,7 @@ eet_cache_add(Eet_File *ef,
new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *));
if (!new_cache)
{
CRIT("BAD ERROR! Eet realloc of cache list failed. Abort");
CRI("BAD ERROR! Eet realloc of cache list failed. Abort");
abort();
}
}
@ -284,7 +284,7 @@ eet_cache_del(Eet_File *ef,
new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *));
if (!new_cache)
{
CRIT("BAD ERROR! Eet realloc of cache list failed. Abort");
CRI("BAD ERROR! Eet realloc of cache list failed. Abort");
abort();
}
}
@ -2825,7 +2825,7 @@ _eet_entries_iterator_free(Eet_Entries_Iterator *it)
{
if (it->locked)
{
CRIT("Iterator still LOCKED !");
CRI("Iterator still LOCKED !");
UNLOCK_FILE(it->ef);
}
}
@ -2835,7 +2835,7 @@ _eet_entries_iterator_lock(Eet_Entries_Iterator *it)
{
if (it->locked)
{
CRIT("Iterator already LOCKED !");
CRI("Iterator already LOCKED !");
return EINA_TRUE;
}
@ -2849,7 +2849,7 @@ _eet_entries_iterator_unlock(Eet_Entries_Iterator *it)
{
if (!it->locked)
{
CRIT("Iterator already UNLOCKED !");
CRI("Iterator already UNLOCKED !");
return EINA_TRUE;
}

8
src/lib/efreet/efreet_base.c
View File

@ -324,20 +324,20 @@ efreet_dirs_init(void)
{
if (chmod(xdg_runtime_dir, 0700) < 0)
{
CRITICAL("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s",
CRI("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s",
xdg_runtime_dir, strerror(errno));
eina_stringshare_replace(&xdg_runtime_dir, NULL);
}
}
else
{
CRITICAL("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir);
CRI("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir);
eina_stringshare_replace(&xdg_runtime_dir, NULL);
}
}
else if (!S_ISDIR(st.st_mode))
{
CRITICAL("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir);
CRI("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir);
eina_stringshare_replace(&xdg_runtime_dir, NULL);
}
else if ((st.st_mode & 0777) != 0700)
@ -350,7 +350,7 @@ efreet_dirs_init(void)
xdg_runtime_dir, st.st_mode & 0777);
if (chmod(xdg_runtime_dir, 0700) != 0)
{
CRITICAL("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s",
CRI("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s",
xdg_runtime_dir, st.st_mode & 0777, strerror(errno));
eina_stringshare_replace(&xdg_runtime_dir, NULL);
}

6
src/lib/efreet/efreet_private.h
View File

@ -91,10 +91,10 @@
* four macros are defined ERR, WRN, DGB, INF.
* EFREET_MODULE_LOG_DOM should be defined individually for each module
*/
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
#ifdef ERR
#undef ERR
#endif

8
src/lib/eina/eina_binshare.c
View File

@ -43,10 +43,10 @@
* @cond LOCAL
*/
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR
@ -151,7 +151,7 @@ eina_binshare_del(const void *obj)
return;
if (!eina_share_common_del(binshare_share, obj))
CRITICAL("EEEK trying to del non-shared binshare %p", obj);
CRI("EEEK trying to del non-shared binshare %p", obj);
}
EAPI const void *

34
src/lib/eina/eina_model.c
View File

@ -76,10 +76,10 @@ static const char _eina_model_str_properties_unloaded[] = "properties,unloaded";
static const char _eina_model_str_children_loaded[] = "children,loaded";
static const char _eina_model_str_children_unloaded[] = "children,unloaded";
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR
@ -362,25 +362,25 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
{
if (itr->version != EINA_MODEL_TYPE_VERSION)
{
CRITICAL("Type %p version is %u, expected %u instead.",
CRI("Type %p version is %u, expected %u instead.",
itr, itr->version, EINA_MODEL_TYPE_VERSION);
return EINA_FALSE;
}
if (!itr->name)
{
CRITICAL("Type %p provides no name!", itr);
CRI("Type %p provides no name!", itr);
return EINA_FALSE;
}
if (itr->type_size < sizeof(Eina_Model_Type))
{
CRITICAL("Type %p %s size must be >= sizeof(Eina_Model_Type)!",
CRI("Type %p %s size must be >= sizeof(Eina_Model_Type)!",
itr, itr->name);
return EINA_FALSE;
}
if (child_size == 0) child_size = itr->type_size;
else if (child_size < itr->type_size)
{
CRITICAL("Type %p %s size is bigger than its child type %p %s!",
CRI("Type %p %s size is bigger than its child type %p %s!",
itr, itr->name, last_itr, last_itr->name);
return EINA_FALSE;
}
@ -418,7 +418,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
if ((!itr->parent) && (itr != EINA_MODEL_TYPE_BASE))
{
CRITICAL("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!",
CRI("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!",
type, type->name);
return EINA_FALSE;
}
@ -427,7 +427,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
#define CK_METH(meth) \
if (!desc->ops.type.meth) \
{ \
CRITICAL("Mandatory method "#meth \
CRI("Mandatory method "#meth \
"() was not provided by type %p (%s).", \
type, type->name); \
return EINA_FALSE; \
@ -448,7 +448,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
if (ext_size % sizeof(void *) != 0)
{
CRITICAL("Extension size %u is not multiple of sizeof(void*)",
CRI("Extension size %u is not multiple of sizeof(void*)",
ext_size);
return EINA_FALSE;
}
@ -632,7 +632,7 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
for (i = 0; i < n_pending; i++)
ERR("%p (%s) is part of dependency loop!",
pending[i]->iface, pending[i]->iface->name);
CRITICAL("Cannot use type %p (%s) with broken interfaces!",
CRI("Cannot use type %p (%s) with broken interfaces!",
desc->cache.types[0], desc->cache.types[0]->name);
free(desc->cache.ifaces);
ret = EINA_FALSE;
@ -650,14 +650,14 @@ _eina_model_description_ifaces_validate_and_count(const Eina_Model_Interface *if
{
if (iface->version != EINA_MODEL_INTERFACE_VERSION)
{
CRITICAL("Interface %p version is %u, expected %u instead.",
CRI("Interface %p version is %u, expected %u instead.",
iface, iface->version, EINA_MODEL_INTERFACE_VERSION);
return EINA_FALSE;
}
if (!iface->name)
{
CRITICAL("Interface %p provides no name!", iface);
CRI("Interface %p provides no name!", iface);
return EINA_FALSE;
}
@ -3444,7 +3444,7 @@ _eina_model_unref(Eina_Model *model)
{ \
if (model->desc->ops.type.method) \
return model->desc->ops.type.method(model, ## __VA_ARGS__); \
CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \
CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
model, model->desc->cache.types[0]->name); \
return def_retval; \
} \
@ -3457,7 +3457,7 @@ _eina_model_unref(Eina_Model *model)
model->desc->ops.type.method(model, ## __VA_ARGS__); \
else \
{ \
CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \
CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
model, model->desc->cache.types[0]->name); \
} \
} \
@ -4899,7 +4899,7 @@ eina_model_type_private_data_get(const Eina_Model *model, const Eina_Model_Type
if (desc->cache.types[i] == type)
return model->privates[i];
CRITICAL("Model %p (%s) is not an instance of type %p (%s)",
CRI("Model %p (%s) is not an instance of type %p (%s)",
model, desc->cache.types[0]->name,
type, type->name);
return NULL;
@ -4964,7 +4964,7 @@ eina_model_interface_private_data_get(const Eina_Model *model, const Eina_Model_
if (desc->cache.ifaces[i] == iface)
return model->privates[desc->total.types + i];
CRITICAL("Model %p (%s) does not implement interface %p (%s)",
CRI("Model %p (%s) does not implement interface %p (%s)",
model, desc->cache.types[0]->name,
iface, iface->name);
return NULL;

10
src/lib/eina/eina_stringshare.c
View File

@ -46,10 +46,10 @@
#include "eina_stringshare.h"
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR
@ -366,7 +366,7 @@ _eina_stringshare_small_del(const char *str, unsigned char length)
return;
error:
CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str);
CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
}
static void
@ -570,7 +570,7 @@ eina_stringshare_del(Eina_Stringshare *str)
}
if (!eina_share_common_del(stringshare_share, str))
CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str);
CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
}
EAPI Eina_Stringshare *

8
src/lib/eina/eina_ustringshare.c
View File

@ -42,10 +42,10 @@
#include "eina_ustringshare.h"
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR
@ -145,7 +145,7 @@ eina_ustringshare_del(const Eina_Unicode *str)
return;
if (!eina_share_common_del(ustringshare_share, (const char *)str))
CRITICAL("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str);
CRI("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str);
}
EAPI const Eina_Unicode *

8
src/lib/eio/eio_private.h
View File

@ -99,10 +99,10 @@ extern int _eio_log_dom_global;
# undef WRN
#endif /* ifdef WRN */
#define WRN(...) EINA_LOG_DOM_WARN(_eio_log_dom_global, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#endif /* ifdef CRIT */
#define CRIT(...) EINA_LOG_DOM_CRIT(_eio_log_dom_global, __VA_ARGS__)
#ifdef CRI
# undef CRI
#endif /* ifdef CRI */
#define CRI(...) EINA_LOG_DOM_CRIT(_eio_log_dom_global, __VA_ARGS__)
typedef struct _Eio_Eet_Open Eio_Eet_Open;
typedef struct _Eio_Eet_Simple Eio_Eet_Simple;

12
src/lib/eldbus/eldbus_core.c
View File

@ -204,17 +204,17 @@ eldbus_shutdown(void)
if (shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1])
{
CRITICAL("Alive TYPE_SESSION connection");
CRI("Alive TYPE_SESSION connection");
print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1]);
}
if (shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1])
{
CRITICAL("Alive TYPE_SYSTEM connection");
CRI("Alive TYPE_SYSTEM connection");
print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1]);
}
if (shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1])
{
CRITICAL("Alive TYPE_STARTER connection");
CRI("Alive TYPE_STARTER connection");
print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1]);
}
if (shared_connections[ELDBUS_CONNECTION_TYPE_ADDRESS - 1])
@ -227,7 +227,7 @@ eldbus_shutdown(void)
it = eina_hash_iterator_tuple_new(address_connections);
EINA_ITERATOR_FOREACH(it, tuple)
{
CRITICAL("Alive TYPE_ADDRESS connection: %s", (char*)tuple->key);
CRI("Alive TYPE_ADDRESS connection: %s", (char*)tuple->key);
print_live_connection(tuple->data);
}
eina_iterator_free(it);
@ -1180,7 +1180,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
if (conn->pendings)
{
CRITICAL("Connection %p released with live pending calls!",
CRI("Connection %p released with live pending calls!",
conn);
EINA_INLIST_FOREACH(conn->pendings, p)
ERR("conn=%p alive pending call=%p dest=%s path=%s %s.%s()", conn, p,
@ -1192,7 +1192,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
if (conn->signal_handlers)
{
CRITICAL("Connection %p released with live signal handlers!", conn);
CRI("Connection %p released with live signal handlers!", conn);
EINA_INLIST_FOREACH(conn->signal_handlers, h)
ERR("conn=%p alive signal=%p %s.%s path=%s", conn, h, h->interface,
h->member, h->path);

2
src/lib/eldbus/eldbus_object.c
View File

@ -146,7 +146,7 @@ _eldbus_object_free(Eldbus_Object *obj)
}
if (obj->pendings)
CRITICAL("Object %p released with live pending calls!", obj);
CRI("Object %p released with live pending calls!", obj);
for (i = 0; i < ELDBUS_OBJECT_EVENT_LAST; i++)
{

2
src/lib/eldbus/eldbus_private.h
View File

@ -13,7 +13,7 @@ extern int _eldbus_log_dom;
#define INF(...) EINA_LOG_DOM_INFO(_eldbus_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_eldbus_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_eldbus_log_dom, __VA_ARGS__)
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eldbus_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eldbus_log_dom, __VA_ARGS__)
#define ELDBUS_CONNECTION_MAGIC (0xdb050001)
#define ELDBUS_MESSAGE_MAGIC (0xdb050002)

2
src/lib/eldbus/eldbus_proxy.c
View File

@ -168,7 +168,7 @@ _eldbus_proxy_free(Eldbus_Proxy *proxy)
}
if (proxy->pendings)
CRITICAL("Proxy %p released with live pending calls!", proxy);
CRI("Proxy %p released with live pending calls!", proxy);
for (i = 0; i < ELDBUS_PROXY_EVENT_LAST; i++)
{

2
src/lib/emotion/emotion_private.h
View File

@ -19,7 +19,7 @@ extern Eina_Prefix *_emotion_pfx;
#define INF(...) EINA_LOG_DOM_INFO(_emotion_log_domain, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_emotion_log_domain, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_log_domain, __VA_ARGS__)
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_log_domain, __VA_ARGS__)
#include "emotion_modules.h"

6
src/lib/eo/eo_private.h
View File

@ -31,10 +31,10 @@
extern int _eo_log_dom;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eo_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_eo_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR

6
src/lib/ephysics/ephysics_private.h
View File

@ -44,10 +44,10 @@
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_ephysics_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ephysics_log_dom, __VA_ARGS__)
#ifdef __cplusplus
extern "C" {

2
src/lib/ethumb_client/ethumb_client.c
View File

@ -93,7 +93,7 @@ static int _log_dom = -1;
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
struct _Ethumb_Client
{

10
src/lib/evas/canvas/evas_clip.c
View File

@ -224,28 +224,28 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
if (eo_obj == eo_clip)
{
CRIT("Setting clip %p on itself", eo_obj);
CRI("Setting clip %p on itself", eo_obj);
return;
}
if (clip->delete_me)
{
CRIT("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
CRI("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
return;
}
if (obj->delete_me)
{
CRIT("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
CRI("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
return;
}
if (!obj->layer)
{
CRIT("No evas surface associated with object (%p)", eo_obj);
CRI("No evas surface associated with object (%p)", eo_obj);
return;
}
if ((obj->layer && clip->layer) &&
(obj->layer->evas != clip->layer->evas))
{
CRIT("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
CRI("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
return;
}

4
src/lib/evas/canvas/evas_object_box.c
View File

@ -53,7 +53,7 @@ static void _sizing_eval(Evas_Object *obj);
EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("no widget data for object %p (%s)", \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
fflush(stderr); \
return; \
@ -63,7 +63,7 @@ if (!ptr) \
EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("no widget data for object %p (%s)", \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
fflush(stderr); \
return val; \

4
src/lib/evas/canvas/evas_object_grid.c
View File

@ -53,7 +53,7 @@ struct _Evas_Object_Grid_Accessor
EVAS_OBJECT_GRID_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("no widget data for object %p (%s)", \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
abort(); \
return; \
@ -63,7 +63,7 @@ struct _Evas_Object_Grid_Accessor
EVAS_OBJECT_GRID_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("No widget data for object %p (%s)", \
CRI("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
abort(); \
return val; \

8
src/lib/evas/canvas/evas_object_image.c
View File

@ -654,18 +654,18 @@ _image_source_set(Eo *eo_obj, void *_pd, va_list *list)
}
if (!src->layer)
{
CRIT("No evas surface associated with source object (%p)", eo_obj);
CRI("No evas surface associated with source object (%p)", eo_obj);
return;
}
if ((obj->layer && src->layer) &&
(obj->layer->evas != src->layer->evas))
{
CRIT("Setting object %p from Evas (%p) from another Evas (%p)", eo_src, src->layer->evas, obj->layer->evas);
CRI("Setting object %p from Evas (%p) from another Evas (%p)", eo_src, src->layer->evas, obj->layer->evas);
return;
}
if (eo_src == eo_obj)
{
CRIT("Setting object %p as a source for itself", obj);
CRI("Setting object %p as a source for itself", obj);
return;
}
}
@ -3724,7 +3724,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
obj->cur->geometry.y == y &&
obj->cur->geometry.w == w &&
obj->cur->geometry.h == h))
CRIT("Evas_Object_Image geometry did change during pixels get callback !");
CRI("Evas_Object_Image geometry did change during pixels get callback !");
o->engine_data = obj->layer->evas->engine.func->image_dirty_region
(obj->layer->evas->engine.data.output, o->engine_data,

8
src/lib/evas/canvas/evas_object_smart.c
View File

@ -253,26 +253,26 @@ _smart_member_add(Eo *smart_obj, void *_pd, va_list *list)
if (obj->delete_me)
{
CRIT("Adding deleted object %p to smart obj %p", eo_obj, smart_obj);
CRI("Adding deleted object %p to smart obj %p", eo_obj, smart_obj);
abort();
return;
}
if (smart->delete_me)
{
CRIT("Adding object %p to deleted smart obj %p", eo_obj, smart_obj);
CRI("Adding object %p to deleted smart obj %p", eo_obj, smart_obj);
abort();
return;
}
if (!smart->layer)
{
CRIT("No evas surface associated with smart object (%p)", smart_obj);
CRI("No evas surface associated with smart object (%p)", smart_obj);
abort();
return;
}
if ((obj->layer && smart->layer) &&
(obj->layer->evas != smart->layer->evas))
{
CRIT("Adding object %p from Evas (%p) from another Evas (%p)", eo_obj, obj->layer->evas, smart->layer->evas);
CRI("Adding object %p from Evas (%p) from another Evas (%p)", eo_obj, obj->layer->evas, smart->layer->evas);
abort();
return;
}

4
src/lib/evas/canvas/evas_object_table.c
View File

@ -104,7 +104,7 @@ struct _Evas_Object_Table_Accessor
EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("no widget data for object %p (%s)", \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return; \
}
@ -113,7 +113,7 @@ if (!ptr) \
EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRIT("No widget data for object %p (%s)", \
CRI("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return val; \
}

6
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -102,10 +102,10 @@ static const char o_type[] = "textblock";
((ch) == _TAB) || \
((ch) == _PARAGRAPH_SEPARATOR))
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__)
#ifdef ERR
#undef ERR

4
src/lib/evas/common/evas_image_load.c
View File

@ -274,7 +274,7 @@ evas_common_load_rgba_image_module_from_file(Image_Entry *ie)
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
CRIT("This function shouldn't be called anymore!");
CRI("This function shouldn't be called anymore!");
#endif
if (ie->f)
@ -391,7 +391,7 @@ evas_common_load_rgba_image_data_from_file(Image_Entry *ie)
#ifdef EVAS_CSERVE2
if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
CRIT("This function shouldn't be called anymore!");
CRI("This function shouldn't be called anymore!");
#endif
if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC;

6
src/lib/evas/common/evas_thread_render.c
View File

@ -127,12 +127,12 @@ evas_thread_init(void)
eina_inarray_step_set(&evas_thread_queue, sizeof (Eina_Inarray), sizeof (Evas_Thread_Command), 128);
if (!eina_lock_new(&evas_thread_queue_lock))
CRIT("Could not create draw thread lock");
CRI("Could not create draw thread lock");
if (!eina_condition_new(&evas_thread_queue_condition, &evas_thread_queue_lock))
CRIT("Could not create draw thread condition");
CRI("Could not create draw thread condition");
if (!eina_thread_create(&evas_thread_worker, EINA_THREAD_NORMAL, 0,
evas_thread_worker_func, NULL))
CRIT("Could not create draw thread");
CRI("Could not create draw thread");
}
void

12
src/lib/evas/cserve2/evas_cs2_client.c
View File

@ -507,7 +507,7 @@ evas_cserve2_shutdown(void)
if (cserve2_init <= 0)
{
CRIT("cserve2 is already shutdown");
CRI("cserve2 is already shutdown");
return -1;
}
@ -2515,8 +2515,8 @@ _server_index_list_set(Msg_Base *data, int size)
if (size != sizeof(*msg) || msg->base.type != CSERVE2_INDEX_LIST)
{
CRIT("Invalid message! type: %d, size: %d (expected %d)",
msg->base.type, size, (int) sizeof(*msg));
CRI("Invalid message! type: %d, size: %d (expected %d)",
msg->base.type, size, (int) sizeof(*msg));
return -1;
}
@ -2582,7 +2582,7 @@ _shared_string_internal_get(int id, Eina_Bool safe)
if (!_index.strings_entries.data)
{
CRIT("Strings table is not valid: no data");
CRI("Strings table is not valid: no data");
return NULL;
}
@ -2622,7 +2622,7 @@ _shared_string_get(int id)
#define SHARED_INDEX_CHECK(si, typ) \
do { if (!_shared_index_remap_check(&(si), sizeof(typ))) { \
CRIT("Failed to remap index"); return NULL; } } while (0)
CRI("Failed to remap index"); return NULL; } } while (0)
static const File_Data *
_shared_image_entry_file_data_find(Image_Entry *ie)
@ -2959,7 +2959,7 @@ _shared_image_entry_image_data_find(Image_Entry *ie)
if (!ie->cache_key)
{
CRIT("Looking for an image in remote cache without hash key?");
CRI("Looking for an image in remote cache without hash key?");
return NULL;
}

6
src/lib/evas/include/evas_common_private.h
View File

@ -96,10 +96,10 @@ extern EAPI int _evas_log_dom_global;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
#include "evas_options.h"

10
src/lib/evas/main.c
View File

@ -70,7 +70,7 @@ evas_debug_error(void)
_evas_debug_init_from_env();
}
if (_evas_debug_show == _EVAS_DEBUG_SHOW)
CRIT("Evas Magic Check Failed!!!");
CRI("Evas Magic Check Failed!!!");
}
void
@ -81,7 +81,7 @@ evas_debug_input_null(void)
_evas_debug_init_from_env();
}
if (_evas_debug_show == _EVAS_DEBUG_SHOW)
CRIT("Input object pointer is NULL!");
CRI("Input object pointer is NULL!");
if (_evas_debug_abort) abort();
}
@ -94,7 +94,7 @@ evas_debug_magic_null(void)
}
if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
(_evas_debug_show == _EVAS_DEBUG_DEFAULT))
CRIT("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
CRI("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
if (_evas_debug_abort) abort();
}
@ -107,7 +107,7 @@ evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
}
if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
(_evas_debug_show == _EVAS_DEBUG_DEFAULT))
CRIT("Input object is wrong type\n"
CRI("Input object is wrong type\n"
" Expected: %08x - %s\n"
" Supplied: %08x - %s",
expected, evas_debug_magic_string_get(expected),
@ -124,7 +124,7 @@ evas_debug_generic(const char *str)
}
if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
(_evas_debug_show == _EVAS_DEBUG_DEFAULT))
CRIT("%s", str);
CRI("%s", str);
if (_evas_debug_abort) abort();
}

6
src/modules/ecore/system/systemd/ecore_system_systemd.c
View File

@ -12,10 +12,10 @@ static Eldbus_Connection *_conn = NULL;
static Eina_List *_objs = NULL;
static Eina_List *_proxies = NULL;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR

6
src/modules/ecore/system/tizen/ecore_system_tizen.c
View File

@ -8,10 +8,10 @@
static int _log_dom = -1;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR

6
src/modules/ecore/system/upower/ecore_system_upower.c
View File

@ -12,10 +12,10 @@ static Eldbus_Connection *_conn = NULL;
static Eldbus_Object *_obj = NULL;
static Eldbus_Proxy *_proxy = NULL;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR

6
src/modules/ecore_imf/xim/ecore_imf_xim.c
View File

@ -18,10 +18,10 @@
static int _ecore_imf_xim_log_dom = -1;
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ecore_imf_xim_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_imf_xim_log_dom, __VA_ARGS__)
#ifdef ERR
#undef ERR

8
src/modules/emotion/generic/emotion_generic.c
View File

@ -42,10 +42,10 @@ static int _emotion_generic_log_domain = -1;
#endif
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_generic_log_domain, __VA_ARGS__)
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__)
static Eina_Bool _fork_and_exec(Emotion_Generic_Video *ev);
@ -1867,7 +1867,7 @@ generic_module_init(void)
PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
if (!pfx)
{
CRITICAL("Could not get prefix for emotion");
CRI("Could not get prefix for emotion");
eina_log_domain_unregister(_emotion_generic_log_domain);
_emotion_generic_log_domain = -1;
return EINA_FALSE;

6
src/modules/emotion/gstreamer/emotion_gstreamer.h
View File

@ -216,10 +216,10 @@ extern Eina_Bool _ecore_x_available;
#endif
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__)
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type()

6
src/modules/emotion/gstreamer1/emotion_gstreamer.h
View File

@ -231,10 +231,10 @@ extern Eina_Bool _ecore_x_available;
#endif
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__)
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type()

2
src/modules/emotion/xine/emotion_xine.c
View File

@ -1562,7 +1562,7 @@ xine_module_init(void)
if (!_emotion_module_register(&em_engine))
{
CRITICAL("Could not register module %p", &em_engine);
CRI("Could not register module %p", &em_engine);
eina_log_domain_unregister(_emotion_xine_log_domain);
_emotion_xine_log_domain = -1;
return EINA_FALSE;

6
src/modules/emotion/xine/emotion_xine.h
View File

@ -108,10 +108,10 @@ struct _Emotion_Xine_Event
#endif
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_xine_log_domain, __VA_ARGS__)
#ifdef CRITICAL
#undef CRITICAL
#ifdef CRI
#undef CRI
#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_xine_log_domain, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_xine_log_domain, __VA_ARGS__)
extern int _emotion_xine_log_domain;

6
src/modules/evas/engines/buffer/evas_engine.h
View File

@ -24,10 +24,10 @@ extern int _evas_engine_buffer_log_dom ;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_buffer_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_buffer_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_buffer_log_dom, __VA_ARGS__)
typedef struct _Outbuf Outbuf;

6
src/modules/evas/engines/drm/evas_engine.h
View File

@ -23,10 +23,10 @@ extern int _evas_engine_drm_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_drm_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__)
typedef struct _Outbuf Outbuf;

6
src/modules/evas/engines/fb/evas_engine.h
View File

@ -24,10 +24,10 @@ extern int _evas_engine_fb_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_fb_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_fb_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_fb_log_dom, __VA_ARGS__)
typedef struct _Outbuf Outbuf;

6
src/modules/evas/engines/fb/evas_fb_main.c
View File

@ -417,7 +417,7 @@ fb_setvt(int vtno)
}
if (access(vtname,R_OK | W_OK) == -1)
{
CRIT("Access %s: %s",vtname,strerror(errno));
CRI("Access %s: %s",vtname,strerror(errno));
return;
}
vtfd = open(vtname,O_RDWR);
@ -472,7 +472,7 @@ fb_init(int vt EINA_UNUSED, int device)
}
if (fb == -1)
{
CRIT("open %s: %s", dev, strerror(errno));
CRI("open %s: %s", dev, strerror(errno));
fb_cleanup();
return;
}
@ -533,7 +533,7 @@ fb_postinit(FB_Mode *mode)
if (fb_fix.type != FB_TYPE_PACKED_PIXELS)
{
CRIT("can handle only packed pixel frame buffers");
CRI("can handle only packed pixel frame buffers");
fb_cleanup();
return 0;
}

6
src/modules/evas/engines/gl_cocoa/evas_engine.h
View File

@ -32,10 +32,10 @@ extern int _evas_engine_gl_cocoa_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
typedef struct _Evas_GL_Cocoa_Window Evas_GL_Cocoa_Window;

4
src/modules/evas/engines/gl_common/evas_gl_api.c
View File

@ -20,7 +20,7 @@ void _make_current_check(const char* api)
if (!ctx)
{
CRIT("\e[1;33m%s\e[m: Current Context NOT SET: GL Call Should NOT Be Called without MakeCurrent!!!", api);
CRI("\e[1;33m%s\e[m: Current Context NOT SET: GL Call Should NOT Be Called without MakeCurrent!!!", api);
}
}
@ -38,7 +38,7 @@ void _direct_rendering_check(const char *api)
if (_evgl_not_in_pixel_get())
{
CRIT("\e[1;33m%s\e[m: This API is being called outside Pixel Get Callback Function.", api);
CRI("\e[1;33m%s\e[m: This API is being called outside Pixel Get Callback Function.", api);
}
}

6
src/modules/evas/engines/gl_common/evas_gl_core_private.h
View File

@ -29,10 +29,10 @@ extern int _evas_gl_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_gl_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_gl_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_gl_log_dom, __VA_ARGS__)
struct _EVGL_Interface

6
src/modules/evas/engines/gl_common/evas_gl_private.h
View File

@ -24,9 +24,9 @@ extern int _evas_engine_GL_common_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_common_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_common_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_common_log_dom, __VA_ARGS__)
#endif

2
src/modules/evas/engines/gl_sdl/evas_engine.c
View File

@ -1049,7 +1049,7 @@ _sdl_output_setup (int w, int h, int fullscreen, int noframe)
if (!surface)
{
CRIT("SDL_SetVideoMode [ %i x %i x 32 ] failed. %s", w, h, SDL_GetError());
CRI("SDL_SetVideoMode [ %i x %i x 32 ] failed. %s", w, h, SDL_GetError());
SDL_Quit();
exit(-1);
}

6
src/modules/evas/engines/gl_sdl/evas_engine.h
View File

@ -44,10 +44,10 @@ extern int _evas_engine_GL_SDL_log_dom ;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine

6
src/modules/evas/engines/gl_x11/evas_engine.h
View File

@ -52,10 +52,10 @@ extern int _evas_engine_GL_X11_log_dom ;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window;

6
src/modules/evas/engines/psl1ght/evas_engine.h
View File

@ -22,9 +22,9 @@ extern int _evas_engine_psl1ght_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
#endif

6
src/modules/evas/engines/software_gdi/evas_engine.h
View File

@ -28,10 +28,10 @@ extern int _evas_engine_soft_gdi_log_dom;
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#ifdef CRI
# undef CRI
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
typedef enum _Outbuf_Depth Outbuf_Depth;

6
src/modules/evas/engines/software_x11/evas_engine.h
View File

@ -40,10 +40,10 @@ extern int _evas_engine_soft_x11_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) \
# define CRI(...) \
EINA_LOG_DOM_CRIT(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
typedef enum _Outbuf_Depth Outbuf_Depth;

6
src/modules/evas/engines/wayland_egl/evas_engine.h
View File

@ -43,10 +43,10 @@ extern int _evas_engine_wl_egl_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
typedef struct _Evas_GL_Wl_Window Evas_GL_Wl_Window;

6
src/modules/evas/engines/wayland_shm/evas_engine.h
View File

@ -32,10 +32,10 @@ extern int _evas_engine_way_shm_log_dom;
# endif
# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_way_shm_log_dom, __VA_ARGS__)
# ifdef CRIT
# undef CRIT
# ifdef CRI
# undef CRI
# endif
# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__)
# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__)
# include <wayland-client.h>