* bus/bus.c, dbus/dbus-sysdeps-unix.c, dbus/dbus-sysdeps.h: rename pipe related write...

diff --git a/ChangeLog b/ChangeLog
index a6b6b1f..a281126 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
 
+       * bus/bus.c, dbus/dbus-sysdeps-unix.c, dbus/dbus-sysdeps.h:
+       rename pipe related write() function calls to _dbus_write_pipe().
+
+2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
+
        * dbus-win.patch: added bus/config-loader-libexpat.c patch, 
        uses DBUS_WIN for alls win32 related #ifdefs, 
        some minor cleanups

diff --git a/bus/bus.c b/bus/bus.c
index 26f91ad..020ac54 100644 (file)
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -625,7 +625,7 @@ bus_context_new (const DBusString *config_file,
         }
 
       bytes = _dbus_string_get_length (&addr);
-      if (_dbus_write_socket (print_addr_fd, &addr, 0, bytes) != bytes)
+      if (_dbus_write_pipe (print_addr_fd, &addr, 0, bytes) != bytes)
         {
           dbus_set_error (error, DBUS_ERROR_FAILED,
                           "Printing message bus address: %s\n",
@@ -726,7 +726,7 @@ bus_context_new (const DBusString *config_file,
         }
 
       bytes = _dbus_string_get_length (&pid);
-      if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
+      if (_dbus_write_pipe (print_pid_fd, &pid, 0, bytes) != bytes)
         {
           dbus_set_error (error, DBUS_ERROR_FAILED,
                           "Printing message bus PID: %s\n",

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index ebb269c..2329671 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -169,6 +169,15 @@ _dbus_write_socket (int               fd,
   return _dbus_write (fd, buffer, start, len);
 }
 
+int
+_dbus_write_pipe (DBusPipe         pipe,
+                  const DBusString *buffer,
+                  int               start,
+                  int               len)
+{
+       return _dbus_write (pipe, buffer, start, len);
+}
+
 /**
  * Like _dbus_write_two() but only works on sockets and is thus
  * available on Windows.

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 9bc9118..8ca1cad 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -302,6 +302,12 @@ dbus_bool_t _dbus_path_is_absolute    (const DBusString *filename);
 
 dbus_bool_t _dbus_get_standard_session_servicedirs (DBusList **dirs);
 
+typedef int DBusPipe;
+int _dbus_write_pipe (DBusPipe          pipe,
+                      const DBusString *buffer,
+                      int               start,
+                      int               len);
+
 /** Opaque type for reading a directory listing */
 typedef struct DBusDirIter DBusDirIter;