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.

12 files changed, 41 insertions, 41 deletions

diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 4472fd59bd..20585be483 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -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;
      }
 
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 194f3e7841..1d27bfade6 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -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;                                                          \
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 67e5d9212b..707dd696b8 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -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;                                                      \
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index ce2e918349..043ad92b3b 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -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,
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 2e09f8187b..119702aa87 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -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;
      }
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 3b1f533af7..624c6b2baf 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -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;                                                          \
 }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 1fe0f1643b..5851918c5e 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -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
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index c9b90af7e5..92c6402f8c 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -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;
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index f37f43a6f7..e84eb2c649 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -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
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index c65003f7d6..7609f4b8fd 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -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;
      }
 
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 4f48fd4aaf..47441f7276 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -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"
 
diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c
index 92e927c2d5..e59877cdd6 100644
--- a/src/lib/evas/main.c
+++ b/src/lib/evas/main.c
@@ -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();
 }