Remove trailing newlines from _dbus_assert_not_reached

This was never necessary: _dbus_assert_not_reached() always added one.

Signed-off-by: Simon McVittie <smcv@debian.org>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97009

diff --git a/bus/bus.c b/bus/bus.c
index 9996be29c12b77789dc1771b4cd80d68f73e2a32..103447cebc94f099b976c4602dd14d2993193602 100644 (file)
--- 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 03ad8382b661585d5d565b756b5164bfa092ea22..0ba5f36ccba93ba150c6eafd26a119274e405808 100644 (file)
--- 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 2e2fa2387a47a2322ac0e1cd99c53cc0845fd010..15d42282d8688809bdcf276e74e9472d553e2f82 100644 (file)
--- 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 10cbc490ecaa745189341cbddf56ebda5d658901..367588456422b8d25ca2c56d6a87301a0d583d35 100644 (file)
--- 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 e37c9dd5f7801138513a7eedc04b68c9016eb613..a4b3bfc06ac203164d72e5a15ee9f1051892dd71 100644 (file)
--- 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 a9d4a5110b2dbc409bac0f41dbb741ed85837cad..1096b45b74d73962ccef9b8f922049b179b671b9 100644 (file)
--- 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 27481a819d818571b979212bc64f5a372ff6b8f5..22565efaefbd41dfff5ebd67df746d5d186060ba 100644 (file)
--- 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 5b09a695243afb6428ee355a7fe3950c0f1527e7..85bc57056293ba3a99020aa56f93731b5503b0d1 100644 (file)
--- 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 1e406fc340e69f9b34059c3d614d5a7c0eb571c3..dca6e428c8143d3a4952b3c9bae126100569f53c 100644 (file)
--- 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 c0bd2c601d197c7dcbf5fdc37ed785269b99efc5..564875b057c0f3c5d74e200a53e255be643bc432 100644 (file)
--- 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;