commit 457f7a38371e872b64a39b978f9b9b4c6dcc1d10
author Johan Hedberg <johan.hedberg@nokia.com> Tue Dec 28 11:35:35 2010 +0200
committer Jaikumar Ganesh <jaikumar@google.com> Thu Mar 10 16:48:08 2011 -0800
tree d969a4bbeffee1f219490884c17856d077ffb263
parent deb34a31dfdeda5e40a7d9780e0189965b090143

Rename btd_adapter_get_state to btd_adapter_get_mode

There's already an adapter_get_state function so to avoid confusion it's
better to have a different name.

plugins/hciops.c

diff --git a/plugins/hciops.c b/plugins/hciops.c
index 38ade5e..d1906b9 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -422,7 +422,7 @@
 	if (adapter == NULL)
 		return FALSE;
 
-	btd_adapter_get_state(adapter, &mode, &on_mode, &pairable);
+	btd_adapter_get_mode(adapter, &mode, &on_mode, &pairable);
 
 	if (existing_adapter)
 		mode = on_mode;

plugins/mgmtops.c

diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 7dfd3d8..ff982e8 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -316,7 +316,7 @@
 		return;
 	}
 
-	btd_adapter_get_state(adapter, &mode, NULL, &pairable);
+	btd_adapter_get_mode(adapter, &mode, NULL, &pairable);
 	if (mode == MODE_OFF) {
 		mgmt_set_powered(index, FALSE);
 		return;

src/adapter.c

diff --git a/src/adapter.c b/src/adapter.c
index 4f28e2c..3f0eb8a 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2247,7 +2247,7 @@
 	return type;
 }
 
-void btd_adapter_get_state(struct btd_adapter *adapter, uint8_t *mode,
+void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode,
 					uint8_t *on_mode, gboolean *pairable)
 {
 	char str[14], address[18];

src/adapter.h

diff --git a/src/adapter.h b/src/adapter.h
index 857eec8..1fbc221 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -105,7 +105,7 @@
 
 int btd_adapter_stop(struct btd_adapter *adapter);
 
-void btd_adapter_get_state(struct btd_adapter *adapter, uint8_t *mode,
+void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode,
 					uint8_t *on_mode, gboolean *pairable);
 
 int adapter_update_ssp_mode(struct btd_adapter *adapter, uint8_t mode);