summaryrefslogtreecommitdiff
path: root/src/lib/eina
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/eina')
-rw-r--r--src/lib/eina/eina_binshare.c8
-rw-r--r--src/lib/eina/eina_model.c34
-rw-r--r--src/lib/eina/eina_stringshare.c10
-rw-r--r--src/lib/eina/eina_ustringshare.c8
4 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/eina/eina_binshare.c b/src/lib/eina/eina_binshare.c
index 01e8046e01..65edf841a4 100644
--- a/src/lib/eina/eina_binshare.c
+++ b/src/lib/eina/eina_binshare.c
@@ -43,10 +43,10 @@
43 * @cond LOCAL 43 * @cond LOCAL
44 */ 44 */
45 45
46#ifdef CRITICAL 46#ifdef CRI
47#undef CRITICAL 47#undef CRI
48#endif 48#endif
49#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__) 49#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__)
50 50
51#ifdef ERR 51#ifdef ERR
52#undef ERR 52#undef ERR
@@ -151,7 +151,7 @@ eina_binshare_del(const void *obj)
151 return; 151 return;
152 152
153 if (!eina_share_common_del(binshare_share, obj)) 153 if (!eina_share_common_del(binshare_share, obj))
154 CRITICAL("EEEK trying to del non-shared binshare %p", obj); 154 CRI("EEEK trying to del non-shared binshare %p", obj);
155} 155}
156 156
157EAPI const void * 157EAPI const void *
diff --git a/src/lib/eina/eina_model.c b/src/lib/eina/eina_model.c
index e1931fdc68..99380e2e66 100644
--- a/src/lib/eina/eina_model.c
+++ b/src/lib/eina/eina_model.c
@@ -76,10 +76,10 @@ static const char _eina_model_str_properties_unloaded[] = "properties,unloaded";
76static const char _eina_model_str_children_loaded[] = "children,loaded"; 76static const char _eina_model_str_children_loaded[] = "children,loaded";
77static const char _eina_model_str_children_unloaded[] = "children,unloaded"; 77static const char _eina_model_str_children_unloaded[] = "children,unloaded";
78 78
79#ifdef CRITICAL 79#ifdef CRI
80#undef CRITICAL 80#undef CRI
81#endif 81#endif
82#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__) 82#define CRI(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__)
83 83
84#ifdef ERR 84#ifdef ERR
85#undef ERR 85#undef ERR
@@ -362,25 +362,25 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
362 { 362 {
363 if (itr->version != EINA_MODEL_TYPE_VERSION) 363 if (itr->version != EINA_MODEL_TYPE_VERSION)
364 { 364 {
365 CRITICAL("Type %p version is %u, expected %u instead.", 365 CRI("Type %p version is %u, expected %u instead.",
366 itr, itr->version, EINA_MODEL_TYPE_VERSION); 366 itr, itr->version, EINA_MODEL_TYPE_VERSION);
367 return EINA_FALSE; 367 return EINA_FALSE;
368 } 368 }
369 if (!itr->name) 369 if (!itr->name)
370 { 370 {
371 CRITICAL("Type %p provides no name!", itr); 371 CRI("Type %p provides no name!", itr);
372 return EINA_FALSE; 372 return EINA_FALSE;
373 } 373 }
374 if (itr->type_size < sizeof(Eina_Model_Type)) 374 if (itr->type_size < sizeof(Eina_Model_Type))
375 { 375 {
376 CRITICAL("Type %p %s size must be >= sizeof(Eina_Model_Type)!", 376 CRI("Type %p %s size must be >= sizeof(Eina_Model_Type)!",
377 itr, itr->name); 377 itr, itr->name);
378 return EINA_FALSE; 378 return EINA_FALSE;
379 } 379 }
380 if (child_size == 0) child_size = itr->type_size; 380 if (child_size == 0) child_size = itr->type_size;
381 else if (child_size < itr->type_size) 381 else if (child_size < itr->type_size)
382 { 382 {
383 CRITICAL("Type %p %s size is bigger than its child type %p %s!", 383 CRI("Type %p %s size is bigger than its child type %p %s!",
384 itr, itr->name, last_itr, last_itr->name); 384 itr, itr->name, last_itr, last_itr->name);
385 return EINA_FALSE; 385 return EINA_FALSE;
386 } 386 }
@@ -418,7 +418,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
418 418
419 if ((!itr->parent) && (itr != EINA_MODEL_TYPE_BASE)) 419 if ((!itr->parent) && (itr != EINA_MODEL_TYPE_BASE))
420 { 420 {
421 CRITICAL("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!", 421 CRI("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!",
422 type, type->name); 422 type, type->name);
423 return EINA_FALSE; 423 return EINA_FALSE;
424 } 424 }
@@ -427,7 +427,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
427#define CK_METH(meth) \ 427#define CK_METH(meth) \
428 if (!desc->ops.type.meth) \ 428 if (!desc->ops.type.meth) \
429 { \ 429 { \
430 CRITICAL("Mandatory method "#meth \ 430 CRI("Mandatory method "#meth \
431 "() was not provided by type %p (%s).", \ 431 "() was not provided by type %p (%s).", \
432 type, type->name); \ 432 type, type->name); \
433 return EINA_FALSE; \ 433 return EINA_FALSE; \
@@ -448,7 +448,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
448 448
449 if (ext_size % sizeof(void *) != 0) 449 if (ext_size % sizeof(void *) != 0)
450 { 450 {
451 CRITICAL("Extension size %u is not multiple of sizeof(void*)", 451 CRI("Extension size %u is not multiple of sizeof(void*)",
452 ext_size); 452 ext_size);
453 return EINA_FALSE; 453 return EINA_FALSE;
454 } 454 }
@@ -632,7 +632,7 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
632 for (i = 0; i < n_pending; i++) 632 for (i = 0; i < n_pending; i++)
633 ERR("%p (%s) is part of dependency loop!", 633 ERR("%p (%s) is part of dependency loop!",
634 pending[i]->iface, pending[i]->iface->name); 634 pending[i]->iface, pending[i]->iface->name);
635 CRITICAL("Cannot use type %p (%s) with broken interfaces!", 635 CRI("Cannot use type %p (%s) with broken interfaces!",
636 desc->cache.types[0], desc->cache.types[0]->name); 636 desc->cache.types[0], desc->cache.types[0]->name);
637 free(desc->cache.ifaces); 637 free(desc->cache.ifaces);
638 ret = EINA_FALSE; 638 ret = EINA_FALSE;
@@ -650,14 +650,14 @@ _eina_model_description_ifaces_validate_and_count(const Eina_Model_Interface *if
650{ 650{
651 if (iface->version != EINA_MODEL_INTERFACE_VERSION) 651 if (iface->version != EINA_MODEL_INTERFACE_VERSION)
652 { 652 {
653 CRITICAL("Interface %p version is %u, expected %u instead.", 653 CRI("Interface %p version is %u, expected %u instead.",
654 iface, iface->version, EINA_MODEL_INTERFACE_VERSION); 654 iface, iface->version, EINA_MODEL_INTERFACE_VERSION);
655 return EINA_FALSE; 655 return EINA_FALSE;
656 } 656 }
657 657
658 if (!iface->name) 658 if (!iface->name)
659 { 659 {
660 CRITICAL("Interface %p provides no name!", iface); 660 CRI("Interface %p provides no name!", iface);
661 return EINA_FALSE; 661 return EINA_FALSE;
662 } 662 }
663 663
@@ -3444,7 +3444,7 @@ _eina_model_unref(Eina_Model *model)
3444 { \ 3444 { \
3445 if (model->desc->ops.type.method) \ 3445 if (model->desc->ops.type.method) \
3446 return model->desc->ops.type.method(model, ## __VA_ARGS__); \ 3446 return model->desc->ops.type.method(model, ## __VA_ARGS__); \
3447 CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \ 3447 CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
3448 model, model->desc->cache.types[0]->name); \ 3448 model, model->desc->cache.types[0]->name); \
3449 return def_retval; \ 3449 return def_retval; \
3450 } \ 3450 } \
@@ -3457,7 +3457,7 @@ _eina_model_unref(Eina_Model *model)
3457 model->desc->ops.type.method(model, ## __VA_ARGS__); \ 3457 model->desc->ops.type.method(model, ## __VA_ARGS__); \
3458 else \ 3458 else \
3459 { \ 3459 { \
3460 CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \ 3460 CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
3461 model, model->desc->cache.types[0]->name); \ 3461 model, model->desc->cache.types[0]->name); \
3462 } \ 3462 } \
3463 } \ 3463 } \
@@ -4899,7 +4899,7 @@ eina_model_type_private_data_get(const Eina_Model *model, const Eina_Model_Type
4899 if (desc->cache.types[i] == type) 4899 if (desc->cache.types[i] == type)
4900 return model->privates[i]; 4900 return model->privates[i];
4901 4901
4902 CRITICAL("Model %p (%s) is not an instance of type %p (%s)", 4902 CRI("Model %p (%s) is not an instance of type %p (%s)",
4903 model, desc->cache.types[0]->name, 4903 model, desc->cache.types[0]->name,
4904 type, type->name); 4904 type, type->name);
4905 return NULL; 4905 return NULL;
@@ -4964,7 +4964,7 @@ eina_model_interface_private_data_get(const Eina_Model *model, const Eina_Model_
4964 if (desc->cache.ifaces[i] == iface) 4964 if (desc->cache.ifaces[i] == iface)
4965 return model->privates[desc->total.types + i]; 4965 return model->privates[desc->total.types + i];
4966 4966
4967 CRITICAL("Model %p (%s) does not implement interface %p (%s)", 4967 CRI("Model %p (%s) does not implement interface %p (%s)",
4968 model, desc->cache.types[0]->name, 4968 model, desc->cache.types[0]->name,
4969 iface, iface->name); 4969 iface, iface->name);
4970 return NULL; 4970 return NULL;
diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
index 36af6d460a..88126ffcd7 100644
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@@ -46,10 +46,10 @@
46#include "eina_stringshare.h" 46#include "eina_stringshare.h"
47 47
48 48
49#ifdef CRITICAL 49#ifdef CRI
50#undef CRITICAL 50#undef CRI
51#endif 51#endif
52#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__) 52#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__)
53 53
54#ifdef ERR 54#ifdef ERR
55#undef ERR 55#undef ERR
@@ -366,7 +366,7 @@ _eina_stringshare_small_del(const char *str, unsigned char length)
366 return; 366 return;
367 367
368error: 368error:
369 CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str); 369 CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
370} 370}
371 371
372static void 372static void
@@ -570,7 +570,7 @@ eina_stringshare_del(Eina_Stringshare *str)
570 } 570 }
571 571
572 if (!eina_share_common_del(stringshare_share, str)) 572 if (!eina_share_common_del(stringshare_share, str))
573 CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str); 573 CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
574} 574}
575 575
576EAPI Eina_Stringshare * 576EAPI Eina_Stringshare *
diff --git a/src/lib/eina/eina_ustringshare.c b/src/lib/eina/eina_ustringshare.c
index 33be24216c..dbdc8a707b 100644
--- a/src/lib/eina/eina_ustringshare.c
+++ b/src/lib/eina/eina_ustringshare.c
@@ -42,10 +42,10 @@
42#include "eina_ustringshare.h" 42#include "eina_ustringshare.h"
43 43
44 44
45#ifdef CRITICAL 45#ifdef CRI
46#undef CRITICAL 46#undef CRI
47#endif 47#endif
48#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__) 48#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__)
49 49
50#ifdef ERR 50#ifdef ERR
51#undef ERR 51#undef ERR
@@ -145,7 +145,7 @@ eina_ustringshare_del(const Eina_Unicode *str)
145 return; 145 return;
146 146
147 if (!eina_share_common_del(ustringshare_share, (const char *)str)) 147 if (!eina_share_common_del(ustringshare_share, (const char *)str))
148 CRITICAL("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str); 148 CRI("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str);
149} 149}
150 150
151EAPI const Eina_Unicode * 151EAPI const Eina_Unicode *