Match-id-38e2eab15a40447f44b5c119a3c68cb14e9a3847

cli/src/cgrp.c

@@ -61,7 +61,7 @@ bool CheckSubStr(char **pLine, const char *subsys)
 }
 
 typedef char *(*ParseFileLine)(char *, const char *);
-int ParseFileByLine(char* buffer, int bufferSize, ParseFileLine fn, const char* filepath)
+int ParseFileByLine(char* buffer, int bufferSize, const ParseFileLine fn, const char* filepath)
 {
     FILE *fp = NULL;
     char *result = NULL;

cli/src/logging.h

@@ -6,7 +6,6 @@
 #define _LOGGING_H
 
 #include <stdio.h>
-#include <stdarg.h>
 #include "securec.h"
 #include "basic.h"
 

cli/src/main.c

@@ -125,7 +125,7 @@ static int ParseOneCmdArg(struct CmdArgs *args, char indicator, const char *valu
     return 0;
 }
 
-static inline bool IsCmdArgsValid(struct CmdArgs *args)
+static inline bool IsCmdArgsValid(const struct CmdArgs *args)
 {
     return (strlen(args->devices) > 0) && (strlen(args->rootfs) > 0) && (args->pid > 0);
 }

cli/src/ns.c

@@ -8,7 +8,6 @@
 #include <sched.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "basic.h"
 #include "securec.h"
 #include "logging.h"
 

install/deb/src/main.c

@@ -2,11 +2,11 @@
  * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
  * Description: ascend_docker_install工具，用于辅助用户安装ascend_docker
 */
-#include "cJSON.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include "cJSON.h"
 
 #define MAX_JSON_FILE_SIZE 65535
 #define NUM_ARGS 4