summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@padovan.org>2010-05-21 12:54:54 -0300
committerMarcel Holtmann <marcel@holtmann.org>2010-05-21 18:21:48 +0200
commit8e58667ef0a4cda88ac64137728da28d8fdf3f0f (patch)
treea7778a0bfb31d326f08060d82ea026bbb03d49f5 /network
parent9f71c68cc547f56c343d04f9c96d6fb27bde5050 (diff)
downloadbluez-8e58667ef0a4cda88ac64137728da28d8fdf3f0f.tar.gz
Move debug() to DBG()
Use the new dynamic debug feature
Diffstat (limited to 'network')
-rw-r--r--network/common.c4
-rw-r--r--network/connection.c4
-rw-r--r--network/manager.c18
-rw-r--r--network/server.c8
4 files changed, 17 insertions, 17 deletions
diff --git a/network/common.c b/network/common.c
index 722794d59..f5e0ee885 100644
--- a/network/common.c
+++ b/network/common.c
@@ -79,9 +79,9 @@ static gint find_devname(gconstpointer a, gconstpointer b)
static void script_exited(GPid pid, gint status, gpointer data)
{
if (WIFEXITED(status))
- debug("%d exited with status %d", pid, WEXITSTATUS(status));
+ DBG("%d exited with status %d", pid, WEXITSTATUS(status));
else
- debug("%d was killed by signal %d", pid, WTERMSIG(status));
+ DBG("%d was killed by signal %d", pid, WTERMSIG(status));
g_spawn_close_pid(pid);
}
diff --git a/network/connection.c b/network/connection.c
index ce6d83170..01178d7e3 100644
--- a/network/connection.c
+++ b/network/connection.c
@@ -539,7 +539,7 @@ static void path_unregister(void *data)
{
struct network_peer *peer = data;
- debug("Unregistered interface %s on path %s",
+ DBG("Unregistered interface %s on path %s",
NETWORK_PEER_INTERFACE, peer->path);
peers = g_slist_remove(peers, peer);
@@ -603,7 +603,7 @@ static struct network_peer *create_peer(struct btd_device *device,
return NULL;
}
- debug("Registered interface %s on path %s",
+ DBG("Registered interface %s on path %s",
NETWORK_PEER_INTERFACE, path);
return peer;
diff --git a/network/manager.c b/network/manager.c
index 8216f6f68..80a5ded28 100644
--- a/network/manager.c
+++ b/network/manager.c
@@ -102,7 +102,7 @@ static void read_config(const char *file)
disabled = g_key_file_get_string_list(keyfile, "General",
"Disable", NULL, &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
} else {
int i;
@@ -118,7 +118,7 @@ static void read_config(const char *file)
conf.security = !g_key_file_get_boolean(keyfile, "General",
"DisableSecurity", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
@@ -126,21 +126,21 @@ static void read_config(const char *file)
conf.panu_script = g_key_file_get_string(keyfile, "PANU Role",
"Script", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
conf.gn_script = g_key_file_get_string(keyfile, "GN Role",
"Script", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
conf.nap_script = g_key_file_get_string(keyfile, "NAP Role",
"Script", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
#endif
@@ -148,21 +148,21 @@ static void read_config(const char *file)
conf.iface_prefix = g_key_file_get_string(keyfile, "PANU Role",
"Interface", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
conf.gn_iface = g_key_file_get_string(keyfile, "GN Role",
"Interface", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
conf.nap_iface = g_key_file_get_string(keyfile, "NAP Role",
"Interface", &err);
if (err) {
- debug("%s: %s", file, err->message);
+ DBG("%s: %s", file, err->message);
g_clear_error(&err);
}
@@ -177,7 +177,7 @@ done:
if (!conf.nap_iface)
conf.nap_iface = g_strdup(NAP_IFACE);
- debug("Config options: InterfacePrefix=%s, PANU_Script=%s, "
+ DBG("Config options: InterfacePrefix=%s, PANU_Script=%s, "
"GN_Script=%s, NAP_Script=%s, GN_Interface=%s, "
"NAP_Interface=%s, Security=%s",
conf.iface_prefix, conf.panu_script, conf.gn_script,
diff --git a/network/server.c b/network/server.c
index a4a807f98..a82d4ff00 100644
--- a/network/server.c
+++ b/network/server.c
@@ -500,7 +500,7 @@ static void confirm_event(GIOChannel *chan, gpointer user_data)
goto drop;
}
- debug("BNEP: incoming connect from %s", address);
+ DBG("BNEP: incoming connect from %s", address);
if (na->setup) {
error("Refusing connect from %s: setup in progress", address);
@@ -564,7 +564,7 @@ static uint32_t register_server_record(struct network_server *ns)
return 0;
}
- debug("register_server_record: got record id 0x%x", record->handle);
+ DBG("register_server_record: got record id 0x%x", record->handle);
return record->handle;
}
@@ -786,7 +786,7 @@ static void path_unregister(void *data)
struct network_server *ns = data;
struct network_adapter *na = ns->na;
- debug("Unregistered interface %s on path %s",
+ DBG("Unregistered interface %s on path %s",
ns->iface, adapter_get_path(na->adapter));
na->servers = g_slist_remove(na->servers, ns);
@@ -893,7 +893,7 @@ int server_register(struct btd_adapter *adapter, uint16_t id)
ns->enable = TRUE;
na->servers = g_slist_append(na->servers, ns);
- debug("Registered interface %s on path %s", ns->iface, path);
+ DBG("Registered interface %s on path %s", ns->iface, path);
return 0;
}