summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-06-14 08:55:08 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-06-14 08:55:08 +0000
commit176ab450007d39b9a0f846879e2cf80023118453 (patch)
tree2ac35446afc05d326184c6e370c33dc689554acf
parente26ed1576a5f82dec72b13d1c6619f83237f6236 (diff)
* dbus/dbus-sysdeps-win.c (_dbus_pid_for_log,_dbus_flush_caches): new win32 functions as counterpart of unix related
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-sysdeps-win.c53
2 files changed, 45 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index d958084f..ee9c1bb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
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,
cmake/modules/FindKDEWIN_Packager.cmake,
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 0f26ce71..6e71ed10 100644
--- 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
@@ -3677,6 +3691,19 @@ again:
}
/**
+ * 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
* -1 if no credentials are available. Return value indicates whether
@@ -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 */