| Index: dbus/message.cc
|
| diff --git a/dbus/message.cc b/dbus/message.cc
|
| index c8663f72ad682ce21c4339d09971a8869eed829b..c129f22d421c57adc65f825876ce7794709814b1 100644
|
| --- a/dbus/message.cc
|
| +++ b/dbus/message.cc
|
| @@ -536,7 +536,8 @@ void MessageWriter::OpenArray(const std::string& signature,
|
| DBUS_TYPE_ARRAY,
|
| signature.c_str(),
|
| &writer->raw_message_iter_);
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| container_is_open_ = true;
|
| }
|
|
|
| @@ -549,7 +550,8 @@ void MessageWriter::OpenVariant(const std::string& signature,
|
| DBUS_TYPE_VARIANT,
|
| signature.c_str(),
|
| &writer->raw_message_iter_);
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| container_is_open_ = true;
|
| }
|
|
|
| @@ -561,7 +563,8 @@ void MessageWriter::OpenStruct(MessageWriter* writer) {
|
| DBUS_TYPE_STRUCT,
|
| NULL, // Signature should be NULL.
|
| &writer->raw_message_iter_);
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| container_is_open_ = true;
|
| }
|
|
|
| @@ -573,7 +576,8 @@ void MessageWriter::OpenDictEntry(MessageWriter* writer) {
|
| DBUS_TYPE_DICT_ENTRY,
|
| NULL, // Signature should be NULL.
|
| &writer->raw_message_iter_);
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| container_is_open_ = true;
|
| }
|
|
|
| @@ -582,7 +586,8 @@ void MessageWriter::CloseContainer(MessageWriter* writer) {
|
|
|
| const bool success = dbus_message_iter_close_container(
|
| &raw_message_iter_, &writer->raw_message_iter_);
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| container_is_open_ = false;
|
| }
|
|
|
| @@ -595,7 +600,8 @@ void MessageWriter::AppendArrayOfBytes(const uint8_t* values, size_t length) {
|
| DBUS_TYPE_BYTE,
|
| &values,
|
| static_cast<int>(length));
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| CloseContainer(&array_writer);
|
| }
|
|
|
| @@ -608,7 +614,8 @@ void MessageWriter::AppendArrayOfDoubles(const double* values, size_t length) {
|
| DBUS_TYPE_DOUBLE,
|
| &values,
|
| static_cast<int>(length));
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| CloseContainer(&array_writer);
|
| }
|
|
|
| @@ -702,7 +709,8 @@ void MessageWriter::AppendBasic(int dbus_type, const void* value) {
|
| // dbus_message_iter_append_basic() fails only when there is not enough
|
| // memory. We don't return this error as there is nothing we can do when
|
| // it fails to allocate memory for a byte etc.
|
| - CHECK(success) << "Unable to allocate memory";
|
| + // Unable to allocate memory
|
| + CHECK(success);
|
| }
|
|
|
| void MessageWriter::AppendVariantOfBasic(int dbus_type, const void* value) {
|
|
|