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>

1 files changed, 124 insertions, 124 deletions

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 9a6eaafc..64524ba5 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -644,7 +644,7 @@ warn_unexpected_real (DBusConnection *connection,
                       int             line)
 {
   if (message)
-    _dbus_warn ("%s:%d received message interface \"%s\" member \"%s\" error name \"%s\" on %p, expecting %s\n",
+    _dbus_warn ("%s:%d received message interface \"%s\" member \"%s\" error name \"%s\" on %p, expecting %s",
                 function, line,
                 dbus_message_get_interface (message) ?
                 dbus_message_get_interface (message) : "(unset)",
@@ -655,7 +655,7 @@ warn_unexpected_real (DBusConnection *connection,
                 connection,
                 expected);
   else
-    _dbus_warn ("%s:%d received no message on %p, expecting %s\n",
+    _dbus_warn ("%s:%d received no message on %p, expecting %s",
                 function, line, connection, expected);
 }
 
@@ -715,7 +715,7 @@ check_service_owner_changed_foreach (DBusConnection *connection,
       message = pop_message_waiting_for_memory (connection);
       if (message == NULL)
         {
-          _dbus_warn ("Did not receive a message on %p, expecting %s\n",
+          _dbus_warn ("Did not receive a message on %p, expecting %s",
                       connection, "NameOwnerChanged");
           goto out;
         }
@@ -751,7 +751,7 @@ check_service_owner_changed_foreach (DBusConnection *connection,
             }
           else
             {
-              _dbus_warn ("Did not get the expected arguments\n");
+              _dbus_warn ("Did not get the expected arguments");
               goto out;
             }
         }
@@ -760,13 +760,13 @@ check_service_owner_changed_foreach (DBusConnection *connection,
           || (d->expected_kind == OWNER_CHANGED   && (!old_owner[0] || !new_owner[0]))
           || (d->expected_kind == SERVICE_DELETED && (!old_owner[0] ||  new_owner[0])))
         {
-          _dbus_warn ("inconsistent NameOwnerChanged arguments\n");
+          _dbus_warn ("inconsistent NameOwnerChanged arguments");
           goto out;
         }
 
       if (strcmp (service_name, d->expected_service_name) != 0)
         {
-          _dbus_warn ("expected info on service %s, got info on %s\n",
+          _dbus_warn ("expected info on service %s, got info on %s",
                       d->expected_service_name,
                       service_name);
           goto out;
@@ -775,7 +775,7 @@ check_service_owner_changed_foreach (DBusConnection *connection,
       if (*service_name == ':' && new_owner[0]
           && strcmp (service_name, new_owner) != 0)
         {
-          _dbus_warn ("inconsistent ServiceOwnedChanged message (\"%s\" [ %s -> %s ])\n",
+          _dbus_warn ("inconsistent ServiceOwnedChanged message (\"%s\" [ %s -> %s ])",
                       service_name, old_owner, new_owner);
           goto out;
         }
@@ -987,7 +987,7 @@ check_hello_message (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Hello", serial, connection);
       goto out;
     }
@@ -996,7 +996,7 @@ check_hello_message (BusContext     *context,
 
   if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
-      _dbus_warn ("Message has wrong sender %s\n",
+      _dbus_warn ("Message has wrong sender %s",
                   dbus_message_get_sender (message) ?
                   dbus_message_get_sender (message) : "(none)");
       goto out;
@@ -1046,7 +1046,7 @@ check_hello_message (BusContext     *context,
           else
             {
               _dbus_assert (dbus_error_is_set (&error));
-              _dbus_warn ("Did not get the expected single string argument to hello\n");
+              _dbus_warn ("Did not get the expected single string argument to hello");
               goto out;
             }
         }
@@ -1078,7 +1078,7 @@ check_hello_message (BusContext     *context,
           message = pop_message_waiting_for_memory (connection);
           if (message == NULL)
             {
-              _dbus_warn ("Expecting %s, got nothing\n",
+              _dbus_warn ("Expecting %s, got nothing",
                       "NameAcquired");
               goto out;
             }
@@ -1086,7 +1086,7 @@ check_hello_message (BusContext     *context,
       if (! dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
                                     "NameAcquired"))
         {
-          _dbus_warn ("Expecting %s, got smthg else\n",
+          _dbus_warn ("Expecting %s, got smthg else",
                       "NameAcquired");
           goto out;
         }
@@ -1106,7 +1106,7 @@ check_hello_message (BusContext     *context,
           else
             {
               _dbus_assert (dbus_error_is_set (&error));
-              _dbus_warn ("Did not get the expected single string argument to ServiceAcquired\n");
+              _dbus_warn ("Did not get the expected single string argument to ServiceAcquired");
               goto out;
             }
         }
@@ -1115,7 +1115,7 @@ check_hello_message (BusContext     *context,
 
       if (strcmp (acquired, name) != 0)
         {
-          _dbus_warn ("Acquired name is %s but expected %s\n",
+          _dbus_warn ("Acquired name is %s but expected %s",
                       acquired, name);
           goto out;
         }
@@ -1198,7 +1198,7 @@ check_double_hello_message (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Hello", serial, connection);
       goto out;
     }
@@ -1207,7 +1207,7 @@ check_double_hello_message (BusContext     *context,
 
   if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
-      _dbus_warn ("Message has wrong sender %s\n",
+      _dbus_warn ("Message has wrong sender %s",
                   dbus_message_get_sender (message) ?
                   dbus_message_get_sender (message) : "(none)");
       goto out;
@@ -1300,7 +1300,7 @@ check_get_connection_unix_user (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "GetConnectionUnixUser", serial, connection);
       goto out;
     }
@@ -1356,7 +1356,7 @@ check_get_connection_unix_user (BusContext     *context,
           else
             {
               _dbus_assert (dbus_error_is_set (&error));
-              _dbus_warn ("Did not get the expected DBUS_TYPE_UINT32 from GetConnectionUnixUser\n");
+              _dbus_warn ("Did not get the expected DBUS_TYPE_UINT32 from GetConnectionUnixUser");
               goto out;
             }
         }
@@ -1445,7 +1445,7 @@ check_get_connection_unix_process_id (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "GetConnectionUnixProcessID", serial, connection);
       goto out;
     }
@@ -1519,7 +1519,7 @@ check_get_connection_unix_process_id (BusContext     *context,
           else
             {
               _dbus_assert (dbus_error_is_set (&error));
-              _dbus_warn ("Did not get the expected DBUS_TYPE_UINT32 from GetConnectionUnixProcessID\n");
+              _dbus_warn ("Did not get the expected DBUS_TYPE_UINT32 from GetConnectionUnixProcessID");
               goto out;
             }
         }
@@ -1535,7 +1535,7 @@ check_get_connection_unix_process_id (BusContext     *context,
           if (pid != (dbus_uint32_t) _dbus_getpid ())
             {
               _dbus_assert (dbus_error_is_set (&error));
-              _dbus_warn ("Result from GetConnectionUnixProcessID is not our own pid\n");
+              _dbus_warn ("Result from GetConnectionUnixProcessID is not our own pid");
               goto out;
             }
         }
@@ -1630,7 +1630,7 @@ check_add_match (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "AddMatch", serial, connection);
       goto out;
     }
@@ -1639,7 +1639,7 @@ check_add_match (BusContext     *context,
 
   if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
-      _dbus_warn ("Message has wrong sender %s\n",
+      _dbus_warn ("Message has wrong sender %s",
                   dbus_message_get_sender (message) ?
                   dbus_message_get_sender (message) : "(none)");
       goto out;
@@ -1755,7 +1755,7 @@ check_get_all_match_rules (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "AddMatch", serial, connection);
       goto out;
     }
@@ -1764,7 +1764,7 @@ check_get_all_match_rules (BusContext     *context,
 
   if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
-      _dbus_warn ("Message has wrong sender %s\n",
+      _dbus_warn ("Message has wrong sender %s",
                   dbus_message_get_sender (message) ?
                   dbus_message_get_sender (message) : "(none)");
       goto out;
@@ -1922,7 +1922,7 @@ check_nonexistent_service_no_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "StartServiceByName", serial, connection);
       goto out;
     }
@@ -1933,7 +1933,7 @@ check_nonexistent_service_no_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -1957,7 +1957,7 @@ check_nonexistent_service_no_auto_start (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully activate %s\n",
+      _dbus_warn ("Did not expect to successfully activate %s",
                   NONEXISTENT_SERVICE_NAME);
       goto out;
     }
@@ -2015,7 +2015,7 @@ check_nonexistent_service_auto_start (BusContext     *context,
 
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -2026,7 +2026,7 @@ check_nonexistent_service_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -2050,7 +2050,7 @@ check_nonexistent_service_auto_start (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully activate %s\n",
+      _dbus_warn ("Did not expect to successfully activate %s",
                   NONEXISTENT_SERVICE_NAME);
       goto out;
     }
@@ -2110,7 +2110,7 @@ check_base_service_activated (BusContext     *context,
             }
           else
             {
-              _dbus_warn ("Message %s doesn't have a service name: %s\n",
+              _dbus_warn ("Message %s doesn't have a service name: %s",
                           "NameOwnerChanged (creation)",
                           error.message);
               goto out;
@@ -2119,21 +2119,21 @@ check_base_service_activated (BusContext     *context,
 
       if (*base_service != ':')
         {
-          _dbus_warn ("Expected base service activation, got \"%s\" instead\n",
+          _dbus_warn ("Expected base service activation, got \"%s\" instead",
                       base_service);
           goto out;
         }
 
       if (strcmp (base_service, base_service_from_bus) != 0)
         {
-          _dbus_warn ("Expected base service activation, got \"%s\" instead with owner \"%s\"\n",
+          _dbus_warn ("Expected base service activation, got \"%s\" instead with owner \"%s\"",
                       base_service, base_service_from_bus);
           goto out;
         }
 
       if (old_owner[0])
         {
-          _dbus_warn ("Received an old_owner argument during base service activation, \"%s\"\n",
+          _dbus_warn ("Received an old_owner argument during base service activation, \"%s\"",
                       old_owner);
           goto out;
         }
@@ -2215,7 +2215,7 @@ check_service_activated (BusContext     *context,
             }
           else
             {
-              _dbus_warn ("Message %s doesn't have a service name: %s\n",
+              _dbus_warn ("Message %s doesn't have a service name: %s",
                           "NameOwnerChanged (creation)",
                           error.message);
               goto out;
@@ -2224,21 +2224,21 @@ check_service_activated (BusContext     *context,
 
       if (strcmp (service_name, activated_name) != 0)
         {
-          _dbus_warn ("Expected to see service %s created, saw %s instead\n",
+          _dbus_warn ("Expected to see service %s created, saw %s instead",
                       activated_name, service_name);
           goto out;
         }
 
       if (strcmp (base_service_name, base_service_from_bus) != 0)
         {
-          _dbus_warn ("NameOwnerChanged reports wrong base service: %s owner, expected %s instead\n",
+          _dbus_warn ("NameOwnerChanged reports wrong base service: %s owner, expected %s instead",
                       base_service_from_bus, base_service_name);
           goto out;
         }
 
       if (old_owner[0])
         {
-          _dbus_warn ("expected a %s, got a %s\n",
+          _dbus_warn ("expected a %s, got a %s",
                       "NameOwnerChanged (creation)",
                       "NameOwnerChanged (change)");
           goto out;
@@ -2264,7 +2264,7 @@ check_service_activated (BusContext     *context,
       message = pop_message_waiting_for_memory (connection);
       if (message == NULL)
         {
-          _dbus_warn ("Expected a reply to %s, got nothing\n",
+          _dbus_warn ("Expected a reply to %s, got nothing",
                       "StartServiceByName");
           goto out;
         }
@@ -2290,7 +2290,7 @@ check_service_activated (BusContext     *context,
     {
       if (!dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
         {
-          _dbus_warn ("Did not have activation result first argument to %s: %s\n",
+          _dbus_warn ("Did not have activation result first argument to %s: %s",
                       "StartServiceByName", error.message);
           goto out;
         }
@@ -2305,7 +2305,7 @@ check_service_activated (BusContext     *context,
         ; /* Good also */
       else
         {
-          _dbus_warn ("Activation result was %u, no good.\n",
+          _dbus_warn ("Activation result was %u, no good.",
                       activation_result);
           goto out;
         }
@@ -2316,7 +2316,7 @@ check_service_activated (BusContext     *context,
 
   if (!check_no_leftovers (context))
     {
-      _dbus_warn ("Messages were left over after verifying existent activation results\n");
+      _dbus_warn ("Messages were left over after verifying existent activation results");
       goto out;
     }
 
@@ -2368,7 +2368,7 @@ check_service_auto_activated (BusContext     *context,
             }
           else
             {
-              _dbus_warn ("Message %s doesn't have a service name: %s\n",
+              _dbus_warn ("Message %s doesn't have a service name: %s",
                           "NameOwnerChanged",
                           error.message);
               dbus_error_free (&error);
@@ -2378,7 +2378,7 @@ check_service_auto_activated (BusContext     *context,
 
       if (strcmp (service_name, activated_name) != 0)
         {
-          _dbus_warn ("Expected to see service %s created, saw %s instead\n",
+          _dbus_warn ("Expected to see service %s created, saw %s instead",
                       activated_name, service_name);
           goto out;
         }
@@ -2600,7 +2600,7 @@ check_send_exit_to_service (BusContext     *context,
 
       if (!check_no_leftovers (context))
         {
-          _dbus_warn ("Messages were left over after %s\n",
+          _dbus_warn ("Messages were left over after %s",
                       _DBUS_FUNCTION_NAME);
           goto out;
         }
@@ -2632,7 +2632,7 @@ check_got_error (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not get an expected error\n");
+      _dbus_warn ("Did not get an expected error");
       goto out;
     }
 
@@ -2660,7 +2660,7 @@ check_got_error (BusContext     *context,
 
   if (!error_found)
     {
-      _dbus_warn ("Expected error %s or other, got %s instead\n",
+      _dbus_warn ("Expected error %s or other, got %s instead",
                   first_error_name,
                   dbus_message_get_error_name (message));
       goto out;
@@ -2715,7 +2715,7 @@ check_got_service_info (DBusMessage *message)
             }
           else
             {
-              _dbus_warn ("unexpected arguments for NameOwnerChanged message\n");
+              _dbus_warn ("unexpected arguments for NameOwnerChanged message");
               message_kind = GOT_SOMETHING_ELSE;
             }
         }
@@ -2804,7 +2804,7 @@ check_existent_service_no_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive any messages after %s %d on %p\n",
+      _dbus_warn ("Did not receive any messages after %s %d on %p",
                   "StartServiceByName", serial, connection);
       goto out;
     }
@@ -2816,7 +2816,7 @@ check_existent_service_no_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -2838,7 +2838,7 @@ check_existent_service_no_auto_start (BusContext     *context,
         }
       else
         {
-          _dbus_warn ("Did not expect error %s\n",
+          _dbus_warn ("Did not expect error %s",
                       dbus_message_get_error_name (message));
           goto out;
         }
@@ -2860,7 +2860,7 @@ check_existent_service_no_auto_start (BusContext     *context,
       message = dbus_connection_borrow_message (connection);
       if (message == NULL)
         {
-          _dbus_warn ("Did not receive any messages after base service creation notification\n");
+          _dbus_warn ("Did not receive any messages after base service creation notification");
           goto out;
         }
 
@@ -2931,7 +2931,7 @@ check_existent_service_no_auto_start (BusContext     *context,
           if (message == NULL)
             {
               _dbus_warn ("Failed to pop message we just put back! "
-                          "should have been a NameOwnerChanged (creation)\n");
+                          "should have been a NameOwnerChanged (creation)");
               goto out;
             }
 
@@ -2944,7 +2944,7 @@ check_existent_service_no_auto_start (BusContext     *context,
 
           if (!check_no_leftovers (context))
             {
-              _dbus_warn ("Messages were left over after successful activation\n");
+              _dbus_warn ("Messages were left over after successful activation");
               goto out;
             }
 
@@ -3026,7 +3026,7 @@ check_segfault_service_no_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "StartServiceByName", serial, connection);
       goto out;
     }
@@ -3037,7 +3037,7 @@ check_segfault_service_no_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3078,7 +3078,7 @@ check_segfault_service_no_auto_start (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully activate segfault service\n");
+      _dbus_warn ("Did not expect to successfully activate segfault service");
       goto out;
     }
 
@@ -3135,7 +3135,7 @@ check_segfault_service_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -3146,7 +3146,7 @@ check_segfault_service_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3179,7 +3179,7 @@ check_segfault_service_auto_start (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully activate segfault service\n");
+      _dbus_warn ("Did not expect to successfully activate segfault service");
       goto out;
     }
 
@@ -3242,13 +3242,13 @@ check_existent_hello_from_self (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Failed to pop message! Should have been reply from RunHelloFromSelf message\n");
+      _dbus_warn ("Failed to pop message! Should have been reply from RunHelloFromSelf message");
       return FALSE;
     }
 
   if (dbus_message_get_reply_serial (message) != serial)
     {
-      _dbus_warn ("Wrong reply serial\n");
+      _dbus_warn ("Wrong reply serial");
       dbus_message_unref (message);
       return FALSE;
     }
@@ -3295,20 +3295,20 @@ check_existent_ping (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Failed to pop message! Should have been reply from Ping message\n");
+      _dbus_warn ("Failed to pop message! Should have been reply from Ping message");
       return FALSE;
     }
 
   if (dbus_message_get_reply_serial (message) != serial)
     {
-      _dbus_warn ("Wrong reply serial\n");
+      _dbus_warn ("Wrong reply serial");
       dbus_message_unref (message);
       return FALSE;
     }
 
   if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_RETURN)
     {
-      _dbus_warn ("Unexpected message return during Ping\n");
+      _dbus_warn ("Unexpected message return during Ping");
       dbus_message_unref (message);
       return FALSE;
     }
@@ -3357,20 +3357,20 @@ check_existent_get_machine_id (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Failed to pop message! Should have been reply from GetMachineId message\n");
+      _dbus_warn ("Failed to pop message! Should have been reply from GetMachineId message");
       return FALSE;
     }
 
   if (dbus_message_get_reply_serial (message) != serial)
     {
-      _dbus_warn ("Wrong reply serial\n");
+      _dbus_warn ("Wrong reply serial");
       dbus_message_unref (message);
       return FALSE;
     }
 
   if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_RETURN)
     {
-      _dbus_warn ("Unexpected message return during GetMachineId\n");
+      _dbus_warn ("Unexpected message return during GetMachineId");
       dbus_message_unref (message);
       return FALSE;
     }
@@ -3378,14 +3378,14 @@ check_existent_get_machine_id (BusContext     *context,
   machine_id = NULL;
   if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &machine_id, DBUS_TYPE_INVALID))
     {
-      _dbus_warn ("Did not get a machine ID in reply to GetMachineId\n");
+      _dbus_warn ("Did not get a machine ID in reply to GetMachineId");
       dbus_message_unref (message);
       return FALSE;
     }
 
   if (machine_id == NULL || strlen (machine_id) != 32)
     {
-      _dbus_warn ("Machine id looks bogus: '%s'\n", machine_id ? machine_id : "null");
+      _dbus_warn ("Machine id looks bogus: '%s'", machine_id ? machine_id : "null");
       dbus_message_unref (message);
       return FALSE;
     }
@@ -3461,7 +3461,7 @@ check_existent_service_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive any messages after auto start %d on %p\n",
+      _dbus_warn ("Did not receive any messages after auto start %d on %p",
                   serial, connection);
       goto out;
     }
@@ -3491,7 +3491,7 @@ check_existent_service_auto_start (BusContext     *context,
       if (message == NULL)
         {
           _dbus_warn ("No message after auto activation "
-                      "(should be a service announcement)\n");
+                      "(should be a service announcement)");
           dbus_connection_return_message (connection, message);
           message = NULL;
           goto out;
@@ -3509,7 +3509,7 @@ check_existent_service_auto_start (BusContext     *context,
           if (message == NULL)
             {
               _dbus_warn ("Failed to pop message we just put back! "
-                          "should have been a NameOwnerChanged (creation)\n");
+                          "should have been a NameOwnerChanged (creation)");
               goto out;
             }
 
@@ -3547,7 +3547,7 @@ check_existent_service_auto_start (BusContext     *context,
 
         case GOT_ERROR:
         case GOT_SOMETHING_ELSE:
-          _dbus_warn ("Unexpected message after auto activation\n");
+          _dbus_warn ("Unexpected message after auto activation");
           goto out;
         }
     }
@@ -3564,13 +3564,13 @@ check_existent_service_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Failed to pop message! Should have been reply from echo message\n");
+      _dbus_warn ("Failed to pop message! Should have been reply from echo message");
       goto out;
     }
 
   if (dbus_message_get_reply_serial (message) != serial)
     {
-      _dbus_warn ("Wrong reply serial\n");
+      _dbus_warn ("Wrong reply serial");
       goto out;
     }
 
@@ -3648,7 +3648,7 @@ check_launch_service_file_missing (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -3659,7 +3659,7 @@ check_launch_service_file_missing (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3685,7 +3685,7 @@ check_launch_service_file_missing (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully auto-start missing service\n");
+      _dbus_warn ("Did not expect to successfully auto-start missing service");
       goto out;
     }
 
@@ -3735,7 +3735,7 @@ check_launch_service_user_missing (BusContext     *context,
 
   if (!dbus_connection_get_is_connected (connection))
     {
-      _dbus_warn ("connection was disconnected\n");
+      _dbus_warn ("connection was disconnected");
       return TRUE;
     }
 
@@ -3744,7 +3744,7 @@ check_launch_service_user_missing (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -3755,7 +3755,7 @@ check_launch_service_user_missing (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3781,7 +3781,7 @@ check_launch_service_user_missing (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully auto-start missing service\n");
+      _dbus_warn ("Did not expect to successfully auto-start missing service");
       goto out;
     }
 
@@ -3831,7 +3831,7 @@ check_launch_service_exec_missing (BusContext     *context,
 
   if (!dbus_connection_get_is_connected (connection))
     {
-      _dbus_warn ("connection was disconnected\n");
+      _dbus_warn ("connection was disconnected");
       return TRUE;
     }
 
@@ -3840,7 +3840,7 @@ check_launch_service_exec_missing (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -3851,7 +3851,7 @@ check_launch_service_exec_missing (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3885,7 +3885,7 @@ check_launch_service_exec_missing (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully auto-start missing service\n");
+      _dbus_warn ("Did not expect to successfully auto-start missing service");
       goto out;
     }
 
@@ -3935,7 +3935,7 @@ check_launch_service_service_missing (BusContext     *context,
 
   if (!dbus_connection_get_is_connected (connection))
     {
-      _dbus_warn ("connection was disconnected\n");
+      _dbus_warn ("connection was disconnected");
       return TRUE;
     }
 
@@ -3944,7 +3944,7 @@ check_launch_service_service_missing (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -3955,7 +3955,7 @@ check_launch_service_service_missing (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -3989,7 +3989,7 @@ check_launch_service_service_missing (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully auto-start missing service\n");
+      _dbus_warn ("Did not expect to successfully auto-start missing service");
       goto out;
     }
 
@@ -4047,7 +4047,7 @@ check_shell_fail_service_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
                   "Echo message (auto activation)", serial, connection);
       goto out;
     }
@@ -4058,7 +4058,7 @@ check_shell_fail_service_auto_start (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
-          _dbus_warn ("Message has wrong sender %s\n",
+          _dbus_warn ("Message has wrong sender %s",
                       dbus_message_get_sender (message) ?
                       dbus_message_get_sender (message) : "(none)");
           goto out;
@@ -4084,7 +4084,7 @@ check_shell_fail_service_auto_start (BusContext     *context,
     }
   else
     {
-      _dbus_warn ("Did not expect to successfully auto-start shell fail service\n");
+      _dbus_warn ("Did not expect to successfully auto-start shell fail service");
       goto out;
     }
 
@@ -4151,7 +4151,7 @@ check_shell_service_success_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive any messages after auto start %d on %p\n",
+      _dbus_warn ("Did not receive any messages after auto start %d on %p",
                   serial, connection);
       goto out;
     }
@@ -4181,7 +4181,7 @@ check_shell_service_success_auto_start (BusContext     *context,
       if (message == NULL)
         {
           _dbus_warn ("No message after auto activation "
-                      "(should be a service announcement)\n");
+                      "(should be a service announcement)");
           dbus_connection_return_message (connection, message);
           message = NULL;
           goto out;
@@ -4199,7 +4199,7 @@ check_shell_service_success_auto_start (BusContext     *context,
           if (message == NULL)
             {
               _dbus_warn ("Failed to pop message we just put back! "
-                          "should have been a NameOwnerChanged (creation)\n");
+                          "should have been a NameOwnerChanged (creation)");
               goto out;
             }
 
@@ -4237,7 +4237,7 @@ check_shell_service_success_auto_start (BusContext     *context,
 
         case GOT_ERROR:
         case GOT_SOMETHING_ELSE:
-          _dbus_warn ("Unexpected message after auto activation\n");
+          _dbus_warn ("Unexpected message after auto activation");
           goto out;
         }
     }
@@ -4254,13 +4254,13 @@ check_shell_service_success_auto_start (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Failed to pop message! Should have been reply from echo message\n");
+      _dbus_warn ("Failed to pop message! Should have been reply from echo message");
       goto out;
     }
 
   if (dbus_message_get_reply_serial (message) != serial)
     {
-      _dbus_warn ("Wrong reply serial\n");
+      _dbus_warn ("Wrong reply serial");
       goto out;
     }
 
@@ -4274,7 +4274,7 @@ check_shell_service_success_auto_start (BusContext     *context,
                                        DBUS_TYPE_STRING, &argv[6],
                                        DBUS_TYPE_INVALID))
     {
-      _dbus_warn ("Error getting arguments from return\n");
+      _dbus_warn ("Error getting arguments from return");
       goto out;
     }
 
@@ -4283,42 +4283,42 @@ check_shell_service_success_auto_start (BusContext     *context,
    */
   if (strcmp("-test", argv[1]) != 0)
     {
-      _dbus_warn ("Unexpected argv[1] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[1] in shell success service test (expected: %s, got: %s)",
                   "-test", argv[1]);
       goto out;
     }
 
   if (strcmp("that", argv[2]) != 0)
     {
-      _dbus_warn ("Unexpected argv[2] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[2] in shell success service test (expected: %s, got: %s)",
                    "that", argv[2]);
       goto out;
     }
 
   if (strcmp("we get", argv[3]) != 0)
     {
-      _dbus_warn ("Unexpected argv[3] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[3] in shell success service test (expected: %s, got: %s)",
                    "we get", argv[3]);
       goto out;
     }
 
   if (strcmp("back", argv[4]) != 0)
     {
-      _dbus_warn ("Unexpected argv[4] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[4] in shell success service test (expected: %s, got: %s)",
                    "back", argv[4]);
       goto out;
     }
 
   if (strcmp("--what", argv[5]) != 0)
     {
-      _dbus_warn ("Unexpected argv[5] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[5] in shell success service test (expected: %s, got: %s)",
                    "--what", argv[5]);
       goto out;
     }
 
   if (strcmp("we put in", argv[6]) != 0)
     {
-      _dbus_warn ("Unexpected argv[6] in shell success service test (expected: %s, got: %s)\n",
+      _dbus_warn ("Unexpected argv[6] in shell success service test (expected: %s, got: %s)",
                    "we put in", argv[6]);
       goto out;
     }
@@ -4359,7 +4359,7 @@ check_oom_check1_func (void *data)
 
   if (!check_no_leftovers (d->context))
     {
-      _dbus_warn ("Messages were left over, should be covered by test suite\n");
+      _dbus_warn ("Messages were left over, should be covered by test suite");
       return FALSE;
     }
 
@@ -4436,7 +4436,7 @@ check_get_services (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+      _dbus_warn ("Did not receive a reply to %s %d on %p",
 		  method, serial, connection);
       goto out;
     }
@@ -4488,7 +4488,7 @@ check_get_services (BusContext     *context,
 	  else
 	    {
 	      _dbus_assert (dbus_error_is_set (&error));
-	      _dbus_warn ("Did not get the expected DBUS_TYPE_ARRAY from %s\n", method);
+	      _dbus_warn ("Did not get the expected DBUS_TYPE_ARRAY from %s", method);
 	      goto out;
 	    }
 	} else {
@@ -4537,7 +4537,7 @@ check_list_services (BusContext     *context,
 
   if (!_dbus_string_array_contains ((const char **)services, existent))
     {
-      _dbus_warn ("Did not get the expected %s from ListActivatableNames\n", existent);
+      _dbus_warn ("Did not get the expected %s from ListActivatableNames", existent);
       dbus_free_string_array (services);
       return FALSE;
     }
@@ -4595,7 +4595,7 @@ check_list_services (BusContext     *context,
   message = pop_message_waiting_for_memory (connection);
   if (message == NULL)
     {
-      _dbus_warn ("Did not receive any messages after %s %d on %p\n",
+      _dbus_warn ("Did not receive any messages after %s %d on %p",
 		  "StartServiceByName", serial, connection);
       goto out;
     }
@@ -4607,7 +4607,7 @@ check_list_services (BusContext     *context,
     {
       if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
 	{
-	  _dbus_warn ("Message has wrong sender %s\n",
+	  _dbus_warn ("Message has wrong sender %s",
 		      dbus_message_get_sender (message) ?
 		      dbus_message_get_sender (message) : "(none)");
 	  goto out;
@@ -4629,7 +4629,7 @@ check_list_services (BusContext     *context,
 	}
       else
 	{
-	  _dbus_warn ("Did not expect error %s\n",
+	  _dbus_warn ("Did not expect error %s",
 		      dbus_message_get_error_name (message));
 	  goto out;
 	}
@@ -4651,7 +4651,7 @@ check_list_services (BusContext     *context,
       message = dbus_connection_borrow_message (connection);
       if (message == NULL)
 	{
-	  _dbus_warn ("Did not receive any messages after base service creation notification\n");
+	  _dbus_warn ("Did not receive any messages after base service creation notification");
 	  goto out;
 	}
 
@@ -4666,7 +4666,7 @@ check_list_services (BusContext     *context,
 	case GOT_ERROR:
 	case GOT_SERVICE_DELETED:
 	  _dbus_warn ("Unexpected message after ActivateService "
-		      "(should be an error or a service announcement)\n");
+		      "(should be an error or a service announcement)");
 	  goto out;
 
 	case GOT_SERVICE_CREATED:
@@ -4674,7 +4674,7 @@ check_list_services (BusContext     *context,
 	  if (message == NULL)
 	    {
 	      _dbus_warn ("Failed to pop message we just put back! "
-			  "should have been a NameOwnerChanged (creation)\n");
+			  "should have been a NameOwnerChanged (creation)");
 	      goto out;
 	    }
 
@@ -4687,7 +4687,7 @@ check_list_services (BusContext     *context,
 
 	  if (!check_no_leftovers (context))
 	    {
-	      _dbus_warn ("Messages were left over after successful activation\n");
+	      _dbus_warn ("Messages were left over after successful activation");
 	      goto out;
 	    }
 
@@ -4702,7 +4702,7 @@ check_list_services (BusContext     *context,
 
   if (!_dbus_string_array_contains ((const char **)services, existent))
     {
-      _dbus_warn ("Did not get the expected %s from ListNames\n", existent);
+      _dbus_warn ("Did not get the expected %s from ListNames", existent);
       goto out;
     }
 
@@ -4741,7 +4741,7 @@ check_oom_check2_func (void *data)
 
   if (!check_no_leftovers (d->context))
     {
-      _dbus_warn ("Messages were left over, should be covered by test suite\n");
+      _dbus_warn ("Messages were left over, should be covered by test suite");
       return FALSE;
     }
 
@@ -4763,7 +4763,7 @@ check2_try_iterations (BusContext     *context,
   if (!_dbus_test_oom_handling (description, check_oom_check2_func,
                                 &d))
     {
-      _dbus_warn ("%s failed during oom\n", description);
+      _dbus_warn ("%s failed during oom", description);
       _dbus_assert_not_reached ("test failed");
     }
 }
@@ -4894,7 +4894,7 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
 
   if (!check_no_leftovers (context))
     {
-      _dbus_warn ("Messages were left over after setting up initial connections\n");
+      _dbus_warn ("Messages were left over after setting up initial connections");
       _dbus_assert_not_reached ("initial connection setup failed");
     }
 
@@ -5068,7 +5068,7 @@ bus_dispatch_sha1_test (const DBusString *test_data_dir)
 
   if (!check_no_leftovers (context))
     {
-      _dbus_warn ("Messages were left over after setting up initial SHA-1 connection\n");
+      _dbus_warn ("Messages were left over after setting up initial SHA-1 connection");
       _dbus_assert_not_reached ("initial connection setup failed");
     }