Added API to disable starting advertisement automatically

And Advertisement data can be set just before starting - Review Comment fixed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/315
(cherry picked from commit 1d853ecc267d2f76d0695aefffd02d6d5ed50a95)

Change-Id: Id0dddf2487750f045ef5ad8c26d277b762c14d89
Signed-off-by: Amit KS <amit.s12@samsung.com>

diff --git a/resource/csdk/connectivity/util/src/cautilinterface.c b/resource/csdk/connectivity/util/src/cautilinterface.c
index 756a9fa..806b5b1 100644 (file)
--- a/resource/csdk/connectivity/util/src/cautilinterface.c
+++ b/resource/csdk/connectivity/util/src/cautilinterface.c
@@ -219,11 +219,11 @@ CAResult_t CASetAdvertisementData(const char* data, int length)
 }
 void CASetAdvertisementDataGetter(CAAdvertisementDataGetterCB getter)
 {
-       return CAManagerLEServerSetAdvertisementDataGetter(getter);
+       CAManagerLEServerSetAdvertisementDataGetter(getter);
 }
 void CASetAutoAdvertisement(bool autoAdvertisement)
 {
-       return CAManagerLEServerSetAutoAdvertisement(autoAdvertisement);
+       CAManagerLEServerSetAutoAdvertisement(autoAdvertisement);
 }
 CAResult_t CASetScanResponseData(const char* data, int length)
 {

diff --git a/resource/src/CAManager.cpp b/resource/src/CAManager.cpp
index 4743939..7e56a97 100644 (file)
--- a/resource/src/CAManager.cpp
+++ b/resource/src/CAManager.cpp
@@ -170,11 +170,11 @@ OCStackResult CAManager::setAdvertisementData(const char* data, int length)
 }
 void CAManager::setAdvertisementDataGetter(CAAdvertisementDataGetterCB getter)
 {
-    return CASetAdvertisementDataGetter(getter);
+    CASetAdvertisementDataGetter(getter);
 }
 void CAManager::setAutoAdvertisement(bool autoAdvertisement)
 {
-    return CASetAutoAdvertisement(autoAdvertisement);
+    CASetAutoAdvertisement(autoAdvertisement);
 }
 OCStackResult CAManager::setScanResponseData(const char* data, int length)
 {