github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 02:56:52 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrntrace: fix several compiler warnings

Browse Source 
This commit fixes several compiler warnings before enabling compiler
options to harden software by:
- remove unused variables;
- add parentheses around assignment as compiler suggests;
- print warning if format string is truncated.

Tracked-On: #1122
Signed-off-by: Yan, Like <like.yan@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Yan, Like 2018-09-20 09:41:09 +08:00 committed by lijinxia
parent 1b9a3b3e71
commit 5e0acac490
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/acrntrace/acrntrace.c
View File

@ -141,7 +141,7 @@ static int get_cpu_num(void)
return -1; return -1;
} }
while (pdir = readdir(dir)) { while ((pdir = readdir(dir)) != NULL) {
ret = strstr(pdir->d_name, dev_prefix); ret = strstr(pdir->d_name, dev_prefix);
if (ret) if (ret)
cpu_num++; cpu_num++;
@ -154,20 +154,22 @@ static int get_cpu_num(void)
static int create_trace_file_dir(char *dir) static int create_trace_file_dir(char *dir)
{ {
int err = 0; int err = 0, ret;
char cmd[CMD_MAX_LEN]; char time_str[TIME_STR_LEN + 1];
char time_str[TIME_STR_LEN];
time_t timep; time_t timep;
struct tm *p; struct tm *p;
struct stat st; struct stat st;
time(&timep); time(&timep);
p = localtime(&timep); p = localtime(&timep);
if (p) if (p) {
snprintf(time_str, TIME_STR_LEN, "%d%02d%02d-%02d%02d%02d", ret = snprintf(time_str, TIME_STR_LEN + 1,
(1900 + p->tm_year), (1 + p->tm_mon), p->tm_mday, "%04d%02d%02d-%02d%02d%02d",
p->tm_hour, p->tm_min, p->tm_sec); (1900 + p->tm_year), (1 + p->tm_mon),
else p->tm_mday, p->tm_hour, p->tm_min, p->tm_sec);
if (ret > TIME_STR_LEN)
printf("WARN: time_str may be truncated\n");
} else
snprintf(time_str, TIME_STR_LEN, "00000000-000000"); snprintf(time_str, TIME_STR_LEN, "00000000-000000");
pr_info("start tracing at %s\n", time_str); pr_info("start tracing at %s\n", time_str);
@ -181,7 +183,10 @@ static int create_trace_file_dir(char *dir)
} }
} }
snprintf(dir, TRACE_FILE_DIR_LEN, "%s%s", TRACE_FILE_ROOT, time_str); ret = snprintf(dir, TRACE_FILE_DIR_LEN, "%s%s",
TRACE_FILE_ROOT, time_str);
if (ret < (strlen(TRACE_FILE_ROOT) + strlen(time_str)))
printf("WARN: trace file dir name is truncated\n");
if (stat(dir, &st)) { if (stat(dir, &st)) {
err = mkdir(dir, 0644); err = mkdir(dir, 0644);
if (err) { if (err) {
@ -200,12 +205,8 @@ static int create_trace_file_dir(char *dir)
static void reader_fn(param_t * param) static void reader_fn(param_t * param)
{ {
int ret; int ret;
uint32_t cpuid = param->cpuid;
int fd = param->trace_fd; int fd = param->trace_fd;
shared_buf_t *sbuf = param->sbuf; shared_buf_t *sbuf = param->sbuf;
trace_ev_t e;
struct statvfs stat;
uint64_t freespace;
pr_dbg("reader thread[%lu] created for FILE*[0x%p]\n", pr_dbg("reader thread[%lu] created for FILE*[0x%p]\n",
pthread_self(), fp); pthread_self(), fp);