]> git.alsa-project.org Git - alsa-utils.git/commitdiff
misc: fix incorrect usages of `strerror`
authorTianyi Liu <i.pear@outlook.com>
Tue, 21 Nov 2023 15:19:35 +0000 (23:19 +0800)
committerJaroslav Kysela <perex@perex.cz>
Fri, 8 Dec 2023 19:01:04 +0000 (20:01 +0100)
`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>
alsaucm/usecase.c
nhlt/nhlt-dmic-info.c
topology/topology.c

index a5c815591dca94ab2fafdc41fe5598c9ceff15cd..0aea84c6cd1e7d06aa81c618a94d245de1bceb0b 100644 (file)
@@ -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);
                        }
                }
index f1b08574251006f05d98cdd155042e043274ca5c..f08dc85d02eb6f6592f3cacb26d084854f92c0e6 100644 (file)
@@ -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;
                }
index 98b000aa50319478294c7e8a40ce8391ddbf2e5f..9752f888936757bcf411f612f7ab75804c44df88 100644 (file)
@@ -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;
        }