From 23832672266bb4ff23b66247c0cfa1a2ed0cc97b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 9 Jun 2007 21:53:20 +0000 Subject: 2007-06-09 Havoc Pennington * bus/dispatch.c (check_get_connection_unix_process_id): adapt since sysdeps-unix.h stuff isn't included anymore * bus/bus.c (bus_context_new): use more abstract functions to change user, so they can be no-ops on Windows * dbus/dbus-credentials.c, dbus/dbus-credentials.h, dbus/dbus-credentials-util.c: new files containing a fully opaque DBusCredentials data type to replace the old not opaque one. * configure.in (DBUS_UNIX): define DBUS_UNIX to match DBUS_WIN on windows * dbus/dbus-userdb.h: prohibit on Windows, next step is to clean up the uses of it in bus/*.c and factor out the parts of cookie auth that depend on it --- dbus/dbus-internals.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-internals.c') diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index b0a0f023..86c13324 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -271,7 +271,7 @@ _dbus_warn_check_failed(const char *format, if (!warn_initted) init_warnings (); - fprintf (stderr, "process %lu: ", _dbus_getpid ()); + fprintf (stderr, "process %lu: ", _dbus_pid_for_log ()); va_start (args, format); vfprintf (stderr, format, args); @@ -349,9 +349,9 @@ _dbus_verbose_real (const char *format, if (need_pid) { #if PTHREAD_IN_VERBOSE - fprintf (stderr, "%lu: 0x%lx: ", _dbus_getpid (), pthread_self ()); + fprintf (stderr, "%lu: 0x%lx: ", _dbus_pid_for_log (), pthread_self ()); #else - fprintf (stderr, "%lu: ", _dbus_getpid ()); + fprintf (stderr, "%lu: ", _dbus_pid_for_log ()); #endif } @@ -813,7 +813,7 @@ _dbus_real_assert (dbus_bool_t condition, if (_DBUS_UNLIKELY (!condition)) { _dbus_warn ("%lu: assertion failed \"%s\" file \"%s\" line %d function %s\n", - _dbus_getpid (), condition_text, file, line, func); + _dbus_pid_for_log (), condition_text, file, line, func); _dbus_abort (); } } @@ -834,7 +834,7 @@ _dbus_real_assert_not_reached (const char *explanation, int line) { _dbus_warn ("File \"%s\" line %d process %lu should not have been reached: %s\n", - file, line, _dbus_getpid (), explanation); + file, line, _dbus_pid_for_log (), explanation); _dbus_abort (); } #endif /* DBUS_DISABLE_ASSERT */ -- cgit