[PATCH v2] commands: don't use stale errno when calling fb_open

Ahmad Fatoum a.fatoum at pengutronix.de
Tue Jun 11 02:12:22 PDT 2019


fb_open returns a pointer and doesn't populate errno, which will
result in a stale errno being evaluated by perror() on failure.
Fix this by using strerror with the proper argument instead at call sites.

While at it, correct the message prefix typo (s/fb_open/fb_open/).

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
Changes since v1:
 * use strerror instead of perror/errno as suggested by Andrey & Sascha
 * negated PTR_ERR output, so the error is positive

 commands/fbtest.c | 5 +++--
 commands/splash.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/commands/fbtest.c b/commands/fbtest.c
index e5dd8ba7fabf..ff24a8252a8c 100644
--- a/commands/fbtest.c
+++ b/commands/fbtest.c
@@ -271,8 +271,9 @@ static int do_fbtest(int argc, char *argv[])
 
 	sc = fb_open(fbdev);
 	if (IS_ERR(sc)) {
-		perror("fd_open");
-		return PTR_ERR(sc);
+		int ret = -PTR_ERR(sc);
+		printf("fb_open: %s\n", strerror(ret));
+		return ret;
 	}
 
 	if (!pattern_name) {
diff --git a/commands/splash.c b/commands/splash.c
index 2b70b296837e..abd82873cb6d 100644
--- a/commands/splash.c
+++ b/commands/splash.c
@@ -54,8 +54,9 @@ static int do_splash(int argc, char *argv[])
 
 	sc = fb_open(fbdev);
 	if (IS_ERR(sc)) {
-		perror("fd_open");
-		return PTR_ERR(sc);
+		int ret = -PTR_ERR(sc);
+		printf("fb_open: %s\n", strerror(ret));
+		return ret;
 	}
 
 	buf = gui_screen_render_buffer(sc);
-- 
2.20.1




More information about the barebox mailing list