summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:22:05 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:27:13 +0900
commit76d8532b5465362f85b75a2a7a5cc3c419304a92 (patch)
tree73482a7b3a246f56d555fd206903db683b14c6aa /src/modules/evas/engines
parent10dd650d90d050889771f88d8b01eb7c1f51b0bd (diff)
downloadefl-76d8532b5465362f85b75a2a7a5cc3c419304a92.tar.gz
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.
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.h6
-rw-r--r--src/modules/evas/engines/drm/evas_engine.h6
-rw-r--r--src/modules/evas/engines/fb/evas_engine.h6
-rw-r--r--src/modules/evas/engines/fb/evas_fb_main.c6
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.h6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core_private.h6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_private.h6
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.h6
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.h6
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.h6
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.h6
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.h6
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.h6
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h6
16 files changed, 45 insertions, 45 deletions
diff --git a/src/modules/evas/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h
index 8cdf8f4e53..130a0e2dc0 100644
--- a/src/modules/evas/engines/buffer/evas_engine.h
+++ b/src/modules/evas/engines/buffer/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/drm/evas_engine.h b/src/modules/evas/engines/drm/evas_engine.h
index 814158842c..3cfbbeeb6a 100644
--- a/src/modules/evas/engines/drm/evas_engine.h
+++ b/src/modules/evas/engines/drm/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/fb/evas_engine.h b/src/modules/evas/engines/fb/evas_engine.h
index 295e91e4b1..45e2715e4d 100644
--- a/src/modules/evas/engines/fb/evas_engine.h
+++ b/src/modules/evas/engines/fb/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index b958c924e2..3539d7e6af 100644
--- a/src/modules/evas/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -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;
}
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.h b/src/modules/evas/engines/gl_cocoa/evas_engine.h
index a066d3e58d..bfc12d0ae8 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.h
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index a2ba18c542..d831f9d73d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -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);
}
}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
index 254da65bf7..85ccf9e265 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
@@ -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
diff --git a/src/modules/evas/engines/gl_common/evas_gl_private.h b/src/modules/evas/engines/gl_common/evas_gl_private.h
index a178823fd9..8f7eb21a23 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_private.h
@@ -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
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 6e89f21ca2..89e6f99ac2 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -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);
}
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.h b/src/modules/evas/engines/gl_sdl/evas_engine.h
index 837b7d9303..459dd7d87a 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.h
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.h
@@ -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
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h
index 371a10b39d..c03950b907 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.h b/src/modules/evas/engines/psl1ght/evas_engine.h
index 0ea6cb1d27..638106e163 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.h
+++ b/src/modules/evas/engines/psl1ght/evas_engine.h
@@ -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
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.h b/src/modules/evas/engines/software_gdi/evas_engine.h
index b8ddc851e3..2f8a6ebb72 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.h
+++ b/src/modules/evas/engines/software_gdi/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/software_x11/evas_engine.h b/src/modules/evas/engines/software_x11/evas_engine.h
index 421e43a306..4e91a1c278 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.h
+++ b/src/modules/evas/engines/software_x11/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index 80765401fd..3fc12ce026 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -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;
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index dad011561d..1abae01523 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -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>