Skip to content

Commit

Permalink
x86/vdso/vdso2c: Correct error messages on file open
Browse files Browse the repository at this point in the history
err() message in main() is misleading: it should print `outfilename`,
which is argv[3], not argv[2].

Correct error messages to be more precise about what failed and for
which file.

Co-developed-by: Andrei Vagin <avagin@openvz.org>
Signed-off-by: Andrei Vagin <avagin@openvz.org>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Andy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20200420183256.660371-2-dima@arista.com
  • Loading branch information
Dmitry Safonov authored and Thomas Gleixner committed Apr 21, 2020
1 parent ae83d0b commit 089ef55
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/entry/vdso/vdso2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static void map_input(const char *name, void **addr, size_t *len, int prot)

int fd = open(name, O_RDONLY);
if (fd == -1)
err(1, "%s", name);
err(1, "open(%s)", name);

tmp_len = lseek(fd, 0, SEEK_END);
if (tmp_len == (off_t)-1)
Expand Down Expand Up @@ -240,7 +240,7 @@ int main(int argc, char **argv)
outfilename = argv[3];
outfile = fopen(outfilename, "w");
if (!outfile)
err(1, "%s", argv[2]);
err(1, "fopen(%s)", outfilename);

go(raw_addr, raw_len, stripped_addr, stripped_len, outfile, name);

Expand Down

0 comments on commit 089ef55

Please sign in to comment.