diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 50 | ||||
| -rw-r--r-- | dbus/dbus-arch-deps.h.in | 8 | ||||
| -rw-r--r-- | dbus/dbus-errors.c | 24 | ||||
| -rw-r--r-- | dbus/dbus-errors.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-macros.h | 13 | ||||
| -rw-r--r-- | dbus/dbus-marshal-validate.c | 12 | ||||
| -rw-r--r-- | dbus/dbus-server-socket.c | 2 | ||||
| -rw-r--r-- | tools/dbus-launch.c | 6 |
9 files changed, 104 insertions, 14 deletions
@@ -1,3 +1,4 @@ +.*.sw? *.orig *.rej *.o @@ -1,5 +1,18 @@ 2007-10-11 Simon McVittie <simon.mcvittie@collabora.co.uk> + * dbus/dbus-macros.h, dbus/dbus-arch-deps.h.in: Use new macro + _DBUS_GNUC_EXTENSION (the same as G_GNUC_EXTENSION) to avoid -ansi + warnings about use of "long long". + * dbus/dbus-server-socket.c: remove unused variable when assertions + are disabled + * dbus/dbus-marshal-validate.c: avoid empty statements by removing + stray semicolons + * tools/dbus-launch.c: convert C++-style comment to C-style, add {} + for clarity + * .gitignore: ignore vi swapfiles + * dbus/dbus-errors.h, dbus/dbus-errors.c: Add DBUS_ERROR_INIT macro + for the benefit of libdbus users whose coding style allows initialized + variables (although dbus core coding style doesn't) * configure.in, dbus/dbus-sysdeps.h, dbus/dbus-sysdeps-unix.c: Fix detection of i486 atomic ops. Previously, the attempts to determine support at compile-time on Darwin were causing the i486 atomic ops to @@ -19,6 +32,16 @@ * .gitignore: add various things that weren't in .cvsignore because CVS implicitly ignored them; generally bring up to date +2007-10-09 John (J5) Palmieri <johnp@redhat.com> + + * tools/run-with-tmp-session-bus.sh: Fix env exports for better + portability (#9280) + * tools/dbus-send.1: Document syntax for container types in dbus-send + man file (#9553) - patch from Jack Spaar <jspaar at + users.sourceforge.net> + + [Both OK for MIT/X11 relicensing -smcv] + 2007-10-09 Simon McVittie <simon.mcvittie@collabora.co.uk> * doc/dbus-specification.xml: Specifically forbid empty structs (#7969) @@ -28,6 +51,33 @@ [All of the above are OK for MIT/X11 licensing] +2007-10-03 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-internals.h: fd.o bug #11678 Don't error out if compiler + does not support vararg macros. _dbus_verbose is the only function + that does this so make it a noop if vararg macros are not supported + * bus/selinux.c, dbus/dbus-sysdeps-util-unix.c: fd.o bug #12429 + Reverse check to setpcap and only init audit if we were root + (patch by Dan Walsh <dwalsh@redhat.com>, + https://bugs.freedesktop.org/show_bug.cgi?id=12429). Reverse + we_were_root check to setpcap if we were root. Also only init audit + if we were root. So error dbus message will not show up when policy + reload happens. dbus -session will no longer try to send audit + message, only system will. + * configure.in: fd.o bug #11872 improve linker test for --gc-sections. + Patch by Tim Mooney <enchanter at users.sourceforge.net> + * configure.in, dbus/dbus-sysdeps.c: fd.o bug #11872 fix clearenv for + systems that do not have it. Patch from Brian Cameron <brian.cameron + at sun.com> + * tools/dbus-launch.c: fd.o bug #12547 remove superfluous if. + Also convert tabs to spaces + * configure.in, bus/Makefile.am, dbus/Makefile.am: Correctly implement + -fPIC and -fPIE. For security reasons we want possition independent + code for libraries and possition independent executable for + executables. Before we were just enabling -fPIC. Now we correctly + enable -fPIC and -PIE for libdbus and the bus respectively. Proper + LD_FLAGS are set for each also. + 2007-09-20 Ryan Lortie <desrt@desrt.ca> Add argument path matching support. Bug #11066. diff --git a/dbus/dbus-arch-deps.h.in b/dbus/dbus-arch-deps.h.in index 2a02a7f5..ca8e286b 100644 --- a/dbus/dbus-arch-deps.h.in +++ b/dbus/dbus-arch-deps.h.in @@ -33,11 +33,11 @@ DBUS_BEGIN_DECLS #if @DBUS_HAVE_INT64@ #define DBUS_HAVE_INT64 1 -typedef @DBUS_INT64_TYPE@ dbus_int64_t; -typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t; +_DBUS_GNUC_EXTENSION typedef @DBUS_INT64_TYPE@ dbus_int64_t; +_DBUS_GNUC_EXTENSION typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t; -#define DBUS_INT64_CONSTANT(val) @DBUS_INT64_CONSTANT@ -#define DBUS_UINT64_CONSTANT(val) @DBUS_UINT64_CONSTANT@ +#define DBUS_INT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION @DBUS_INT64_CONSTANT@) +#define DBUS_UINT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION @DBUS_UINT64_CONSTANT@) #else #undef DBUS_HAVE_INT64 diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index d0a80b02..9629c682 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -34,7 +34,29 @@ * @brief Error reporting internals * @{ */ - + +/** + * @def DBUS_ERROR_INIT + * + * Expands to a suitable initializer for a DBusError on the stack. + * Declaring a DBusError with: + * + * @code + * DBusError error = DBUS_ERROR_INIT; + * + * do_things_with (&error); + * @endcode + * + * is a more concise form of: + * + * @code + * DBusError error; + * + * dbus_error_init (&error); + * do_things_with (&error); + * @endcode + */ + /** * Internals of DBusError */ diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h index e01818c4..0a480d8c 100644 --- a/dbus/dbus-errors.h +++ b/dbus/dbus-errors.h @@ -58,6 +58,8 @@ struct DBusError void *padding1; /**< placeholder */ }; +#define DBUS_ERROR_INIT { NULL, NULL, TRUE, 0, 0, 0, 0, NULL } + void dbus_error_init (DBusError *error); void dbus_error_free (DBusError *error); void dbus_set_error (DBusError *error, diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h index 461dff39..bf004b8b 100644 --- a/dbus/dbus-macros.h +++ b/dbus/dbus-macros.h @@ -58,6 +58,12 @@ # define DBUS_DEPRECATED #endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) +# define _DBUS_GNUC_EXTENSION __extension__ +#else +# define _DBUS_GNUC_EXTENSION +#endif + /* Normally docs are in .c files, but there isn't a .c file for this. */ /** * @defgroup DBusMacros Utility macros @@ -118,6 +124,13 @@ * Please don't use this in your own code, consider it * D-Bus internal. */ +/** + * @def _DBUS_GNUC_EXTENSION + * + * Tells gcc not to warn about extensions to the C standard in the + * following expression, even if compiling with -pedantic. Do not use + * this macro in your own code; please consider it to be internal to libdbus. + */ /** @} */ diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index 62d94556..e63a463b 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -1065,17 +1065,17 @@ _dbus_validate_signature (const DBusString *str, } /** define _dbus_check_is_valid_path() */ -DEFINE_DBUS_NAME_CHECK(path); +DEFINE_DBUS_NAME_CHECK(path) /** define _dbus_check_is_valid_interface() */ -DEFINE_DBUS_NAME_CHECK(interface); +DEFINE_DBUS_NAME_CHECK(interface) /** define _dbus_check_is_valid_member() */ -DEFINE_DBUS_NAME_CHECK(member); +DEFINE_DBUS_NAME_CHECK(member) /** define _dbus_check_is_valid_error_name() */ -DEFINE_DBUS_NAME_CHECK(error_name); +DEFINE_DBUS_NAME_CHECK(error_name) /** define _dbus_check_is_valid_bus_name() */ -DEFINE_DBUS_NAME_CHECK(bus_name); +DEFINE_DBUS_NAME_CHECK(bus_name) /** define _dbus_check_is_valid_signature() */ -DEFINE_DBUS_NAME_CHECK(signature); +DEFINE_DBUS_NAME_CHECK(signature) /** @} */ diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index c8ae38a7..0cd2bb6c 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -153,8 +153,8 @@ socket_handle_watch (DBusWatch *watch, void *data) { DBusServer *server = data; - DBusServerSocket *socket_server = data; #ifndef DBUS_DISABLE_ASSERT + DBusServerSocket *socket_server = data; int i; dbus_bool_t found = FALSE; #endif diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 80d885f4..9f4c94ab 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -614,8 +614,10 @@ do_close_stderr (void) close (2); if (dup2 (fd, 2) == -1) - // error; we can't report an error anymore... - exit (1); + { + /* error; we can't report an error anymore... */ + exit (1); + } close (fd); } |