[PATCH 07/10] scripts/basic/fixdep: Fix error log output in do_config_file()

From: SF Markus Elfring
Date: Fri Oct 28 2016 - 04:38:35 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 27 Oct 2016 22:15:14 +0200

The function "perror" was called after a call of the function "fprintf"
in two if branches. So it could happen that an error message was displayed
for a failed print operation instead of the failure according to the call
of the function "fstat" or "open" here.

* Pass the relevant error data in the logging calls directly.

* Express that the corresponding return values are intentionally unused
by casts to void.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
scripts/basic/fixdep.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index be0fdaa..2c4ec91 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -275,13 +275,15 @@ static void do_config_file(const char *filename)

fd = open(filename, O_RDONLY);
if (fd < 0) {
- fprintf(stderr, "fixdep: error opening config file: ");
- perror(filename);
+ (void) fprintf(stderr,
+ "fixdep: error opening config file: %s: %s\n",
+ filename, strerror(errno));
exit(2);
}
if (fstat(fd, &st) < 0) {
- fprintf(stderr, "fixdep: error fstat'ing config file: ");
- perror(filename);
+ (void) fprintf(stderr,
+ "fixdep: error fstat'ing config file: %s: %s\n",
+ filename, strerror(errno));
exit(2);
}
if (st.st_size == 0)
--
2.10.1