mirror of
https://github.com/alsa-project/alsa-utils
synced 2024-09-07 20:35:42 +02:00
misc: fix incorrect usages of strerror
`strerror` takes the `errno` directly as its argument, negating it will result in an "Unknown error". This fixes such usages across multiple modules. Fixes: https://github.com/alsa-project/alsa-utils/pull/245 Signed-off-by: Tianyi Liu <i.pear@outlook.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
4ce6a0a4af
commit
edff9652c0
3 changed files with 8 additions and 8 deletions
|
@ -510,7 +510,7 @@ int main(int argc, char *argv[])
|
|||
in = fopen(context->batch, "r");
|
||||
if (in == NULL) {
|
||||
fprintf(stderr, "%s: error failed to open file '%s': %s\n",
|
||||
command, context->batch, strerror(-errno));
|
||||
command, context->batch, strerror(errno));
|
||||
my_exit(context, EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -404,7 +404,7 @@ int main(int argc, char *argv[])
|
|||
output = fopen(output_file, "w+");
|
||||
if (output == NULL) {
|
||||
fprintf(stderr, "Unable to create output file \"%s\": %s\n",
|
||||
output_file, strerror(-errno));
|
||||
output_file, strerror(errno));
|
||||
res = EXIT_FAILURE;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -96,7 +96,7 @@ static int load(const char *source_file, void **dst, size_t *dst_size)
|
|||
fd = open(source_file, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, _("Unable to open input file '%s': %s\n"),
|
||||
source_file, strerror(-errno));
|
||||
source_file, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
@ -120,7 +120,7 @@ static int load(const char *source_file, void **dst, size_t *dst_size)
|
|||
buf = buf2;
|
||||
}
|
||||
if (r < 0) {
|
||||
fprintf(stderr, _("Read error: %s\n"), strerror(-errno));
|
||||
fprintf(stderr, _("Read error: %s\n"), strerror(errno));
|
||||
goto _err;
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,7 @@ static int save(const char *output_file, void *buf, size_t size)
|
|||
fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, _("Unable to open output file '%s': %s\n"),
|
||||
fname, strerror(-errno));
|
||||
fname, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
@ -194,11 +194,11 @@ static int save(const char *output_file, void *buf, size_t size)
|
|||
}
|
||||
|
||||
if (r < 0) {
|
||||
fprintf(stderr, _("Write error: %s\n"), strerror(-errno));
|
||||
fprintf(stderr, _("Write error: %s\n"), strerror(errno));
|
||||
if (fd != fileno(stdout)) {
|
||||
if (fname && remove(fname))
|
||||
fprintf(stderr, _("Unable to remove file %s: %s\n"),
|
||||
fname, strerror(-errno));
|
||||
fname, strerror(errno));
|
||||
close(fd);
|
||||
}
|
||||
return 1;
|
||||
|
@ -209,7 +209,7 @@ static int save(const char *output_file, void *buf, size_t size)
|
|||
|
||||
if (fname && rename(fname, output_file)) {
|
||||
fprintf(stderr, _("Unable to rename file '%s' to '%s': %s\n"),
|
||||
fname, output_file, strerror(-errno));
|
||||
fname, output_file, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue