Fix compilation issues due to upmerge to 4.69.
Change-Id: Iecfa8ea7961d35527964176e6bec70499298eec4
diff --git a/audio/control.c b/audio/control.c
index 5709f8e..f74bb0a 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -866,7 +866,7 @@
input_device_name = g_key_file_get_string(config,
"AVRCP", "InputDeviceName", &err);
if (err) {
- debug("audio.conf: %s", err->message);
+ DBG("audio.conf: %s", err->message);
input_device_name = NULL;
g_error_free(err);
}
diff --git a/src/Android.mk b/src/Android.mk
index aa64751..7030d79 100755
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -16,7 +16,7 @@
device.c \
error.c \
glib-helper.c \
- logging.c \
+ log.c \
main.c \
manager.c \
oui.c \
diff --git a/src/agent.c b/src/agent.c
index 0cf44c1..efa0320 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -734,7 +734,7 @@
if (agent->request)
return -EBUSY;
- debug("Calling Agent.RequestPairingConsent: name=%s, path=%s",
+ DBG("Calling Agent.RequestPairingConsent: name=%s, path=%s",
agent->name, agent->path);
req = agent_request_new(agent, AGENT_REQUEST_PAIRING_CONSENT, cb,
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index dcd121f..cf284ab 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -397,12 +397,11 @@
/* If local IO capabilities are DisplayYesNo and remote IO
* capabiltiies are DisplayOnly or NoInputNoOutput;
* call PairingConsent callback for incoming requests. */
- struct agent *agent = NULL;
agent = device_get_agent(device);
if (!agent) {
agent = adapter_get_agent(adapter);
if ((agent_get_io_capability(agent) & 0x01) &&
- (remcap == 0x00 || remcap == 0x03))
+ (rem_cap == 0x00 || rem_cap == 0x03))
return device_request_authentication(device,
AUTH_TYPE_PAIRING_CONSENT, 0,
pairing_consent_cb);
diff --git a/src/device.c b/src/device.c
index 9b32b6f..f7d2c52 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2355,7 +2355,7 @@
err = 0;
break;
case AUTH_TYPE_PAIRING_CONSENT:
- ret = agent_request_pairing_consent(agent, device,
+ err = agent_request_pairing_consent(agent, device,
pairing_consent_cb, auth, NULL);
break;
default:
diff --git a/src/main.c b/src/main.c
index c3471b0..2402539 100644
--- a/src/main.c
+++ b/src/main.c
@@ -221,7 +221,7 @@
if (err)
g_clear_error(&err);
else {
- debug("default_link_policy=%s", str);
+ DBG("default_link_policy=%s", str);
main_opts.link_policy &= strtol(str, NULL, 16);
}
}
