From abd5ac5bf741fdca56f9047cb3d3c7cd8ba014c2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 3 Mar 2011 16:24:34 +0000 Subject: [PATCH 2/4] dbus-marshal-validate: expose _dbus_validate_utf8 as internal API On second thoughts, giving it an alias consistent with _dbus_validate_signature etc. seems reasonable. --- dbus/dbus-marshal-validate.c | 3 --- dbus/dbus-marshal-validate.h | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index 0c841c1..4304467 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -1221,9 +1221,6 @@ DEFINE_DBUS_NAME_CHECK(error_name) DEFINE_DBUS_NAME_CHECK(bus_name) /** define _dbus_check_is_valid_signature() */ DEFINE_DBUS_NAME_CHECK(signature) - -/* this validation function doesn't follow the same naming pattern :-( */ -#define _dbus_validate_utf8(s,b,e) _dbus_string_validate_utf8 (s, b, e) /** define _dbus_check_is_valid_utf8() */ DEFINE_DBUS_NAME_CHECK(utf8) diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 20ca73f..1d2e26b 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -147,6 +147,8 @@ dbus_bool_t _dbus_validate_bus_name (const DBusString *str, dbus_bool_t _dbus_validate_signature (const DBusString *str, int start, int len); +/* just to have a name consistent with the above: */ +#define _dbus_validate_utf8(s,b,e) _dbus_string_validate_utf8 (s, b, e) #ifdef DBUS_DISABLE_CHECKS -- 1.7.4.1