7 files changed, 5 insertions, 138 deletions

diff --git a/src/libjin/Utils/endian.h b/src/libjin/Utils/je_endian.h
index 01def88..01def88 100644
--- a/src/libjin/Utils/endian.h
+++ b/src/libjin/Utils/je_endian.h
diff --git a/src/libjin/Utils/Log.cpp b/src/libjin/Utils/je_log.cpp
index 5299942..2bcb25a 100644
--- a/src/libjin/Utils/Log.cpp
+++ b/src/libjin/Utils/je_log.cpp
@@ -1,2 +1,2 @@
 #define LOGHELPER_IMPLEMENT
-#include "log.h"
\ No newline at end of file
+#include "je_log.h"
\ No newline at end of file
diff --git a/src/libjin/Utils/Log.h b/src/libjin/Utils/je_log.h
index e4ed879..9b3fe2c 100644
--- a/src/libjin/Utils/Log.h
+++ b/src/libjin/Utils/je_log.h
@@ -4,6 +4,7 @@
 */
 #ifndef __LOG_HELPER_H
 #define __LOG_HELPER_H
+
 #include <string> 
 #include <iostream>
 #include <fstream>
diff --git a/src/libjin/Utils/macros.h b/src/libjin/Utils/je_macros.h
index e19193c..e19193c 100644
--- a/src/libjin/Utils/macros.h
+++ b/src/libjin/Utils/je_macros.h
diff --git a/src/libjin/Utils/unittest.cpp b/src/libjin/Utils/je_unittest.cpp
index 44f1ae5..65dbaad 100644
--- a/src/libjin/Utils/unittest.cpp
+++ b/src/libjin/Utils/je_unittest.cpp
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "je_utils.h"
 #if UNITTEST
 
 #include <iostream>
diff --git a/src/libjin/Utils/utils.h b/src/libjin/Utils/je_utils.h
index 1654a8f..583f892 100644
--- a/src/libjin/Utils/utils.h
+++ b/src/libjin/Utils/je_utils.h
@@ -1,8 +1,8 @@
 #ifndef __LIBJIN_UTILS_H
 #define __LIBJIN_UTILS_H
 
-#include "macros.h"
-#include "endian.h"
+#include "je_macros.h"
+#include "je_endian.h"
 
 #define UNITTEST 0
 
diff --git a/src/libjin/Utils/log.h b/src/libjin/Utils/log.h
deleted file mode 100644
index e4ed879..0000000
--- a/src/libjin/Utils/log.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
-* Single.h/loghelper.h
-* Copyright (C) 2017~2018 chai
-*/
-#ifndef __LOG_HELPER_H
-#define __LOG_HELPER_H
-#include <string> 
-#include <iostream>
-#include <fstream>
-#include <stdarg.h>
-
-class Loghelper
-{
-public:
-    // log���Ŀ��
-    enum Direction
-    {
-        DIR_CERR = 1 << 1, // ��׼������
-        DIR_FILE = 1 << 2, // log�ļ�
-    };
-
-    // ����ȼ�
-    enum Level
-    {
-        LV_NONE = 0,  // none   
-        LV_ERROR = 1 << 1,  // error 
-        LV_WARN = 1 << 2,  // warn 
-        LV_INFO = 1 << 3,  // info 
-        LV_DEBUG = 1 << 4, // debug 
-        LV_ALL = 0xffffffff
-    };
-
-    static void log(Level _level, const char* _fmt, ...);
-
-    // �ض���
-    static void redirect(unsigned int _dir, char* _path = nullptr);
-
-    // ɸѡ����ȼ�
-    static void restrict(unsigned int levels);
-
-    static void close();
-
-private:
-    static unsigned int dir;    // ���Ŀ��
-    static unsigned int levels; // ����ȼ�
-    static std::ofstream fs;    // ����ļ��� 
-};
-
-typedef Loghelper::Level Loglevel;
-
-#ifdef LOGHELPER_IMPLEMENT
-
-#define hasbit(flag, bit) ((flag & bit) == bit)
-
-unsigned int Loghelper::dir = Loghelper::Direction::DIR_CERR;
-unsigned int Loghelper::levels = Loghelper::Level::LV_ALL;
-std::ofstream Loghelper::fs;
-
-void Loghelper::log(Level _level, const char* _fmt, ...)
-{
-    if (!hasbit(levels, _level))
-        return;
-#define FORMAT_MSG_BUFFER_SIZE (204800)  
-    const char* levelStr = nullptr;
-    switch (_level)
-    {
-    case LV_ERROR:
-        levelStr = "[Jin Error]:";
-        break;
-    case LV_WARN:
-        levelStr = "[Jin Warn]:";
-        break;
-    case LV_INFO:
-        levelStr = "[Jin Info]:";
-        break;
-    case LV_DEBUG:
-        levelStr = "[Jin Debug]:";
-        break;
-    default:
-        levelStr = "[Jin Unknown]:";
-        break;
-    }
-    char buffer[FORMAT_MSG_BUFFER_SIZE + 1] = { 0 };
-    strcpy(buffer, levelStr);
-    va_list args;
-    va_start(args, _fmt);
-    vsnprintf(buffer + strlen(buffer), FORMAT_MSG_BUFFER_SIZE, _fmt, args);
-    va_end(args);
-    if (hasbit(dir, DIR_CERR))
-    {
-        std::cerr << buffer << std::endl;
-    }
-    if (hasbit(dir, DIR_FILE))
-    {
-        fs << buffer << std::endl;
-    }
-#undef FORMAT_MSG_BUFFER_SIZE
-}
-
-// �ض���
-void Loghelper::redirect(unsigned int _dir, char* _path)
-{
-    dir = _dir;
-    if (hasbit(dir, DIR_FILE))
-    {
-        try
-        {
-            fs.open(_path, std::ios_base::app);
-        }
-        catch (std::ios_base::failure& e) {
-            dir = DIR_CERR;
-            log(Level::LV_WARN, "�ض���log·�� %s ʧ��", _path);
-        }
-    }
-}
-
-// ɸѡ����ȼ�
-void Loghelper::restrict(unsigned int _levels)
-{
-    levels = _levels;
-}
-
-void Loghelper::close()
-{
-    if (!fs.fail())
-        fs.close();
-    fs.clear();
-}
-
-#undef hasbit
-
-#endif
-
-#endif