From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Mon, 26 Dec 2016 05:00:08 +0000 (+0900)
Subject: Revert "DPM: Fix DPM GCC6 warning errors."
X-Git-Tag: accepted/tizen/3.0/common/20161227.101705^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4be34a7cebf46ccc0223f27d9d01c9650a2df9b9;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

Revert "DPM: Fix DPM GCC6 warning errors."

This reverts commit 69a889b2872947fc8034b4dd787eb1a210d9a2b0.
Fix the next build error in tizen_3.0

178s] [ 88%] Building C object bt-service/CMakeFiles/bt-service.dir/bt-service-dpm.c.o
[  179s] /home/abuild/rpmbuild/BUILD/bluetooth-frwk-0.2.156/bt-service/bt-service-dpm.c:35:2: error: excess elements in union initializer [-Werror]
[  179s]   [DPM_POLICY_ALLOW_BLUETOOTH] = { {DPM_BT_ERROR, NULL} },
[  179s]   ^
[  179s] /home/abuild/rpmbuild/BUILD/bluetooth-frwk-0.2.156/bt-service/bt-service-dpm.c:35:2: error: (near initialization for 'policy_table[0].<anonymous>') [-Werror]
[  179s] /home/abuild/rpmbuild/BUILD/bluetooth-frwk-0.2.156/bt-service/bt-service-dpm.c:36:2: error: excess elements in union initializer [-Werror]
[  179s]   [DPM_POLICY_BLUETOOTH_DEVICE_RESTRICTION] = { {DPM_STATUS_ERROR, NULL} },

Change-Id: I549af70370af09ace903822e17f993b47bc98c9c
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/bt-service/bt-service-dpm.c b/bt-service/bt-service-dpm.c
index 908f12c..37cec48 100644
--- a/bt-service/bt-service-dpm.c
+++ b/bt-service/bt-service-dpm.c
@@ -32,19 +32,19 @@
 #include "bt-service-dpm.h"
 
 static dpm_policy_t policy_table[DPM_POLICY_END] = {
-	[DPM_POLICY_ALLOW_BLUETOOTH] = { {DPM_BT_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DEVICE_RESTRICTION] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_UUID_RESTRICTION] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DEVICES_WHITELIST] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DEVICES_BLACKLIST] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_UUIDS_WHITELIST] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_ALLOW_BLUETOOTH_OUTGOING_CALL] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_PAIRING_STATE] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DESKTOP_CONNECTIVITY_STATE] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DISCOVERABLE_STATE] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_LIMITED_DISCOVERABLE_STATE] = { {DPM_STATUS_ERROR, NULL} },
-	[DPM_POLICY_BLUETOOTH_DATA_TRANSFER_STATE] = { {DPM_STATUS_ERROR, NULL} },
+	[DPM_POLICY_ALLOW_BLUETOOTH] = { {DPM_BT_ERROR} },
+	[DPM_POLICY_BLUETOOTH_DEVICE_RESTRICTION] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_UUID_RESTRICTION] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_DEVICES_WHITELIST] = { {NULL} },
+	[DPM_POLICY_BLUETOOTH_DEVICES_BLACKLIST] = { {NULL} },
+	[DPM_POLICY_BLUETOOTH_UUIDS_WHITELIST] = { {NULL} },
+	[DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST] = { {NULL} },
+	[DPM_POLICY_ALLOW_BLUETOOTH_OUTGOING_CALL] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_PAIRING_STATE] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_DESKTOP_CONNECTIVITY_STATE] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_DISCOVERABLE_STATE] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_LIMITED_DISCOVERABLE_STATE] = { {DPM_STATUS_ERROR} },
+	[DPM_POLICY_BLUETOOTH_DATA_TRANSFER_STATE] = { {DPM_STATUS_ERROR} },
 };