Mod aaa-12 重新格式化代码，更新工程配置

RCA：
SOL：
修改人：huangxin
检视人：huangxin

.idea/encodings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$/ztp_main.c" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

confingure/prase_config.c

@@ -108,7 +108,9 @@ static int __get_dev_port_config(config_t *pCfg, DEV_PORT_CONFIG pPortCfg[], int
                 if(config_setting_lookup_string(pSubVal, "backup_dns", (const char **)&pString) == CONFIG_TRUE) {
                     strcpy(pPortCfg[i].wan_conf.static_config.backup_dns, pString);
                 }
+
                 break;
+
             case PPPOE_TYPE:
                 pSubVal = config_setting_get_member(pVal, "pppoe");
 
@@ -123,9 +125,12 @@ static int __get_dev_port_config(config_t *pCfg, DEV_PORT_CONFIG pPortCfg[], int
                 if(config_setting_lookup_string(pSubVal, "password", (const char **)&pString) == CONFIG_TRUE) {
                     strcpy(pPortCfg[i].wan_conf.pppoe_config.password, pString);
                 }
+
                 break;
+
             case DHCP_TYPE:
                 break;
+
             default:
                 break;
         }
@@ -276,7 +281,9 @@ static void *__cfg_file_monitor(void *p)
         if(select(fd + 1, &fds, NULL, NULL, NULL) > 0) {
             ssize_t len;
             unsigned int index = 0;
+
             while(((len = read(fd, &buf, MAX_PATH)) < 0) && (errno == EINTR));       //没有读取到事件。
+
             while(index < len) {
                 event = (struct inotify_event *)(buf + index);
                 //LOG_EX(LOG_Info, "event->mask: 0x%08x\n", event->mask);
@@ -296,6 +303,7 @@ static void *__cfg_file_monitor(void *p)
                     default:
                         break;
                 }
+
                 //获取事件。
                 index += sizeof(struct inotify_event) + event->len;             //移动index指向下一个事件。
             }

include/log.h

@@ -31,8 +31,7 @@ extern "C" {
 /** @enum _LOG_LEVEL_
  *  LOG等级枚举变量
  */
-typedef enum
+typedef enum {
-{
     LOG_Fatal   = (1u << 0u),
     LOG_Error   = (1u << 1u),
     LOG_Warn    = (1u << 2u),
@@ -146,13 +145,10 @@ static inline int dirname_v2(const char* path, char* dir)
 {
     const char *tail = strrchr(path, '/');
 
-    if(tail)
+    if(tail) {
-    {
         memcpy(dir, path, tail - path);
         dir[tail - path] = 0;
-    }
+    } else {
-    else
-    {
         strcpy(dir, "./");
     }
 

log/hexdump.c

@@ -37,15 +37,13 @@ char* IHW_bin2hex(char *p, const unsigned char *cp, int count)
  */
 int hex_to_bin(char ch)
 {
-    if((ch >= '0') && (ch <= '9'))
+    if((ch >= '0') && (ch <= '9')) {
-    {
         return ch - '0';
     }
 
     ch = tolower(ch);
 
-    if((ch >= 'a') && (ch <= 'f'))
+    if((ch >= 'a') && (ch <= 'f')) {
-    {
         return ch - 'a' + 10;
     }
 
@@ -94,13 +92,11 @@ void hex_dump_to_buffer(const void *buf, int len, int rowsize,
         goto nil;
     }
 
-    if(len > rowsize)       /* limit to one line at a time */
+    if(len > rowsize) {     /* limit to one line at a time */
-    {
         len = rowsize;
     }
 
-    if((len % groupsize) != 0)  /* no mixed size output */
+    if((len % groupsize) != 0) { /* no mixed size output */
-    {
         groupsize = 1;
     }
 

log/log.c

@@ -126,6 +126,7 @@ static void __logColorOutput(const char *pColFmt, UT_string *pLog)
 static void *__logOutputThread(void *p)
 {
     UNUSED(p);
+
     while(g_bEnableLog) {
         int isWriteLog = FALSE;
         PLOG_ITEM pItem = NULL, pTmp = NULL;
@@ -202,6 +203,7 @@ static void *__logOutputThread(void *p)
         pthread_mutex_unlock(&g_logLock);
 
         usleep(1000);
+
         if(g_LogProcessInfo.pLogFile != NULL && isWriteLog) {
             fflush(g_LogProcessInfo.pLogFile);
         }
@@ -253,6 +255,7 @@ void IHW_InitLOG(const char *pLogTag, const char *pPath, int bEnable)
     memset(strPath, 0, MAX_PATH * 2);
 
     g_LogProcessInfo.pid = getpid();
+
     if(readlink("/proc/self/exe", strPath, MAX_PATH) == -1) {
         strcpy(g_LogProcessInfo.exeName, pLogTag);
     } else {
@@ -399,26 +402,37 @@ const char *LogLeveToString(unsigned int lv)
     switch(lv) {
         case LOG_Fatal:
             return "LOG_Fatal";
+
         case LOG_Error:
             return "LOG_Error";
+
         case LOG_Warn:
             return "LOG_Warn";
+
         case LOG_Debug:
             return "LOG_Debug";
+
         case LOG_Info:
             return "LOG_Info";
+
         case LOG_Test:
             return "LOG_Test";
+
         case LOG_Call:
             return "LOG_Call";
+
         case LOG_Devp:
             return "LOG_Devp";
+
         case LOG_Step:
             return "LOG_Step";
+
         case LOG_Unknown:
             return "LOG_Unknown";
+
         case LOG_All:
             return "LOG_All";
+
         case LOG_Close:
             return "LOG_Close";
 

ztp_main.c

@@ -52,9 +52,11 @@ int main(int argc, char **argv)
     load_dev_config(ZTP_ESN);
 
 #ifdef MONITOR_ZTP_CFG_FILE
+
     while(ret == ERR_OK) {
         usleep(1000);
     }
+
 #endif
 
     IHW_WaitFinishLogout();