Mercurial > hg > dav / file comparison

comparison: ucx/logging.c

ucx/logging.c

changeset 505
481802342fdf
parent 335
c1bc13faadaa
equal deleted inserted replaced
504:bf3695fee719 505:481802342fdf
48 ucx_map_int_put(logger->levels, l, (void*) "[ERROR]"); 48 ucx_map_int_put(logger->levels, l, (void*) "[ERROR]");
49 l = UCX_LOGGER_WARN; 49 l = UCX_LOGGER_WARN;
50 ucx_map_int_put(logger->levels, l, (void*) "[WARNING]"); 50 ucx_map_int_put(logger->levels, l, (void*) "[WARNING]");
51 l = UCX_LOGGER_INFO; 51 l = UCX_LOGGER_INFO;
52 ucx_map_int_put(logger->levels, l, (void*) "[INFO]"); 52 ucx_map_int_put(logger->levels, l, (void*) "[INFO]");
53 l = UCX_LOGGER_DEBUG;
54 ucx_map_int_put(logger->levels, l, (void*) "[DEBUG]");
53 l = UCX_LOGGER_TRACE; 55 l = UCX_LOGGER_TRACE;
54 ucx_map_int_put(logger->levels, l, (void*) "[TRACE]"); 56 ucx_map_int_put(logger->levels, l, (void*) "[TRACE]");
55 } 57 }
56 58
57 return logger; 59 return logger;
67 69
68 void ucx_logger_logf(UcxLogger *logger, unsigned int level, const char* file, 70 void ucx_logger_logf(UcxLogger *logger, unsigned int level, const char* file,
69 const unsigned int line, const char *format, ...) { 71 const unsigned int line, const char *format, ...) {
70 if (level <= logger->level) { 72 if (level <= logger->level) {
71 char msg[UCX_LOGGER_MSGMAX]; 73 char msg[UCX_LOGGER_MSGMAX];
72 char *text; 74 const char *text;
73 size_t k = 0; 75 size_t k = 0;
74 size_t n; 76 size_t n;
75 77
76 if ((logger->mask & UCX_LOGGER_LEVEL) > 0) { 78 if ((logger->mask & UCX_LOGGER_LEVEL) > 0) {
77 text = (char*) ucx_map_int_get(logger->levels, level); 79 text = (const char*) ucx_map_int_get(logger->levels, level);
80 if (!text) {
81 text = "[UNKNOWN]";
82 }
78 n = strlen(text); 83 n = strlen(text);
79 n = n > 256 ? 256 : n; 84 n = n > 256 ? 256 : n;
80 memcpy(msg+k, text, n); 85 memcpy(msg+k, text, n);
81 k += n; 86 k += n;
82 msg[k++] = ' '; 87 msg[k++] = ' ';
90 memcpy(msg+k, file, n); 95 memcpy(msg+k, file, n);
91 k += n; 96 k += n;
92 k += sprintf(msg+k, ":%u ", line); 97 k += sprintf(msg+k, ":%u ", line);
93 } 98 }
94 99
95 msg[k++] = '-'; msg[k++] = ' '; 100 if (k > 0) {
101 msg[k++] = '-'; msg[k++] = ' ';
102 }
96 103
97 va_list args; 104 va_list args;
98 va_start (args, format); 105 va_start (args, format);
99 k += vsnprintf(msg+k, UCX_LOGGER_MSGMAX-k-1, format, args); 106 k += vsnprintf(msg+k, UCX_LOGGER_MSGMAX-k-1, format, args);
100 va_end (args); 107 va_end (args);

Mercurial Repository: dav

mercurial