From: Jim Meyering <meyering(a)redhat.com>
* bootstrap (modules): Add ignore-value.
* src/guestfs.c: Include "ignore-value.h".
(stdout_event): Ignore failure to write to stderr.
Also, prefer STDERR_FILENO over the literal "2".
* src/Makefile.am (libguestfs_la_CPPFLAGS): Include gnulib's .h files.
(libprotocol_la_CFLAGS): Remove -Wall -Wno-unused.
---
bootstrap | 1 +
src/Makefile.am | 4 +++-
src/guestfs.c | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bootstrap b/bootstrap
index cea8c40..76e2216 100755
--- a/bootstrap
+++ b/bootstrap
@@ -53,6 +53,7 @@ modules='
gitlog-to-changelog
gnu-make
gnumakefile
+ignore-value
maintainer-makefile
manywarnings
warnings
diff --git a/src/Makefile.am b/src/Makefile.am
index 9eb71b9..8d03a77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ libprotocol_la_SOURCES = \
guestfs_protocol.c \
guestfs_protocol.h
-libprotocol_la_CFLAGS = -Wall -Wno-unused
+libprotocol_la_CFLAGS =
$(BUILT_SOURCES): stamp-generator
@@ -117,6 +117,8 @@ libguestfs_la_LIBADD = libprotocol.la
libguestfs_la_CFLAGS = -Wall
-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
+libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib
+
if HAVE_RPCGEN
guestfs_protocol.c: guestfs_protocol.x
rm -f $@-t $@-t2
diff --git a/src/guestfs.c b/src/guestfs.c
index ad3980f..ecdf9e5 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -59,6 +59,7 @@
#include "guestfs.h"
#include "guestfs_protocol.h"
+#include "ignore-value.h"
#ifdef HAVE_GETTEXT
#include "gettext.h"
@@ -1697,7 +1698,7 @@ stdout_event (struct guestfs_main_loop *ml, guestfs_h *g, void
*data,
/* In verbose mode, copy all log messages to stderr. */
if (g->verbose)
- write (2, buf, n);
+ ignore_value (write (STDERR_FILENO, buf, n));
/* It's an actual log message, send it upwards if anyone is listening. */
if (g->log_message_cb)
--
1.6.4.378.g88f2f