From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 12 Mar 2015 18:29:40 +0000 (+0000)
Subject: main: reload_pipe is (despite its name) a socket pair
X-Git-Tag: dbus-1.9.16~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=378e01c0d04fa9bc4a5a2f725ac332acf83793af;p=thirdparty%2Fdbus.git

main: reload_pipe is (despite its name) a socket pair

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/bus/main.c b/bus/main.c
index 0c27b667d..d9b9a8d1c 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -45,7 +45,9 @@ static BusContext *context;
 
 #ifdef DBUS_UNIX
 
-static int reload_pipe[2];
+/* Despite its name and its unidirectional nature, this is actually
+ * a socket pair. */
+static DBusSocket reload_pipe[2];
 #define RELOAD_READ_END 0
 #define RELOAD_WRITE_END 1
 
@@ -353,10 +355,10 @@ close_reload_pipe (DBusWatch **watch)
     *watch = NULL;
 
     _dbus_close_socket (reload_pipe[RELOAD_READ_END], NULL);
-    reload_pipe[RELOAD_READ_END] = -1;
+    DBUS_SOCKET_INVALIDATE (reload_pipe[RELOAD_READ_END]);
 
     _dbus_close_socket (reload_pipe[RELOAD_WRITE_END], NULL);
-    reload_pipe[RELOAD_WRITE_END] = -1;
+    DBUS_SOCKET_INVALIDATE (reload_pipe[RELOAD_WRITE_END]);
 }
 #endif /* DBUS_UNIX */