From: Federico Mena Quintero <federico@novell.com>
Date: Wed, 18 Mar 2009 22:17:00 +0000 (-0600)
Subject: bfo20738 - Return a useful error message from dbus_signature_validate()
X-Git-Tag: dbus-1.2.14~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73ec6964d7a14eba3ec7118041e48e0a21438e52;p=thirdparty%2Fdbus.git

bfo20738 - Return a useful error message from dbus_signature_validate()

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---

diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index a8864f8b1..c7f8d0e35 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -233,12 +233,18 @@ dbus_signature_validate (const char       *signature,
 			 
 {
   DBusString str;
+  DBusValidity reason;
 
   _dbus_string_init_const (&str, signature);
-  if (_dbus_validate_signature (&str, 0, _dbus_string_get_length (&str)))
+  reason = _dbus_validate_signature_with_reason (&str, 0, _dbus_string_get_length (&str));
+
+  if (reason == DBUS_VALID)
     return TRUE;
-  dbus_set_error (error, DBUS_ERROR_INVALID_SIGNATURE, "Corrupt type signature");
-  return FALSE;
+  else
+    {
+      dbus_set_error (error, DBUS_ERROR_INVALID_SIGNATURE, _dbus_validity_to_error_message (reason));
+      return FALSE;
+    }
 }
 
 /**