diff options
author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2013-12-26 12:22:05 +0900 |
---|---|---|
committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2013-12-26 12:27:13 +0900 |
commit | 76d8532b5465362f85b75a2a7a5cc3c419304a92 (patch) | |
tree | 73482a7b3a246f56d555fd206903db683b14c6aa /src/lib/efreet | |
parent | 10dd650d90d050889771f88d8b01eb7c1f51b0bd (diff) |
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/lib/efreet')
-rw-r--r-- | src/lib/efreet/efreet_base.c | 8 | ||||
-rw-r--r-- | src/lib/efreet/efreet_private.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c index 7c68751368..1c467d27b3 100644 --- a/src/lib/efreet/efreet_base.c +++ b/src/lib/efreet/efreet_base.c | |||
@@ -324,20 +324,20 @@ efreet_dirs_init(void) | |||
324 | { | 324 | { |
325 | if (chmod(xdg_runtime_dir, 0700) < 0) | 325 | if (chmod(xdg_runtime_dir, 0700) < 0) |
326 | { | 326 | { |
327 | CRITICAL("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s", | 327 | CRI("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s", |
328 | xdg_runtime_dir, strerror(errno)); | 328 | xdg_runtime_dir, strerror(errno)); |
329 | eina_stringshare_replace(&xdg_runtime_dir, NULL); | 329 | eina_stringshare_replace(&xdg_runtime_dir, NULL); |
330 | } | 330 | } |
331 | } | 331 | } |
332 | else | 332 | else |
333 | { | 333 | { |
334 | CRITICAL("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir); | 334 | CRI("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir); |
335 | eina_stringshare_replace(&xdg_runtime_dir, NULL); | 335 | eina_stringshare_replace(&xdg_runtime_dir, NULL); |
336 | } | 336 | } |
337 | } | 337 | } |
338 | else if (!S_ISDIR(st.st_mode)) | 338 | else if (!S_ISDIR(st.st_mode)) |
339 | { | 339 | { |
340 | CRITICAL("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir); | 340 | CRI("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir); |
341 | eina_stringshare_replace(&xdg_runtime_dir, NULL); | 341 | eina_stringshare_replace(&xdg_runtime_dir, NULL); |
342 | } | 342 | } |
343 | else if ((st.st_mode & 0777) != 0700) | 343 | else if ((st.st_mode & 0777) != 0700) |
@@ -350,7 +350,7 @@ efreet_dirs_init(void) | |||
350 | xdg_runtime_dir, st.st_mode & 0777); | 350 | xdg_runtime_dir, st.st_mode & 0777); |
351 | if (chmod(xdg_runtime_dir, 0700) != 0) | 351 | if (chmod(xdg_runtime_dir, 0700) != 0) |
352 | { | 352 | { |
353 | CRITICAL("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s", | 353 | CRI("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s", |
354 | xdg_runtime_dir, st.st_mode & 0777, strerror(errno)); | 354 | xdg_runtime_dir, st.st_mode & 0777, strerror(errno)); |
355 | eina_stringshare_replace(&xdg_runtime_dir, NULL); | 355 | eina_stringshare_replace(&xdg_runtime_dir, NULL); |
356 | } | 356 | } |
diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h index 3863596c94..21f75173be 100644 --- a/src/lib/efreet/efreet_private.h +++ b/src/lib/efreet/efreet_private.h | |||
@@ -91,10 +91,10 @@ | |||
91 | * four macros are defined ERR, WRN, DGB, INF. | 91 | * four macros are defined ERR, WRN, DGB, INF. |
92 | * EFREET_MODULE_LOG_DOM should be defined individually for each module | 92 | * EFREET_MODULE_LOG_DOM should be defined individually for each module |
93 | */ | 93 | */ |
94 | #ifdef CRITICAL | 94 | #ifdef CRI |
95 | #undef CRITICAL | 95 | #undef CRI |
96 | #endif | 96 | #endif |
97 | #define CRITICAL(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__) | 97 | #define CRI(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__) |
98 | #ifdef ERR | 98 | #ifdef ERR |
99 | #undef ERR | 99 | #undef ERR |
100 | #endif | 100 | #endif |