From d5217348517e6b00a04e500ca460daf6cc928cd9 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 26 Mar 2010 21:12:43 +0100 Subject: [PATCH] Cleaned up _dbus_verbose calls: function names and code line numbers are printed by default. --- bus/connection.c | 10 ++-- bus/dispatch.c | 43 +++++++++-------- bus/expirelist.c | 2 +- dbus/dbus-connection.c | 97 ++++++++++++++++++-------------------- dbus/dbus-marshal-recursive-util.c | 8 ++-- dbus/dbus-object-tree.c | 21 ++++----- dbus/dbus-server-protected.h | 4 +- dbus/dbus-transport-socket.c | 18 ++++--- dbus/dbus-transport.c | 18 +++---- dbus/dbus-watch.c | 3 +- 10 files changed, 108 insertions(+), 116 deletions(-) diff --git a/bus/connection.c b/bus/connection.c index b2d6aa5..8ccae76 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -839,7 +839,7 @@ expire_incomplete_timeout (void *data) { BusConnections *connections = data; - _dbus_verbose ("Running %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("Running\n"); /* note that this may remove the timeout */ bus_connections_expire_incomplete (connections); @@ -1632,7 +1632,7 @@ cancel_pending_reply (void *data) { CancelPendingReplyData *d = data; - _dbus_verbose ("%s: d = %p\n", _DBUS_FUNCTION_NAME, d); + _dbus_verbose ("d = %p\n", d); if (!bus_expire_list_remove (d->connections->pending_replies, &d->pending->expire_item)) @@ -1646,7 +1646,7 @@ cancel_pending_reply_data_free (void *data) { CancelPendingReplyData *d = data; - _dbus_verbose ("%s: d = %p\n", _DBUS_FUNCTION_NAME, d); + _dbus_verbose ("d = %p\n", d); /* d->pending should be either freed or still * in the list of pending replies (owned by someone @@ -1783,7 +1783,7 @@ cancel_check_pending_reply (void *data) { CheckPendingReplyData *d = data; - _dbus_verbose ("%s: d = %p\n", _DBUS_FUNCTION_NAME, d); + _dbus_verbose ("d = %p\n",d); bus_expire_list_add_link (d->connections->pending_replies, d->link); @@ -1795,7 +1795,7 @@ check_pending_reply_data_free (void *data) { CheckPendingReplyData *d = data; - _dbus_verbose ("%s: d = %p\n", _DBUS_FUNCTION_NAME, d); + _dbus_verbose ("d = %p\n",d); if (d->link != NULL) { diff --git a/bus/dispatch.c b/bus/dispatch.c index afb85a7..d4c69dc 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -752,8 +752,7 @@ check_no_leftovers (BusContext *context) if (nmd.failed) { - _dbus_verbose ("%s: leftover message found\n", - _DBUS_FUNCTION_NAME); + _dbus_verbose ("leftover message found\n"); return FALSE; } else @@ -977,7 +976,7 @@ check_hello_message (BusContext *context, retval = TRUE; out: - _dbus_verbose ("ending %s retval = %d\n", _DBUS_FUNCTION_NAME, retval); + _dbus_verbose ("ending - retval = %d\n", retval); dbus_error_free (&error); @@ -1033,7 +1032,7 @@ check_double_hello_message (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -1135,7 +1134,7 @@ check_get_connection_unix_user (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -1272,7 +1271,7 @@ check_get_connection_unix_process_id (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -1435,7 +1434,7 @@ check_add_match_all (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -1446,7 +1445,7 @@ check_add_match_all (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -1615,7 +1614,7 @@ check_nonexistent_service_no_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -1707,7 +1706,7 @@ check_nonexistent_service_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -2487,7 +2486,7 @@ check_existent_service_no_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -2709,7 +2708,7 @@ check_segfault_service_no_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -2810,7 +2809,7 @@ check_segfault_service_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -3129,7 +3128,7 @@ check_existent_service_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -3314,7 +3313,7 @@ check_launch_service_file_missing (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -3410,7 +3409,7 @@ check_launch_service_user_missing (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_warn ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_warn ("connection was disconnected\n"); return TRUE; } @@ -3506,7 +3505,7 @@ check_launch_service_exec_missing (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_warn ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_warn ("connection was disconnected\n"); return TRUE; } @@ -3610,7 +3609,7 @@ check_launch_service_service_missing (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_warn ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_warn ("connection was disconnected\n"); return TRUE; } @@ -3713,7 +3712,7 @@ check_shell_fail_service_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -3817,7 +3816,7 @@ check_shell_service_success_auto_start (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } @@ -4097,7 +4096,7 @@ check_get_services (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); dbus_connection_unref (connection); @@ -4259,7 +4258,7 @@ check_list_services (BusContext *context, if (!dbus_connection_get_is_connected (connection)) { - _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("connection was disconnected\n"); return TRUE; } diff --git a/bus/expirelist.c b/bus/expirelist.c index d957536..946a615 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -218,7 +218,7 @@ expire_timeout_handler (void *data) { BusExpireList *list = data; - _dbus_verbose ("Running %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("Running\n"); /* note that this may remove the timeout */ bus_expirelist_expire (list); diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 69bfc69..6992f00 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -64,13 +64,13 @@ #define TRACE_LOCKS 1 #define CONNECTION_LOCK(connection) do { \ - if (TRACE_LOCKS) { _dbus_verbose (" LOCK: %s\n", _DBUS_FUNCTION_NAME); } \ + if (TRACE_LOCKS) { _dbus_verbose ("LOCK\n"); } \ _dbus_mutex_lock ((connection)->mutex); \ TOOK_LOCK_CHECK (connection); \ } while (0) #define CONNECTION_UNLOCK(connection) do { \ - if (TRACE_LOCKS) { _dbus_verbose (" UNLOCK: %s\n", _DBUS_FUNCTION_NAME); } \ + if (TRACE_LOCKS) { _dbus_verbose ("UNLOCK\n"); } \ RELEASING_LOCK_CHECK (connection); \ _dbus_mutex_unlock ((connection)->mutex); \ } while (0) @@ -1033,11 +1033,11 @@ _dbus_connection_acquire_io_path (DBusConnection *connection, /* We will only touch io_path_acquired which is protected by our mutex */ CONNECTION_UNLOCK (connection); - _dbus_verbose ("%s locking io_path_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("locking io_path_mutex\n"); _dbus_mutex_lock (connection->io_path_mutex); - _dbus_verbose ("%s start connection->io_path_acquired = %d timeout = %d\n", - _DBUS_FUNCTION_NAME, connection->io_path_acquired, timeout_milliseconds); + _dbus_verbose ("start connection->io_path_acquired = %d timeout = %d\n", + connection->io_path_acquired, timeout_milliseconds); we_acquired = FALSE; @@ -1045,8 +1045,8 @@ _dbus_connection_acquire_io_path (DBusConnection *connection, { if (timeout_milliseconds != -1) { - _dbus_verbose ("%s waiting %d for IO path to be acquirable\n", - _DBUS_FUNCTION_NAME, timeout_milliseconds); + _dbus_verbose ("waiting %d for IO path to be acquirable\n", + timeout_milliseconds); if (!_dbus_condvar_wait_timeout (connection->io_path_cond, connection->io_path_mutex, @@ -1066,7 +1066,7 @@ _dbus_connection_acquire_io_path (DBusConnection *connection, { while (connection->io_path_acquired) { - _dbus_verbose ("%s waiting for IO path to be acquirable\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("waiting for IO path to be acquirable\n"); _dbus_condvar_wait (connection->io_path_cond, connection->io_path_mutex); } @@ -1079,10 +1079,10 @@ _dbus_connection_acquire_io_path (DBusConnection *connection, connection->io_path_acquired = TRUE; } - _dbus_verbose ("%s end connection->io_path_acquired = %d we_acquired = %d\n", - _DBUS_FUNCTION_NAME, connection->io_path_acquired, we_acquired); + _dbus_verbose ("end connection->io_path_acquired = %d we_acquired = %d\n", + connection->io_path_acquired, we_acquired); - _dbus_verbose ("%s unlocking io_path_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlocking io_path_mutex\n"); _dbus_mutex_unlock (connection->io_path_mutex); CONNECTION_LOCK (connection); @@ -1106,18 +1106,18 @@ _dbus_connection_release_io_path (DBusConnection *connection) { HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s locking io_path_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("locking io_path_mutex\n"); _dbus_mutex_lock (connection->io_path_mutex); _dbus_assert (connection->io_path_acquired); - _dbus_verbose ("%s start connection->io_path_acquired = %d\n", - _DBUS_FUNCTION_NAME, connection->io_path_acquired); + _dbus_verbose ("start connection->io_path_acquired = %d\n", + connection->io_path_acquired); connection->io_path_acquired = FALSE; _dbus_condvar_wake_one (connection->io_path_cond); - _dbus_verbose ("%s unlocking io_path_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlocking io_path_mutex\n"); _dbus_mutex_unlock (connection->io_path_mutex); } @@ -1154,7 +1154,7 @@ _dbus_connection_do_iteration_unlocked (DBusConnection *connection, unsigned int flags, int timeout_milliseconds) { - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); HAVE_LOCK_CHECK (connection); @@ -1173,7 +1173,7 @@ _dbus_connection_do_iteration_unlocked (DBusConnection *connection, HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); } /** @@ -1438,7 +1438,7 @@ _dbus_connection_handle_watch (DBusWatch *watch, connection = data; - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); CONNECTION_LOCK (connection); @@ -1457,14 +1457,14 @@ _dbus_connection_handle_watch (DBusWatch *watch, HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("middle\n"); status = _dbus_connection_get_dispatch_status_unlocked (connection); /* this calls out to user code */ _dbus_connection_update_dispatch_status_and_unlock (connection, status); - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); return retval; } @@ -2017,7 +2017,7 @@ _dbus_connection_send_preallocated_and_unlock (DBusConnection *connection, preallocated, message, client_serial); - _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("middle\n"); status = _dbus_connection_get_dispatch_status_unlocked (connection); /* this calls out to user code */ @@ -2252,7 +2252,7 @@ check_for_reply_and_update_dispatch_unlocked (DBusConnection *connection, _dbus_pending_call_get_reply_serial_unlocked (pending)); if (reply != NULL) { - _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("checked for reply\n"); _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n"); @@ -2345,7 +2345,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending) recheck_status: - _dbus_verbose ("%s top of recheck\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("top of recheck\n"); HAVE_LOCK_CHECK (connection); @@ -2358,7 +2358,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending) */ if (_dbus_pending_call_get_completed_unlocked (pending)) { - _dbus_verbose ("Pending call completed by dispatch in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("Pending call completed by dispatch\n"); _dbus_connection_update_dispatch_status_and_unlock (connection, status); dbus_pending_call_unref (pending); return; @@ -3247,7 +3247,7 @@ reply_handler_timeout (void *data) _dbus_pending_call_get_timeout_unlocked (pending)); _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE); - _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("middle\n"); status = _dbus_connection_get_dispatch_status_unlocked (connection); /* Unlocks, and calls out to user code */ @@ -3512,7 +3512,7 @@ _dbus_connection_flush_unlocked (DBusConnection *connection) while (connection->n_outgoing > 0 && _dbus_connection_get_is_connected_unlocked (connection)) { - _dbus_verbose ("doing iteration in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("doing iteration in\n"); HAVE_LOCK_CHECK (connection); _dbus_connection_do_iteration_unlocked (connection, DBUS_ITERATION_DO_READING | @@ -3522,7 +3522,7 @@ _dbus_connection_flush_unlocked (DBusConnection *connection) } HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("middle\n"); status = _dbus_connection_get_dispatch_status_unlocked (connection); HAVE_LOCK_CHECK (connection); @@ -3554,7 +3554,7 @@ dbus_connection_flush (DBusConnection *connection) /* Unlocks and calls out to user code */ _dbus_connection_update_dispatch_status_and_unlock (connection, status); - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); } /** @@ -3584,13 +3584,13 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection, if (dispatch && dstatus == DBUS_DISPATCH_DATA_REMAINS) { - _dbus_verbose ("doing dispatch in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("doing dispatch\n"); dbus_connection_dispatch (connection); CONNECTION_LOCK (connection); } else if (dstatus == DBUS_DISPATCH_NEED_MEMORY) { - _dbus_verbose ("pausing for memory in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("pausing for memory\n"); _dbus_memory_pause_based_on_timeout (timeout_milliseconds); CONNECTION_LOCK (connection); } @@ -3599,7 +3599,7 @@ _dbus_connection_read_write_dispatch (DBusConnection *connection, CONNECTION_LOCK (connection); if (_dbus_connection_get_is_connected_unlocked (connection)) { - _dbus_verbose ("doing iteration in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("doing iteration\n"); _dbus_connection_do_iteration_unlocked (connection, DBUS_ITERATION_DO_READING | DBUS_ITERATION_DO_WRITING | @@ -3750,7 +3750,7 @@ dbus_connection_borrow_message (DBusConnection *connection) _dbus_return_val_if_fail (connection != NULL, NULL); - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); /* this is called for the side effect that it queues * up any messages from the transport @@ -3975,7 +3975,7 @@ dbus_connection_pop_message (DBusConnection *connection) DBusMessage *message; DBusDispatchStatus status; - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); /* this is called for the side effect that it queues * up any messages from the transport @@ -4015,12 +4015,12 @@ _dbus_connection_acquire_dispatch (DBusConnection *connection) _dbus_connection_ref_unlocked (connection); CONNECTION_UNLOCK (connection); - _dbus_verbose ("%s locking dispatch_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("locking dispatch_mutex\n"); _dbus_mutex_lock (connection->dispatch_mutex); while (connection->dispatch_acquired) { - _dbus_verbose ("%s waiting for dispatch to be acquirable\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("waiting for dispatch to be acquirable\n"); _dbus_condvar_wait (connection->dispatch_cond, connection->dispatch_mutex); } @@ -4029,7 +4029,7 @@ _dbus_connection_acquire_dispatch (DBusConnection *connection) connection->dispatch_acquired = TRUE; - _dbus_verbose ("%s unlocking dispatch_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlocking dispatch_mutex\n"); _dbus_mutex_unlock (connection->dispatch_mutex); CONNECTION_LOCK (connection); @@ -4048,7 +4048,7 @@ _dbus_connection_release_dispatch (DBusConnection *connection) { HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s locking dispatch_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("locking dispatch_mutex\n"); _dbus_mutex_lock (connection->dispatch_mutex); _dbus_assert (connection->dispatch_acquired); @@ -4056,7 +4056,7 @@ _dbus_connection_release_dispatch (DBusConnection *connection) connection->dispatch_acquired = FALSE; _dbus_condvar_wake_one (connection->dispatch_cond); - _dbus_verbose ("%s unlocking dispatch_mutex\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlocking dispatch_mutex\n"); _dbus_mutex_unlock (connection->dispatch_mutex); } @@ -4109,8 +4109,7 @@ notify_disconnected_and_dispatch_complete_unlocked (DBusConnection *connection) if (connection->disconnect_message_link != NULL) { - _dbus_verbose ("Sending disconnect message from %s\n", - _DBUS_FUNCTION_NAME); + _dbus_verbose ("Sending disconnect message\n"); /* If we have pending calls, queue their timeouts - we want the Disconnected * to be the last message, after these timeouts. @@ -4264,7 +4263,7 @@ dbus_connection_get_dispatch_status (DBusConnection *connection) _dbus_return_val_if_fail (connection != NULL, DBUS_DISPATCH_COMPLETE); - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); CONNECTION_LOCK (connection); @@ -4441,7 +4440,7 @@ dbus_connection_dispatch (DBusConnection *connection) _dbus_return_val_if_fail (connection != NULL, DBUS_DISPATCH_COMPLETE); - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); CONNECTION_LOCK (connection); status = _dbus_connection_get_dispatch_status_unlocked (connection); @@ -4577,7 +4576,7 @@ dbus_connection_dispatch (DBusConnection *connection) if (result == DBUS_HANDLER_RESULT_NEED_MEMORY) { - _dbus_verbose ("No memory in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("No memory\n"); goto out; } else if (result == DBUS_HANDLER_RESULT_HANDLED) @@ -4684,7 +4683,7 @@ dbus_connection_dispatch (DBusConnection *connection) out: if (result == DBUS_HANDLER_RESULT_NEED_MEMORY) { - _dbus_verbose ("out of memory in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("out of memory\n"); /* Put message back, and we'll start over. * Yes this means handlers must be idempotent if they @@ -4695,7 +4694,7 @@ dbus_connection_dispatch (DBusConnection *connection) } else { - _dbus_verbose (" ... done dispatching in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose (" ... done dispatching\n"); _dbus_list_free_link (message_link); dbus_message_unref (message); /* don't want the message to count in max message limits @@ -4706,7 +4705,7 @@ dbus_connection_dispatch (DBusConnection *connection) _dbus_connection_release_dispatch (connection); HAVE_LOCK_CHECK (connection); - _dbus_verbose ("%s before final status update\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("before final status update\n"); status = _dbus_connection_get_dispatch_status_unlocked (connection); /* unlocks and calls user code */ @@ -4794,8 +4793,7 @@ dbus_connection_set_watch_functions (DBusConnection *connection, #ifndef DBUS_DISABLE_CHECKS if (connection->watches == NULL) { - _dbus_warn_check_failed ("Re-entrant call to %s is not allowed\n", - _DBUS_FUNCTION_NAME); + _dbus_warn_check_failed ("Re-entrant call is not allowed\n"); return FALSE; } #endif @@ -4876,8 +4874,7 @@ dbus_connection_set_timeout_functions (DBusConnection *connection, #ifndef DBUS_DISABLE_CHECKS if (connection->timeouts == NULL) { - _dbus_warn_check_failed ("Re-entrant call to %s is not allowed\n", - _DBUS_FUNCTION_NAME); + _dbus_warn_check_failed ("Re-entrant call is not allowed\n"); return FALSE; } #endif diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c index f4d59f3..3508bb0 100644 --- a/dbus/dbus-marshal-recursive-util.c +++ b/dbus/dbus-marshal-recursive-util.c @@ -1090,7 +1090,7 @@ run_test_copy (NodeIterationData *nid) DBusTypeReader reader; DBusTypeWriter writer; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); src = nid->block; @@ -1153,7 +1153,7 @@ run_test_values_only_write (NodeIterationData *nid) dbus_bool_t retval; int sig_len; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); retval = FALSE; @@ -1221,7 +1221,7 @@ run_test_set_values (NodeIterationData *nid) dbus_bool_t retval; int i; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); retval = FALSE; @@ -1278,7 +1278,7 @@ run_test_delete_values (NodeIterationData *nid) dbus_bool_t retval; int t; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); retval = FALSE; diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index 2f8dcba..5aab9e6 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -508,7 +508,7 @@ unlock: #endif { _dbus_connection_ref_unlocked (connection); - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (connection); } @@ -642,7 +642,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } @@ -657,7 +657,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } @@ -717,7 +717,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree, { if (!already_unlocked) { - _dbus_verbose ("unlock %s %d\n", _DBUS_FUNCTION_NAME, __LINE__); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } } @@ -765,7 +765,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } @@ -780,7 +780,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } @@ -846,7 +846,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } @@ -886,7 +886,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } } @@ -926,8 +926,7 @@ _dbus_object_tree_get_user_data_unlocked (DBusObjectTree *tree, if ((subtree == NULL) || !exact_match) { - _dbus_verbose ("%s: No object at specified path found\n", - _DBUS_FUNCTION_NAME); + _dbus_verbose ("No object at specified path found\n"); return NULL; } @@ -1049,7 +1048,7 @@ _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree, if (tree->connection) #endif { - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (tree->connection); } diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index 20836b5..cc2de8d 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -143,13 +143,13 @@ DBusServerListenResult _dbus_server_listen_platform_specific (DBusAddressEntry #define TRACE_LOCKS 0 #define SERVER_LOCK(server) do { \ - if (TRACE_LOCKS) { _dbus_verbose (" LOCK: %s\n", _DBUS_FUNCTION_NAME); } \ + if (TRACE_LOCKS) { _dbus_verbose ("LOCK\n"); } \ _dbus_mutex_lock ((server)->mutex); \ TOOK_LOCK_CHECK (server); \ } while (0) #define SERVER_UNLOCK(server) do { \ - if (TRACE_LOCKS) { _dbus_verbose (" UNLOCK: %s\n", _DBUS_FUNCTION_NAME); } \ + if (TRACE_LOCKS) { _dbus_verbose ("UNLOCK\n"); } \ RELEASING_LOCK_CHECK (server); \ _dbus_mutex_unlock ((server)->mutex); \ } while (0) diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 849a107..1d4c2bf 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -73,7 +73,7 @@ free_watches (DBusTransport *transport) { DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); if (socket_transport->read_watch) { @@ -95,7 +95,7 @@ free_watches (DBusTransport *transport) socket_transport->write_watch = NULL; } - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); } static void @@ -103,7 +103,7 @@ socket_finalize (DBusTransport *transport) { DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); free_watches (transport); @@ -177,8 +177,7 @@ check_read_watch (DBusTransport *transport) DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; dbus_bool_t need_read_watch; - _dbus_verbose ("%s: fd = %d\n", - _DBUS_FUNCTION_NAME, socket_transport->fd); + _dbus_verbose ("fd = %d\n",socket_transport->fd); if (transport->connection == NULL) return; @@ -701,8 +700,7 @@ do_reading (DBusTransport *transport) int total; dbus_bool_t oom; - _dbus_verbose ("%s: fd = %d\n", _DBUS_FUNCTION_NAME, - socket_transport->fd); + _dbus_verbose ("fd = %d\n",socket_transport->fd); /* No messages without authentication! */ if (!_dbus_transport_get_is_authenticated (transport)) @@ -984,7 +982,7 @@ socket_disconnect (DBusTransport *transport) { DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - _dbus_verbose ("%s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("\n"); free_watches (transport); @@ -1119,7 +1117,7 @@ socket_do_iteration (DBusTransport *transport, */ if (flags & DBUS_ITERATION_BLOCK) { - _dbus_verbose ("unlock %s pre poll\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock pre poll\n"); _dbus_connection_unlock (transport->connection); } @@ -1131,7 +1129,7 @@ socket_do_iteration (DBusTransport *transport, if (flags & DBUS_ITERATION_BLOCK) { - _dbus_verbose ("lock %s post poll\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("lock post poll\n"); _dbus_connection_lock (transport->connection); } diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index bec4a5a..f33dc60 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -475,7 +475,7 @@ _dbus_transport_unref (DBusTransport *transport) transport->refcount -= 1; if (transport->refcount == 0) { - _dbus_verbose ("%s: finalizing\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("finalizing\n"); _dbus_assert (transport->vtable->finalize != NULL); @@ -494,7 +494,7 @@ _dbus_transport_unref (DBusTransport *transport) void _dbus_transport_disconnect (DBusTransport *transport) { - _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("start\n"); _dbus_assert (transport->vtable->disconnect != NULL); @@ -505,7 +505,7 @@ _dbus_transport_disconnect (DBusTransport *transport) transport->disconnected = TRUE; - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); } /** @@ -542,14 +542,14 @@ auth_via_unix_user_function (DBusTransport *transport) unix_user_data = transport->unix_user_data; uid = _dbus_credentials_get_unix_uid (auth_identity); - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (connection); allow = (* unix_user_function) (connection, uid, unix_user_data); - _dbus_verbose ("lock %s post unix user function\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("lock post unix user function\n"); _dbus_connection_lock (connection); if (allow) @@ -593,14 +593,14 @@ auth_via_windows_user_function (DBusTransport *transport) return FALSE; } - _dbus_verbose ("unlock %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("unlock\n"); _dbus_connection_unlock (connection); allow = (* windows_user_function) (connection, windows_sid, windows_user_data); - _dbus_verbose ("lock %s post windows user function\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("lock post windows user function\n"); _dbus_connection_lock (connection); if (allow) @@ -746,7 +746,7 @@ _dbus_transport_get_is_authenticated (DBusTransport *transport) if (transport->expected_guid == NULL) { - _dbus_verbose ("No memory to complete auth in %s\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("No memory to complete auth\n"); return FALSE; } } @@ -981,7 +981,7 @@ _dbus_transport_do_iteration (DBusTransport *transport, timeout_milliseconds); _dbus_transport_unref (transport); - _dbus_verbose ("%s end\n", _DBUS_FUNCTION_NAME); + _dbus_verbose ("end\n"); } static dbus_bool_t diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c index bd5ca8f..5acb202 100644 --- a/dbus/dbus-watch.c +++ b/dbus/dbus-watch.c @@ -650,8 +650,7 @@ dbus_watch_handle (DBusWatch *watch, #ifndef DBUS_DISABLE_CHECKS if (watch->fd < 0 || watch->flags == 0) { - _dbus_warn_check_failed ("%s: Watch is invalid, it should have been removed\n", - _DBUS_FUNCTION_NAME); + _dbus_warn_check_failed ("Watch is invalid, it should have been removed\n"); return TRUE; } #endif -- 2.7.4