diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-05-14 16:07:42 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-05-15 11:16:34 +0300 |
| commit | 40e77e7b71117a90383b8e01211836c227c90d37 (patch) | |
| tree | e1df7f27b33d0b06f9684749a15650ab17f2d66a /plugins/policy.c | |
| parent | 42fd4ce72c2b9bbc9ccf035964d90ada0b4a2796 (diff) | |
| download | bluez-40e77e7b71117a90383b8e01211836c227c90d37.tar.gz | |
plugins/policy: Rename UUIDs list variable to avoid name collisions
Diffstat (limited to 'plugins/policy.c')
| -rw-r--r-- | plugins/policy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/policy.c b/plugins/policy.c index 93bad170e..7d6579771 100644 --- a/plugins/policy.c +++ b/plugins/policy.c @@ -64,7 +64,7 @@ struct reconnect_data { static const char *default_reconnect[] = { HSP_AG_UUID, HFP_AG_UUID, A2DP_SOURCE_UUID, NULL }; -static char **reconnect = NULL; +static char **reconnect_uuids = NULL; static GSList *reconnects = NULL; static unsigned int service_id = 0; @@ -434,7 +434,7 @@ static bool reconnect_match(const char *uuid) { char **str; - for (str = reconnect; *str; str++) { + for (str = reconnect_uuids; *str; str++) { if (!bt_uuid_strcmp(uuid, *str)) return true; } @@ -663,7 +663,7 @@ static int policy_init(void) service_id = btd_service_add_state_cb(service_cb, NULL); /* TODO: Add overriding default from config file */ - reconnect = g_strdupv((char **) default_reconnect); + reconnect_uuids = g_strdupv((char **) default_reconnect); btd_add_disconnect_cb(disconnect_cb); @@ -677,7 +677,7 @@ static void policy_exit(void) btd_remove_disconnect_cb(disconnect_cb); btd_remove_conn_fail_cb(conn_fail_cb); - g_strfreev(reconnect); + g_strfreev(reconnect_uuids); g_slist_free_full(reconnects, reconnect_destroy); |