#include "e.h"
+#include <Ecore_File.h>
E_API int e_log_dom = -1;
-static const char *_names[] = {
- "CRI",
- "ERR",
- "WRN",
- "INF",
- "DBG",
-};
-
#ifdef HAVE_DLOG
static Eina_Bool _dlog_enabled = EINA_FALSE;
#endif
#ifdef HAVE_DLOG
if (_dlog_enabled)
{
- int log_level, len = 0;
+ int log_level;
const char buf[512];
- char tmp_log_level[512];
-
- len = sizeof(tmp_log_level) - 1;
- tmp_log_level[len] = '\0';
switch (level)
{
case EINA_LOG_LEVEL_CRITICAL:
log_level = DLOG_ERROR;
- strncpy(tmp_log_level, "FATAL", len);
break;
case EINA_LOG_LEVEL_ERR:
log_level = DLOG_ERROR;
- strncpy(tmp_log_level, "ERROR", len);
break;
case EINA_LOG_LEVEL_WARN:
log_level = DLOG_WARN;
- strncpy(tmp_log_level, "WARNING", len);
break;
case EINA_LOG_LEVEL_INFO:
log_level = DLOG_INFO;
- strncpy(tmp_log_level, "INFO", len);
break;
case EINA_LOG_LEVEL_DBG:
log_level = DLOG_DEBUG;
- strncpy(tmp_log_level, "DEBUG", len);
break;
default:
log_level = DLOG_VERBOSE;
- strncpy(tmp_log_level, "VERBOSE", len);
break;
}
if (e_config->log_type == E_LOG_TYPE_SYSTEM)
{
print_system_log(log_level, LOG_TAG,
- "%s<%s> %30.30s:%04d %s",
- _names[level > EINA_LOG_LEVEL_DBG ? EINA_LOG_LEVEL_DBG : level],
- d->domain_str,file, line, buf);
+ "<%s> %18.18s:%04d %s",
+ d->domain_str, ecore_file_file_get(file), line, buf);
}
else
{
dlog_print(log_level, LOG_TAG,
- "%s<%s> %30.30s:%04d %s",
- _names[level > EINA_LOG_LEVEL_DBG ? EINA_LOG_LEVEL_DBG : level],
- d->domain_str,file, line, buf);
+ "<%s> %18.18s:%04d %s",
+ d->domain_str, ecore_file_file_get(file), line, buf);
}
}
else
{
dlog_print(log_level, LOG_TAG,
- "%s<%s> %30.30s:%04d %s",
- _names[level > EINA_LOG_LEVEL_DBG ? EINA_LOG_LEVEL_DBG : level],
- d->domain_str,file, line, buf);
+ "<%s> %18.18s:%04d %s",
+ d->domain_str, ecore_file_file_get(file), line, buf);
}
return;
}
color = eina_log_level_color_get(level);
fprintf(stdout,
- "%s%s<" EINA_COLOR_RESET "%s%s>" EINA_COLOR_RESET "%30.30s:%04d" EINA_COLOR_RESET " ",
- color, _names[level > EINA_LOG_LEVEL_DBG ? EINA_LOG_LEVEL_DBG : level],
- d->domain_str, color, file, line);
+ "%s<" EINA_COLOR_RESET "%s%s>" EINA_COLOR_RESET "%18.18s:%04d" EINA_COLOR_RESET " ",
+ color, d->domain_str, color, ecore_file_file_get(file), line);
vfprintf(stdout, fmt, args);
putc('\n', stdout);
}
do \
{ \
if (ec) \
- INF("%10.10s|w:0x%08zx|ec:%8p|", \
+ INF("%8.8s|w:0x%08zx|ec:%8p|", \
(t), (e_client_util_win_get(ec)), (ec)); \
else \
- INF("%10.10s| | |", \
+ INF("%8.8s| | |", \
(t)); \
} \
while (0)
do \
{ \
if (ec) \
- INF("%10.10s|w:0x%08zx|ec:%8p|"f, \
+ INF("%8.8s|w:0x%08zx|ec:%8p|"f, \
(t), (e_client_util_win_get(ec)), (ec), ##x); \
else \
- INF("%10.10s| | |"f, \
+ INF("%8.8s| | |"f, \
(t), ##x); \
} \
while (0)
do \
{ \
if (ec) \
- DBG("%10.10s|w:0x%08zx|ec:%8p|"f, \
+ DBG("%8.8s|w:0x%08zx|ec:%8p|"f, \
(t), (e_client_util_win_get(ec)), (ec), ##x); \
else \
- DBG("%10.10s| | |"f, \
+ DBG("%8.8s| | |"f, \
(t), ##x); \
} \
while (0)
do \
{ \
if (ec) \
- ERR("%10.10s|w:0x%08zx|ec:%8p|"f, \
+ ERR("%8.8s|w:0x%08zx|ec:%8p|"f, \
(t), (e_client_util_win_get(ec)), (ec), ##x); \
else \
- ERR("%10.10s| | |"f, \
+ ERR("%8.8s| | |"f, \
(t), ##x); \
} \
while (0)