dbus/dbus dbus-sysdeps-unix.c,1.16.2.1,1.16.2.2

[Havoc Pennington]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv26622/dbus

Modified Files:
      Tag: DBUS_1_0
	dbus-sysdeps-unix.c 
Log Message:
2007-04-27  Havoc Pennington  <hp at redhat.com>

	* dbus/dbus-sysdeps-unix.c (_dbus_open_socket): fix #10781 from
	Tobias Nygren, checking pointer to fd vs. 0 rather than checking
	the fd itself



Index: dbus-sysdeps-unix.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-unix.c,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- dbus-sysdeps-unix.c	3 Mar 2007 10:38:20 -0000	1.16.2.1
+++ dbus-sysdeps-unix.c	27 Apr 2007 17:58:11 -0000	1.16.2.2
@@ -76,14 +76,14 @@
 #endif
 
 static dbus_bool_t
-_dbus_open_socket (int              *fd,
+_dbus_open_socket (int              *fd_p,
                    int               domain,
                    int               type,
                    int               protocol,
                    DBusError        *error)
 {
-  *fd = socket (domain, type, protocol);
-  if (fd >= 0)
+  *fd_p = socket (domain, type, protocol);
+  if (*fd_p >= 0)
     {
       return TRUE;
     }