OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools: logger: Fix resources release 

Improved release of resources when an error is detected.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
This commit is contained in:
Adrian Warecki 2023-09-18 15:52:14 +02:00 committed by Liam Girdwood
parent 651af68384
commit 966ad48e7e
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/logger/logger.c
View File

@ -134,7 +134,12 @@ static int snapshot(const char *name)
snprintf(buffer, sizeof(buffer), "0x%6.6x: 0x%8.8x\n", addr, val); snprintf(buffer, sizeof(buffer), "0x%6.6x: 0x%8.8x\n", addr, val);
count = fwrite(buffer, 1, strlen(buffer), out_fd); i = strlen(buffer);
count = fwrite(buffer, 1, i, out_fd);
if (count != i) {
fprintf(stderr, "error: an error occurred during write to %s: %s\n",
poutname, strerror(errno));
}
addr += 4; addr += 4;
} }
@ -164,7 +169,12 @@ static int configure_uart(const char *file, unsigned int baud)
tio.c_cc[VMIN] = 1; tio.c_cc[VMIN] = 1;
ret = tcsetattr(fd, TCSANOW, &tio); ret = tcsetattr(fd, TCSANOW, &tio);
return ret < 0 ? -errno : fd; if (ret < 0) {
close(fd);
return -errno;
}
return fd;
} }
/* Concantenate `config->filter_config` with `input` + `\n` */ /* Concantenate `config->filter_config` with `input` + `\n` */
@ -266,7 +276,9 @@ static void *wait_open(const char *watched_dir, const char *expected_file)
} }
fopenit: fopenit:
stat(fpath, &expected_stat); if (stat(fpath, &expected_stat))
goto cleanup;
if ((expected_stat.st_mode & S_IFMT) == S_IFDIR) if ((expected_stat.st_mode & S_IFMT) == S_IFDIR)
ret_stream = opendir(fpath); ret_stream = opendir(fpath);
else else
@ -362,7 +374,8 @@ int main(int argc, char *argv[])
if (i < 0 || 1 < i) { if (i < 0 || 1 < i) {
fprintf(stderr, "%s: invalid option: -e %s\n", fprintf(stderr, "%s: invalid option: -e %s\n",
APP_NAME, optarg); APP_NAME, optarg);
return -EINVAL; ret = -EINVAL;
goto out;
} }
config.relative_timestamps = i; config.relative_timestamps = i;
break; break;
@ -371,7 +384,8 @@ int main(int argc, char *argv[])
config.time_precision = atoi(optarg); config.time_precision = atoi(optarg);
if (config.time_precision < 0) { if (config.time_precision < 0) {
usage(); usage();
return -EINVAL; ret = -EINVAL;
goto out;
} }
break; break;
case 'g': case 'g':
@ -401,8 +415,10 @@ int main(int argc, char *argv[])
usage(); usage();
} }
if (snapshot_file) if (snapshot_file) {
return baud ? EINVAL : -snapshot(snapshot_file); ret = baud ? EINVAL : -snapshot(snapshot_file);
goto out;
}
if (!config.ldc_file) { if (!config.ldc_file) {
fprintf(stderr, "error: Missing ldc file\n"); fprintf(stderr, "error: Missing ldc file\n");