From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
Kamil Rytarowski <kamil@netbsd.org>,
berrange@redhat.com
Subject: [PATCH] Do not use %m in common code to print error messages
Date: Fri, 18 Oct 2019 12:44:38 +0200 [thread overview]
Message-ID: <20191018104438.6158-1-thuth@redhat.com> (raw)
The %m format specifier is an extension from glibc - and when compiling
QEMU for NetBSD, the compiler correctly complains, e.g.:
/home/qemu/qemu-test.ELjfrQ/src/util/main-loop.c: In function 'sigfd_handler':
/home/qemu/qemu-test.ELjfrQ/src/util/main-loop.c:64:13: warning: %m is only
allowed in syslog(3) like functions [-Wformat=]
printf("read from sigfd returned %zd: %m\n", len);
^
Let's use g_strerror() here instead, which is an easy-to-use wrapper
around the thread-safe strerror_r() function.
While we're at it, also convert the "printf()" in main-loop.c into
the preferred "error_report()".
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/misc/tmp421.c | 8 ++++++--
util/main-loop.c | 4 +++-
util/systemd.c | 5 +++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c
index 9f044705fa..f23c46a40a 100644
--- a/hw/misc/tmp421.c
+++ b/hw/misc/tmp421.c
@@ -120,7 +120,9 @@ static void tmp421_get_temperature(Object *obj, Visitor *v, const char *name,
int tempid;
if (sscanf(name, "temperature%d", &tempid) != 1) {
- error_setg(errp, "error reading %s: %m", name);
+ const char *errmsg = g_strerror(errno);
+ error_setg(errp, "error reading %s: %s", name, errmsg);
+ g_free((gpointer)errmsg);
return;
}
@@ -160,7 +162,9 @@ static void tmp421_set_temperature(Object *obj, Visitor *v, const char *name,
}
if (sscanf(name, "temperature%d", &tempid) != 1) {
- error_setg(errp, "error reading %s: %m", name);
+ const char *errmsg = g_strerror(errno);
+ error_setg(errp, "error reading %s: %s", errmsg);
+ g_free((gpointer)errmsg);
return;
}
diff --git a/util/main-loop.c b/util/main-loop.c
index e3eaa55866..e95d93fef3 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -61,7 +61,9 @@ static void sigfd_handler(void *opaque)
}
if (len != sizeof(info)) {
- printf("read from sigfd returned %zd: %m\n", len);
+ const char *errmsg = g_strerror(errno);
+ error_report("read from sigfd returned %zd: %s", len, errmsg);
+ g_free((gpointer)errmsg);
return;
}
diff --git a/util/systemd.c b/util/systemd.c
index d22e86c707..17862c704f 100644
--- a/util/systemd.c
+++ b/util/systemd.c
@@ -59,9 +59,10 @@ unsigned int check_socket_activation(void)
* descriptor is invalid, so socket activation has gone wrong
* and we should exit.
*/
+ const char *errmsg = g_strerror(errno);
error_report("Socket activation failed: "
- "invalid file descriptor fd = %d: %m",
- fd);
+ "invalid file descriptor fd = %d: %s", fd, errmsg);
+ g_free((gpointer)errmsg);
exit(EXIT_FAILURE);
}
}
--
2.18.1
next reply other threads:[~2019-10-18 10:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 10:44 Thomas Huth [this message]
2019-10-18 10:57 ` [PATCH] Do not use %m in common code to print error messages Daniel P. Berrangé
2019-10-18 11:31 ` Thomas Huth
2019-10-18 11:37 ` Daniel P. Berrangé
2019-10-18 11:40 ` Thomas Huth
2019-10-18 23:29 ` no-reply
2019-10-18 23:31 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018104438.6158-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=berrange@redhat.com \
--cc=kamil@netbsd.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).