Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: dbus/message.cc

Issue 502793002: Add a GetSignature() method to dbus::MessageReader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/message.h ('k') | dbus/message_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/message.cc
diff --git a/dbus/message.cc b/dbus/message.cc
index c9219b7e52bd3be8f70d9500c92a02df1472d856..a7310f3880a970e31fcc0664fdc0389797c4dc1f 100644
--- a/dbus/message.cc
+++ b/dbus/message.cc
@@ -262,7 +262,7 @@ std::string Message::ToString() {
AppendStringHeader("member", GetMember(), &headers);
AppendStringHeader("error_name", GetErrorName(), &headers);
AppendStringHeader("sender", GetSender(), &headers);
- AppendStringHeader("signature", GetSignature(), &headers);
+ AppendStringHeader("signature", GetDataSignature(), &headers);
AppendUint32Header("serial", GetSerial(), &headers);
AppendUint32Header("reply_serial", GetReplySerial(), &headers);
@@ -333,7 +333,7 @@ std::string Message::GetSender() {
return sender ? sender : "";
}
-std::string Message::GetSignature() {
+std::string Message::GetDataSignature() {
const char* signature = dbus_message_get_signature(raw_message_);
return signature ? signature : "";
}
@@ -935,6 +935,16 @@ Message::DataType MessageReader::GetDataType() {
return static_cast<Message::DataType>(dbus_type);
}
+std::string MessageReader::GetDataSignature() {
+ std::string signature;
+ char* raw_signature = dbus_message_iter_get_signature(&raw_message_iter_);
+ if (raw_signature) {
+ signature = raw_signature;
+ dbus_free(raw_signature);
+ }
+ return signature;
+}
+
bool MessageReader::CheckDataType(int dbus_type) {
const int actual_type = dbus_message_iter_get_arg_type(&raw_message_iter_);
if (actual_type != dbus_type) {
« no previous file with comments | « dbus/message.h ('k') | dbus/message_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698