Change the name of NSAccept Function.

This commit included change the name of NSAccept API.
NSAccept to NSAcceptSubscription.

Change-Id: Ifa36fe0a38ea597007c336f2f9b94c215e847773
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9681
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/android/notification-service/src/main/jni/notificationProvider.c b/service/notification/android/notification-service/src/main/jni/notificationProvider.c
index 1567393..86fbe8d 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/notificationProvider.c
+++ b/service/notification/android/notification-service/src/main/jni/notificationProvider.c
@@ -107,7 +107,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NS
     return 0;\r
 }\r
 \r
-JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAccept(JNIEnv * env,\r
+JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAcceptSubscription(JNIEnv * env,\r
         jobject jObj, jobject jConsumer, jboolean jAccepted)\r
 {\r
     if (jAccepted)\r
@@ -171,7 +171,7 @@ void NSSubscribeRequestCb(NSConsumer *consumer)
 \r
     (*g_jvm)->DetachCurrentThread(g_jvm);\r
 \r
-    NSAccept(consumer, true);\r
+    NSAcceptSubscription(consumer, true);\r
 \r
     return;\r
 }\r

diff --git a/service/notification/android/notification-service/src/main/jni/notificationProvider.h b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
index 13787e1..93c0ca4 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/notificationProvider.h
+++ b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
@@ -42,7 +42,7 @@ extern "C"
     JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSProviderReadCheck(\r
             JNIEnv *, jobject, jobject);\r
 \r
-    JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAccept(JNIEnv *,\r
+    JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAcceptSubscription(JNIEnv *,\r
             jobject, jobject, jboolean);\r
 \r
     void NSSubscribeRequestCb(NSConsumer*);\r

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index aad18bf..c3329f6 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -64,7 +64,7 @@ void subscribeRequestCallback(NSConsumer *consumer)
 \r
     printf("NS_APP Consumer Device ID: %s\n", consumer->consumerId);\r
 \r
-    NSAccept(consumer, true);\r
+    NSAcceptSubscription(consumer, true);\r
 }\r
 \r
 void syncCallback(NSSyncInfo *sync)\r

diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h
index ebe6091..5a7211c 100644 (file)
--- a/service/notification/include/NSProviderInterface.h
+++ b/service/notification/include/NSProviderInterface.h
@@ -93,7 +93,7 @@ NSResult NSSendMessage(NSMessage *msg);
  * @param[in]  accepted  the result of acceptance; Allow or Deny\r
  * @return ::NS_OK or result code of NSResult\r
  */\r
-NSResult NSAccept(NSConsumer *consumer, bool accepted);\r
+NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted);\r
 \r
 /**\r
  * Get consumer list that is stored in the cache of notification service\r

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index e2c7061..a216072 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -186,7 +186,7 @@ NSResult NSProviderSendSyncInfo(uint64_t messageId, NSSyncType type)
     return NS_OK;\r
 }\r
 \r
-NSResult NSAccept(NSConsumer *consumer, bool accepted)\r
+NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted)\r
 {\r
     NS_LOG(DEBUG, "NSAccept - IN");\r
 \r