diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-15 07:15:38 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-15 07:15:38 +0000 |
| commit | 9c3d566e95c9080f6040c64531b0ccae22bd5d74 (patch) | |
| tree | d21a18baa5a5ee9855c8a00eb2c1985bc23ca65f /bus/signals.c | |
| parent | 6ec04e917c8b4d477e818aa65ebb5e1fd50e4395 (diff) | |
2005-01-15 Havoc Pennington <hp@redhat.com>
* Land the new message args API and type system.
This patch is huge, but the public API change is not
really large. The set of D-BUS types has changed somewhat,
and the arg "getters" are more geared toward language bindings;
they don't make a copy, etc.
There are also some known issues. See these emails for details
on this huge patch:
http://lists.freedesktop.org/archives/dbus/2004-December/001836.html
http://lists.freedesktop.org/archives/dbus/2005-January/001922.html
* dbus/dbus-marshal-*: all the new stuff
* dbus/dbus-message.c: basically rewritten
* dbus/dbus-memory.c (check_guards): with "guards" enabled, init
freed blocks to be all non-nul bytes so using freed memory is less
likely to work right
* dbus/dbus-internals.c (_dbus_test_oom_handling): add
DBUS_FAIL_MALLOC=N environment variable, so you can do
DBUS_FAIL_MALLOC=0 to skip the out-of-memory checking, or
DBUS_FAIL_MALLOC=10 to make it really, really, really slow and
thorough.
* qt/message.cpp: port to the new message args API
(operator<<): use str.utf8() rather than str.unicode()
(pretty sure this is right from the Qt docs?)
* glib/dbus-gvalue.c: port to the new message args API
* bus/dispatch.c, bus/driver.c: port to the new message args API
* dbus/dbus-string.c (_dbus_string_init_const_len): initialize the
"locked" flag to TRUE and align_offset to 0; I guess we never
looked at these anyhow, but seems cleaner.
* dbus/dbus-string.h (_DBUS_STRING_ALLOCATION_PADDING):
move allocation padding macro to this header; use it to implement
(_DBUS_STRING_STATIC): ability to declare a static string.
* dbus/dbus-message.c (_dbus_message_has_type_interface_member):
change to return TRUE if the interface is not set.
* dbus/dbus-string.[hc]: move the D-BUS specific validation stuff
to dbus-marshal-validate.[hc]
* dbus/dbus-marshal-basic.c (_dbus_type_to_string): move here from
dbus-internals.c
* dbus/Makefile.am: cut over from dbus-marshal.[hc]
to dbus-marshal-*.[hc]
* dbus/dbus-object-tree.c (_dbus_decompose_path): move this
function here from dbus-marshal.c
Diffstat (limited to 'bus/signals.c')
| -rw-r--r-- | bus/signals.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bus/signals.c b/bus/signals.c index fc8e63da..2b5aa13f 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -23,6 +23,7 @@ #include "signals.h" #include "services.h" #include "utils.h" +#include <dbus/dbus-marshal-validate.h> struct BusMatchRule { @@ -656,7 +657,7 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } - if (!_dbus_string_validate_service (&tmp_str, 0, len)) + if (!_dbus_validate_service (&tmp_str, 0, len)) { dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, "Sender service name '%s' is invalid\n", value); @@ -678,7 +679,7 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } - if (!_dbus_string_validate_interface (&tmp_str, 0, len)) + if (!_dbus_validate_interface (&tmp_str, 0, len)) { dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, "Interface name '%s' is invalid\n", value); @@ -700,7 +701,7 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } - if (!_dbus_string_validate_member (&tmp_str, 0, len)) + if (!_dbus_validate_member (&tmp_str, 0, len)) { dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, "Member name '%s' is invalid\n", value); @@ -722,7 +723,7 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } - if (!_dbus_string_validate_path (&tmp_str, 0, len)) + if (!_dbus_validate_path (&tmp_str, 0, len)) { dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, "Path '%s' is invalid\n", value); @@ -744,7 +745,7 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } - if (!_dbus_string_validate_service (&tmp_str, 0, len)) + if (!_dbus_validate_service (&tmp_str, 0, len)) { dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, "Destination service name '%s' is invalid\n", value); |