88e5001cf2
Patches cleanup Add DualShock4 cable pairing support BIND_NOW support for RELRO iCade autopairing support
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From d746de1bbcd6e9349dbd990ff9d33351f0bad319 Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Tue, 5 Sep 2017 10:46:03 +0200
|
|
Subject: [PATCH 4/4] obex: Work-around compilation failure
|
|
|
|
obexd/plugins/bluetooth.c: In function 'register_profile':
|
|
obexd/plugins/bluetooth.c:310:7: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
|
|
profile->driver->port);
|
|
^~~~~~~
|
|
obexd/plugins/bluetooth.c:314:7: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
|
|
profile->driver->name);
|
|
^~~~~~~
|
|
---
|
|
obexd/plugins/bluetooth.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
|
|
index 3ee54325f..3e31eaef6 100644
|
|
--- a/obexd/plugins/bluetooth.c
|
|
+++ b/obexd/plugins/bluetooth.c
|
|
@@ -302,6 +302,9 @@ static int register_profile(struct bluetooth_profile *profile)
|
|
&opt);
|
|
dict_append_entry(&opt, "AutoConnect", DBUS_TYPE_BOOLEAN,
|
|
&auto_connect);
|
|
+
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
|
if (profile->driver->record) {
|
|
if (profile->driver->port != 0)
|
|
xml = g_markup_printf_escaped(profile->driver->record,
|
|
@@ -312,6 +315,7 @@ static int register_profile(struct bluetooth_profile *profile)
|
|
xml = g_markup_printf_escaped(profile->driver->record,
|
|
profile->driver->channel,
|
|
profile->driver->name);
|
|
+#pragma GCC diagnostic pop
|
|
dict_append_entry(&opt, "ServiceRecord", DBUS_TYPE_STRING,
|
|
&xml);
|
|
g_free(xml);
|
|
--
|
|
2.14.1
|
|
|