From 42a50e194cf3a7530d6e1f5110b6395b204f2895 Mon Sep 17 00:00:00 2001
From: armink <armink.ztl@gmail.com>
Date: Fri, 4 Jan 2019 22:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=86=E8=8A=82=E6=A0=BC=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: armink <armink.ztl@gmail.com>
---
 easylogger/src/elog.c | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/easylogger/src/elog.c b/easylogger/src/elog.c
index 93125dc..f5b1583 100644
--- a/easylogger/src/elog.c
+++ b/easylogger/src/elog.c
@@ -404,7 +404,6 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
     if (level > elog.filter.level) {
         return;
     } else if (!strstr(tag, elog.filter.tag)) { /* tag filter */
-        //TODO 可以考虑采用KMP及朴素模式匹配字符串，提升性能
         return;
     }
     /* args point to the first variable parameter */
@@ -478,7 +477,6 @@ void elog_output(uint8_t level, const char *tag, const char *file, const char *f
         }
         /* package thread info */
         if (get_fmt_enabled(level, ELOG_FMT_LINE)) {
-            //TODO snprintf资源占用可能较高，待优化
             snprintf(line_num, ELOG_LINE_NUM_MAX_LEN, "%ld", line);
             log_len += elog_strcpy(log_len, log_buf + log_len, line_num);
         }
@@ -689,60 +687,47 @@ void elog_hexdump(const char *name, uint8_t width, uint8_t *buf, uint16_t size)
         return;
     }
 
-   /* level filter */
+    /* level filter */
     if (ELOG_LVL_DEBUG > elog.filter.level) {
         return;
     } else if (!strstr(name, elog.filter.tag)) { /* tag filter */
-        //TODO 可以考虑采用KMP及朴素模式匹配字符串，提升性能
         return;
     }
  
     /* lock output */
     elog_output_lock();
 
-    for (i = 0; i < size; i += width)
-    {
+    for (i = 0; i < size; i += width) {
         /* package header */
         fmt_result = snprintf(log_buf, ELOG_LINE_BUF_SIZE, "D/HEX %s: %04X-%04X: ", name, i, i + width);
         /* calculate log length */
-        if ((fmt_result > -1) && (fmt_result <= ELOG_LINE_BUF_SIZE))
-        {
+        if ((fmt_result > -1) && (fmt_result <= ELOG_LINE_BUF_SIZE)) {
             log_len = fmt_result;
-        }
-        else
-        {
+        } else {
             log_len = ELOG_LINE_BUF_SIZE;
         }
         /* dump hex */
-        for (j = 0; j < width; j++)
-        {
-            if (i + j < size)
-            {
+        for (j = 0; j < width; j++) {
+            if (i + j < size) {
                 snprintf(dump_string, sizeof(dump_string), "%02X ", buf[i + j]);
-            }
-            else
-            {
+            } else {
                 strncpy(dump_string, "   ", sizeof(dump_string));
             }
             log_len += elog_strcpy(log_len, log_buf + log_len, dump_string);
-            if ((j + 1) % 8 == 0)
-            {
+            if ((j + 1) % 8 == 0) {
                 log_len += elog_strcpy(log_len, log_buf + log_len, " ");
             }
         }
         log_len += elog_strcpy(log_len, log_buf + log_len, "  ");
         /* dump char for hex */
-        for (j = 0; j < width; j++)
-        {
-            if (i + j < size)
-            {
+        for (j = 0; j < width; j++) {
+            if (i + j < size) {
                 snprintf(dump_string, sizeof(dump_string), "%c", __is_print(buf[i + j]) ? buf[i + j] : '.');
                 log_len += elog_strcpy(log_len, log_buf + log_len, dump_string);
             }
         }
         /* overflow check and reserve some space for newline sign */
-        if (log_len + strlen(ELOG_NEWLINE_SIGN) > ELOG_LINE_BUF_SIZE)
-        {
+        if (log_len + strlen(ELOG_NEWLINE_SIGN) > ELOG_LINE_BUF_SIZE) {
             log_len = ELOG_LINE_BUF_SIZE - strlen(ELOG_NEWLINE_SIGN);
         }
         /* package newline sign */