Merge ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/bluez/5.49/core-patches-2 into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:bluez/5.49

[Konrad Zapałowicz]

fix compilation issues

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:a2e35cb872dbf9d6d6a3952bb8219098a43ac99a
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/213/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/260
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/260
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/260
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/260
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1054
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/797
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/826/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/213/rebuild

review: Approve (continuous-integration)

diff --git a/obexd/src/main.c b/obexd/src/main.c
index d7ade96..2e79f0e 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (option_root == NULL) {
-		option_root = getenv("SNAP_USER_DATA")
+		option_root = getenv("SNAP_USER_DATA");
 
 		if (!option_root)
 			option_root = g_build_filename(g_get_user_cache_dir(),
diff --git a/src/adapter.c b/src/adapter.c
index 73b48cd..696f953 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -8423,7 +8423,7 @@ static bool get_static_addr(struct btd_adapter *adapter)
 						(const char **)addrs, len);
 
 	str = g_key_file_to_data(file, &len, NULL);
-	g_file_set_contents("%s/addresses", get_storage_dir(), str, len, NULL);
+	g_file_set_contents(filename, str, len, NULL);
 	g_free(str);
 
 	ret = true;