From: jaesick.shin <jaesick.shin@samsung.com>
Date: Mon, 25 Jul 2016 08:20:55 +0000 (+0900)
Subject: Change the name of NSAccept Function.
X-Git-Tag: 1.2.0+RC1~52^2~113
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e5442fb5dbfaedd5d0290842178f9c7978c3c09;p=platform%2Fupstream%2Fiotivity.git

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
--- 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;
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAccept(JNIEnv * env,
+JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAcceptSubscription(JNIEnv * env,
         jobject jObj, jobject jConsumer, jboolean jAccepted)
 {
     if (jAccepted)
@@ -171,7 +171,7 @@ void NSSubscribeRequestCb(NSConsumer *consumer)
 
     (*g_jvm)->DetachCurrentThread(g_jvm);
 
-    NSAccept(consumer, true);
+    NSAcceptSubscription(consumer, true);
 
     return;
 }
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
--- 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(
             JNIEnv *, jobject, jobject);
 
-    JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAccept(JNIEnv *,
+    JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NSAcceptSubscription(JNIEnv *,
             jobject, jobject, jboolean);
 
     void NSSubscribeRequestCb(NSConsumer*);
diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index aad18bf..c3329f6 100644
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -64,7 +64,7 @@ void subscribeRequestCallback(NSConsumer *consumer)
 
     printf("NS_APP Consumer Device ID: %s\n", consumer->consumerId);
 
-    NSAccept(consumer, true);
+    NSAcceptSubscription(consumer, true);
 }
 
 void syncCallback(NSSyncInfo *sync)
diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h
index ebe6091..5a7211c 100644
--- 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
  * @return ::NS_OK or result code of NSResult
  */
-NSResult NSAccept(NSConsumer *consumer, bool accepted);
+NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted);
 
 /**
  * Get consumer list that is stored in the cache of notification service
diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index e2c7061..a216072 100644
--- 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;
 }
 
-NSResult NSAccept(NSConsumer *consumer, bool accepted)
+NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted)
 {
     NS_LOG(DEBUG, "NSAccept - IN");