From: Simon McVittie Date: Thu, 21 Jul 2016 09:59:50 +0000 (+0100) Subject: Remove trailing newlines from _dbus_assert_not_reached X-Git-Tag: dbus-1.11.4~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76ae52735ee9b574976f43426303636c41203d4c;p=thirdparty%2Fdbus.git Remove trailing newlines from _dbus_assert_not_reached This was never necessary: _dbus_assert_not_reached() always added one. Signed-off-by: Simon McVittie Reviewed-by: Ralf Habacker Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97009 --- diff --git a/bus/bus.c b/bus/bus.c index 9996be29c..103447ceb 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -1699,7 +1699,7 @@ bus_context_check_security_policy (BusContext *context, } else { - _dbus_assert_not_reached ("a message was somehow sent to an inactive recipient from a source other than the message bus\n"); + _dbus_assert_not_reached ("a message was somehow sent to an inactive recipient from a source other than the message bus"); recipient_policy = NULL; } } diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c index 03ad8382b..0ba5f36cc 100644 --- a/bus/config-parser-trivial.c +++ b/bus/config-parser-trivial.c @@ -497,7 +497,7 @@ process_test_valid_subdir (const DBusString *test_base_dir, dir = NULL; if (!_dbus_string_init (&test_directory)) - _dbus_assert_not_reached ("didn't allocate test_directory\n"); + _dbus_assert_not_reached ("didn't allocate test_directory"); _dbus_string_init_const (&filename, subdir); @@ -510,7 +510,7 @@ process_test_valid_subdir (const DBusString *test_base_dir, _dbus_string_free (&filename); if (!_dbus_string_init (&filename)) - _dbus_assert_not_reached ("didn't allocate filename string\n"); + _dbus_assert_not_reached ("didn't allocate filename string"); dbus_error_init (&error); dir = _dbus_directory_open (&test_directory, &error); diff --git a/bus/config-parser.c b/bus/config-parser.c index 2e2fa2387..15d42282d 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -2942,7 +2942,7 @@ process_test_valid_subdir (const DBusString *test_base_dir, dir = NULL; if (!_dbus_string_init (&test_directory)) - _dbus_assert_not_reached ("didn't allocate test_directory\n"); + _dbus_assert_not_reached ("didn't allocate test_directory"); _dbus_string_init_const (&filename, subdir); @@ -2955,7 +2955,7 @@ process_test_valid_subdir (const DBusString *test_base_dir, _dbus_string_free (&filename); if (!_dbus_string_init (&filename)) - _dbus_assert_not_reached ("didn't allocate filename string\n"); + _dbus_assert_not_reached ("didn't allocate filename string"); dbus_error_init (&error); dir = _dbus_directory_open (&test_directory, &error); diff --git a/dbus/dbus-auth-util.c b/dbus/dbus-auth-util.c index 10cbc490e..367588456 100644 --- a/dbus/dbus-auth-util.c +++ b/dbus/dbus-auth-util.c @@ -51,7 +51,7 @@ process_test_subdir (const DBusString *test_base_dir, dir = NULL; if (!_dbus_string_init (&test_directory)) - _dbus_assert_not_reached ("didn't allocate test_directory\n"); + _dbus_assert_not_reached ("didn't allocate test_directory"); _dbus_string_init_const (&filename, subdir); @@ -64,7 +64,7 @@ process_test_subdir (const DBusString *test_base_dir, _dbus_string_free (&filename); if (!_dbus_string_init (&filename)) - _dbus_assert_not_reached ("didn't allocate filename string\n"); + _dbus_assert_not_reached ("didn't allocate filename string"); dir = _dbus_directory_open (&test_directory, &error); if (dir == NULL) diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index e37c9dd5f..a4b3bfc06 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -394,7 +394,7 @@ _dbus_data_slot_test (void) _dbus_data_slot_allocator_alloc (&allocator, &tmp); if (tmp != i) - _dbus_assert_not_reached ("did not allocate slots in numeric order\n"); + _dbus_assert_not_reached ("did not allocate slots in numeric order"); ++i; } diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index a9d4a5110..1096b45b7 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -571,7 +571,7 @@ process_test_subdir (const DBusString *test_base_dir, dir = NULL; if (!_dbus_string_init (&test_directory)) - _dbus_assert_not_reached ("didn't allocate test_directory\n"); + _dbus_assert_not_reached ("didn't allocate test_directory"); _dbus_string_init_const (&filename, subdir); @@ -584,7 +584,7 @@ process_test_subdir (const DBusString *test_base_dir, _dbus_string_free (&filename); if (!_dbus_string_init (&filename)) - _dbus_assert_not_reached ("didn't allocate filename string\n"); + _dbus_assert_not_reached ("didn't allocate filename string"); dir = _dbus_directory_open (&test_directory, &error); if (dir == NULL) diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index 27481a819..22565efae 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -1646,7 +1646,7 @@ run_decompose_tests (void) ++i; } _dbus_warn ("}\n"); - _dbus_assert_not_reached ("path decompose failed\n"); + _dbus_assert_not_reached ("path decompose failed"); } dbus_free_string_array (result); diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c index 5b09a6952..85bc57056 100644 --- a/dbus/dbus-string-util.c +++ b/dbus/dbus-string-util.c @@ -312,12 +312,12 @@ _dbus_string_test (void) while (i < 10) { if (!_dbus_string_append (&str, "a")) - _dbus_assert_not_reached ("failed to append string to string\n"); + _dbus_assert_not_reached ("failed to append string to string"); _dbus_assert (_dbus_string_get_length (&str) == i * 2 + 1); if (!_dbus_string_append_byte (&str, 'b')) - _dbus_assert_not_reached ("failed to append byte to string\n"); + _dbus_assert_not_reached ("failed to append byte to string"); _dbus_assert (_dbus_string_get_length (&str) == i * 2 + 2); diff --git a/test/break-loader.c b/test/break-loader.c index 1e406fc34..dca6e428c 100644 --- a/test/break-loader.c +++ b/test/break-loader.c @@ -509,10 +509,10 @@ find_breaks_based_on (const DBusString *filename, retval = FALSE; if (!_dbus_string_init (&orig_data)) - _dbus_assert_not_reached ("could not allocate string\n"); + _dbus_assert_not_reached ("could not allocate string"); if (!_dbus_string_init (&mutated)) - _dbus_assert_not_reached ("could not allocate string\n"); + _dbus_assert_not_reached ("could not allocate string"); if (!dbus_internal_do_not_use_load_message_file (filename, is_raw, &orig_data)) diff --git a/test/test-service.c b/test/test-service.c index c0bd2c601..564875b05 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -112,7 +112,7 @@ check_hello_from_self_reply (DBusPendingCall *pcall, dbus_error_free (&error); } else - _dbus_assert_not_reached ("Unexpected message received\n"); + _dbus_assert_not_reached ("Unexpected message received"); hello_from_self_reply_received = TRUE;