diff options
| author | Simon McVittie <smcv@debian.org> | 2016-07-21 11:01:01 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-09-30 19:36:51 +0100 |
| commit | f1cd229f83bf6de2fa0b978d8dab11bb0abb3490 (patch) | |
| tree | aab3a213b2ad521c58493441b11ba3851950549a /dbus/dbus-marshal-recursive.c | |
| parent | b8abdc52afcc36dbd6dfbee3a5532048f88097bf (diff) | |
| download | dbus-f1cd229f83bf6de2fa0b978d8dab11bb0abb3490.tar.gz | |
Remove trailing newlines from _dbus_warn, _dbus_warn_check_failed
They used to be needed, but are not needed any more, and we were
never completely consistent about including them in any case.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'dbus/dbus-marshal-recursive.c')
| -rw-r--r-- | dbus/dbus-marshal-recursive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index 7fe94b09..417068c6 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -1024,7 +1024,7 @@ _dbus_type_reader_recurse (DBusTypeReader *reader, _dbus_verbose ("recursing into type %s\n", _dbus_type_to_string (t)); #ifndef DBUS_DISABLE_CHECKS if (t == DBUS_TYPE_INVALID) - _dbus_warn_check_failed ("You can't recurse into an empty array or off the end of a message body\n"); + _dbus_warn_check_failed ("You can't recurse into an empty array or off the end of a message body"); #endif /* DBUS_DISABLE_CHECKS */ _dbus_assert_not_reached ("don't yet handle recursing into this type"); @@ -1666,13 +1666,13 @@ writer_recurse_init_and_check (DBusTypeWriter *writer, { if (expected != DBUS_TYPE_INVALID) _dbus_warn_check_failed ("Writing an element of type %s, but the expected type here is %s\n" - "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + "The overall signature expected here was '%s' and we are on byte %d of that signature.", _dbus_type_to_string (sub->container_type), _dbus_type_to_string (expected), _dbus_string_get_const_data (writer->type_str), writer->type_pos); else _dbus_warn_check_failed ("Writing an element of type %s, but no value is expected here\n" - "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + "The overall signature expected here was '%s' and we are on byte %d of that signature.", _dbus_type_to_string (sub->container_type), _dbus_string_get_const_data (writer->type_str), writer->type_pos); @@ -1732,12 +1732,12 @@ write_or_verify_typecode (DBusTypeWriter *writer, { if (expected != DBUS_TYPE_INVALID) _dbus_warn_check_failed ("Array or variant type requires that type %s be written, but %s was written.\n" - "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + "The overall signature expected here was '%s' and we are on byte %d of that signature.", _dbus_type_to_string (expected), _dbus_type_to_string (typecode), _dbus_string_get_const_data (writer->type_str), writer->type_pos); else _dbus_warn_check_failed ("Array or variant type wasn't expecting any more values to be written into it, but a value %s was written.\n" - "The overall signature expected here was '%s' and we are on byte %d of that signature.\n", + "The overall signature expected here was '%s' and we are on byte %d of that signature.", _dbus_type_to_string (typecode), _dbus_string_get_const_data (writer->type_str), writer->type_pos); _dbus_assert_not_reached ("bad type inserted somewhere inside an array or variant"); @@ -1830,7 +1830,7 @@ writer_recurse_array (DBusTypeWriter *writer, writer->type_str, writer->u.array.element_type_pos + 1)) { - _dbus_warn_check_failed ("Writing an array of '%s' but this is incompatible with the expected type of elements in the parent array\n", + _dbus_warn_check_failed ("Writing an array of '%s' but this is incompatible with the expected type of elements in the parent array", _dbus_string_get_const_data_len (contained_type, contained_type_start, contained_type_len)); |