Remove redundant information that is already present in DBG
diff --git a/audio/a2dp.c b/audio/a2dp.c
index 556446b..b062aed 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -112,14 +112,14 @@
{
setup->ref++;
- DBG("setup_ref(%p): ref=%d", setup, setup->ref);
+ DBG("%p: ref=%d", setup, setup->ref);
return setup;
}
static void setup_free(struct a2dp_setup *s)
{
- DBG("setup_free(%p)", s);
+ DBG("%p", s);
setups = g_slist_remove(setups, s);
if (s->session)
avdtp_unref(s->session);
@@ -132,7 +132,7 @@
{
setup->ref--;
- DBG("setup_unref(%p): ref=%d", setup, setup->ref);
+ DBG("%p: ref=%d", setup, setup->ref);
if (setup->ref <= 0)
setup_free(setup);
diff --git a/audio/avdtp.c b/audio/avdtp.c
index 8a44f77..cf07f6c 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -541,8 +541,7 @@
cont_fragments = (len - (session->omtu - sizeof(start))) /
(session->omtu - sizeof(cont)) + 1;
- DBG("avdtp_send: %zu bytes split into %d fragments", len,
- cont_fragments + 1);
+ DBG("%zu bytes split into %d fragments", len, cont_fragments + 1);
/* Send the start packet */
memset(&start, 0, sizeof(start));
@@ -559,8 +558,7 @@
if (!try_send(sock, session->buf, session->omtu))
return FALSE;
- DBG("avdtp_send: first packet with %zu bytes sent",
- session->omtu - sizeof(start));
+ DBG("first packet with %zu bytes sent", session->omtu - sizeof(start));
sent = session->omtu - sizeof(start);
@@ -572,13 +570,11 @@
if (left + sizeof(cont) > session->omtu) {
cont.packet_type = AVDTP_PKT_TYPE_CONTINUE;
to_copy = session->omtu - sizeof(cont);
- DBG("avdtp_send: sending continue with %d bytes",
- to_copy);
+ DBG("sending continue with %d bytes", to_copy);
} else {
cont.packet_type = AVDTP_PKT_TYPE_END;
to_copy = left;
- DBG("avdtp_send: sending end with %d bytes",
- to_copy);
+ DBG("sending end with %d bytes", to_copy);
}
cont.transaction = transaction;
@@ -1120,7 +1116,7 @@
session->ref--;
- DBG("avdtp_unref(%p): ref=%d", session, session->ref);
+ DBG("%p: ref=%d", session, session->ref);
if (session->ref == 1) {
if (session->state == AVDTP_SESSION_STATE_CONNECTING &&
@@ -1147,8 +1143,7 @@
server = session->server;
- DBG("avdtp_unref(%p): freeing session and removing from list",
- session);
+ DBG("%p: freeing session and removing from list", session);
if (session->dc_timer)
remove_disconnect_timer(session);
@@ -1169,7 +1164,7 @@
struct avdtp *avdtp_ref(struct avdtp *session)
{
session->ref++;
- DBG("avdtp_ref(%p): ref=%d", session, session->ref);
+ DBG("%p: ref=%d", session, session->ref);
if (session->dc_timer)
remove_disconnect_timer(session);
return session;
@@ -1981,7 +1976,7 @@
struct avdtp_common_header *header;
gsize size;
- DBG("session_cb");
+ DBG("");
if (cond & G_IO_NVAL)
return FALSE;
@@ -2330,8 +2325,7 @@
* Abort the device's channel in favor of our own.
*/
if (session->state == AVDTP_SESSION_STATE_CONNECTING) {
- DBG("avdtp_confirm_cb: connect already in progress"
- " (XCASE connect:connect)");
+ DBG("connect already in progress (XCASE connect:connect)");
goto drop;
}
@@ -3346,8 +3340,8 @@
if (!(lsep && rsep))
return -EINVAL;
- DBG("avdtp_set_configuration(%p): int_seid=%u, acp_seid=%u",
- session, lsep->info.seid, rsep->seid);
+ DBG("%p: int_seid=%u, acp_seid=%u", session,
+ lsep->info.seid, rsep->seid);
new_stream = g_new0(struct avdtp_stream, 1);
new_stream->session = session;
diff --git a/audio/manager.c b/audio/manager.c
index 5edfb18..6dd0f87 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -171,8 +171,7 @@
uuid16 = uuid.value.uuid16;
if (!server_is_enabled(&device->src, uuid16)) {
- DBG("audio handle_uuid: server not enabled for %s (0x%04x)",
- uuidstr, uuid16);
+ DBG("server not enabled for %s (0x%04x)", uuidstr, uuid16);
return;
}
@@ -776,7 +775,7 @@
audio_dev = manager_get_device(&src, &dst, TRUE);
if (!audio_dev) {
- DBG("audio_probe: unable to get a device object");
+ DBG("unable to get a device object");
return -1;
}
@@ -806,7 +805,7 @@
{
adp->ref++;
- DBG("audio_adapter_ref(%p): ref=%d", adp, adp->ref);
+ DBG("%p: ref=%d", adp, adp->ref);
return adp;
}
@@ -815,7 +814,7 @@
{
adp->ref--;
- DBG("audio_adapter_unref(%p): ref=%d", adp, adp->ref);
+ DBG("%p: ref=%d", adp, adp->ref);
if (adp->ref > 0)
return;
diff --git a/network/server.c b/network/server.c
index a82d4ff..aee0bc5 100644
--- a/network/server.c
+++ b/network/server.c
@@ -564,7 +564,7 @@
return 0;
}
- DBG("register_server_record: got record id 0x%x", record->handle);
+ DBG("got record id 0x%x", record->handle);
return record->handle;
}
diff --git a/src/adapter.c b/src/adapter.c
index 7100191..5d90b46 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -676,7 +676,7 @@
{
req->refcount++;
- DBG("session_ref(%p): ref=%d", req, req->refcount);
+ DBG("%p: ref=%d", req, req->refcount);
return req;
}
@@ -685,7 +685,7 @@
{
req->refcount--;
- DBG("session_unref(%p): ref=%d", req, req->refcount);
+ DBG("%p: ref=%d", req, req->refcount);
if (req->refcount)
return;
@@ -1118,7 +1118,7 @@
struct btd_device *device;
const char *path;
- DBG("adapter_create_device(%s)", address);
+ DBG("%s", address);
device = device_create(conn, adapter, address);
if (!device)
@@ -1170,7 +1170,7 @@
{
struct btd_device *device;
- DBG("adapter_get_device(%s)", address);
+ DBG("%s", address);
if (!adapter)
return NULL;
@@ -1586,7 +1586,7 @@
ERROR_INTERFACE ".AlreadyExists",
"Device already exists");
- DBG("create_device(%s)", address);
+ DBG("%s", address);
device = adapter_create_device(conn, adapter, address);
if (!device)
@@ -2498,7 +2498,7 @@
agent_free(adapter->agent);
adapter->agent = NULL;
- DBG("adapter_free(%p)", adapter);
+ DBG("%p", adapter);
if (adapter->auth_idle_id)
g_source_remove(adapter->auth_idle_id);
@@ -2511,7 +2511,7 @@
{
adapter->ref++;
- DBG("btd_adapter_ref(%p): ref=%d", adapter, adapter->ref);
+ DBG("%p: ref=%d", adapter, adapter->ref);
return adapter;
}
@@ -2522,7 +2522,7 @@
adapter->ref--;
- DBG("btd_adapter_unref(%p): ref=%d", adapter, adapter->ref);
+ DBG("%p: ref=%d", adapter, adapter->ref);
if (adapter->ref > 0)
return;
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index a3fd557..b83506f 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -418,7 +418,7 @@
struct btd_adapter *adapter;
struct btd_device *device;
- DBG("hcid_dbus_bonding_process_complete: status=%02x", status);
+ DBG("status=%02x", status);
if (!get_adapter_and_device(local, peer, &adapter, &device, TRUE))
return;
@@ -427,7 +427,7 @@
/* This means that there was no pending PIN or SSP token
* request from the controller, i.e. this is not a new
* pairing */
- DBG("hcid_dbus_bonding_process_complete: no pending auth request");
+ DBG("no pending auth request");
return;
}
@@ -442,7 +442,7 @@
struct btd_adapter *adapter;
struct btd_device *device;
- DBG("hcid_dbus_simple_pairing_complete: status=%02x", status);
+ DBG("status=%02x", status);
if (!get_adapter_and_device(local, peer, &adapter, &device, TRUE))
return;
diff --git a/src/device.c b/src/device.c
index 73243c9..d4ff131 100644
--- a/src/device.c
+++ b/src/device.c
@@ -251,7 +251,7 @@
if (device->discov_timer)
g_source_remove(device->discov_timer);
- DBG("device_free(%p)", device);
+ DBG("%p", device);
g_free(device->authr);
g_free(device->path);
@@ -2476,7 +2476,7 @@
{
device->ref++;
- DBG("btd_device_ref(%p): ref=%d", device, device->ref);
+ DBG("%p: ref=%d", device, device->ref);
return device;
}
@@ -2488,7 +2488,7 @@
device->ref--;
- DBG("btd_device_unref(%p): ref=%d", device, device->ref);
+ DBG("%p: ref=%d", device, device->ref);
if (device->ref > 0)
return;
