* dbus/dbus-sysdeps-win.c (_dbus_pid_for_log,_dbus_flush_caches): new win32 functions...

diff --git a/ChangeLog b/ChangeLog
index d958084fe580c08ff877f7b0e17cbc8d0079105d..ee9c1bb310ba3d79c34b824a15d3b4a99245ac56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * dbus/dbus-sysdeps-win.c (_dbus_pid_for_log,_dbus_flush_caches): 
+       new win32 functions as counterpart of unix related
+
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
        
        * cmake/modules/FindKDEWIN.cmake,

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 0f26ce71074c3345f372be7dac27f0b23d3e649b..6e71ed10cc79b864b070fc2cec5f93cb2a1df632 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1919,6 +1919,20 @@ _dbus_getuid(void)
   return retval;
 }
 
+/**
+ * The only reason this is separate from _dbus_getpid() is to allow it
+ * on Windows for logging but not for other purposes.
+ * 
+ * @returns process ID to put in log messages
+ */
+unsigned long
+_dbus_pid_for_log (void)
+{
+  return _dbus_getpid ();
+}
+
+
+
 #ifdef DBUS_BUILD_TESTS
 /** Gets our GID
  * @returns process GID
@@ -3676,6 +3690,19 @@ again:
   return TRUE;
 }
 
+/**
+ * Gets the credentials of the current process.
+ *
+ * @param credentials credentials to fill in.
+ */
+void
+_dbus_credentials_from_current_process (DBusCredentials *credentials)
+{
+  credentials->pid = _dbus_getpid ();
+  credentials->uid = _dbus_getuid ();
+  credentials->gid = _dbus_getgid ();
+}
+
 /**
  * Reads a single byte which must be nul (an error occurs otherwise),
  * and reads unix credentials if available. Fills in pid/uid/gid with
@@ -3938,18 +3965,6 @@ _dbus_disable_sigpipe (void)
     _dbus_verbose("FIXME: implement _dbus_disable_sigpipe (void)\n");
 }
 
-/**
- * Gets the credentials of the current process.
- *
- * @param credentials credentials to fill in.
- */
-void
-_dbus_credentials_from_current_process (DBusCredentials *credentials)
-{
-  credentials->pid = _dbus_getpid ();
-  credentials->uid = _dbus_getuid ();
-  credentials->gid = _dbus_getgid ();
-}
 
 /**
  * Appends the contents of the given file to the string,
@@ -5131,6 +5146,18 @@ _dbus_atomic_dec (DBusAtomic *atomic)
 
 #endif /* asserts or tests enabled */
 
-/** @} end of sysdeps-win */
+/**
+ * Called when the bus daemon is signaled to reload its configuration; any
+ * caches should be nuked. Of course any caches that need explicit reload
+ * are probably broken, but c'est la vie.
+ *
+ * 
+ */
+void
+_dbus_flush_caches (void)
+{
 
+}
+
+/** @} end of sysdeps-win */
 /* tests in dbus-sysdeps-util.c */