From e41e86de0cd942589328c26f8f3ce5e6eebc6a84 Mon Sep 17 00:00:00 2001 From: Jihun Ha Date: Mon, 6 Jul 2015 14:10:38 +0900 Subject: [PATCH] Fix some string used for group management feature 1. Instead of "oc", "oic" is used for decoding a JSON request in group management. 2. There are a difference of group interface string in octypes.h and ocapi.h. "oic.mi.def" will be used in the both. Change-Id: I79763315926dc6e6bba3444db5ed94a68db65eb2 Signed-off-by: Jihun Ha Reviewed-on: https://gerrit.iotivity.org/gerrit/1527 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka Reviewed-by: Junghyun Oh Reviewed-by: Patrick Lankswert --- resource/csdk/stack/src/oicgroup.c | 2 +- resource/include/OCApi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 resource/csdk/stack/src/oicgroup.c mode change 100644 => 100755 resource/include/OCApi.h diff --git a/resource/csdk/stack/src/oicgroup.c b/resource/csdk/stack/src/oicgroup.c old mode 100644 new mode 100755 index b8ba4b8..2e380fa --- a/resource/csdk/stack/src/oicgroup.c +++ b/resource/csdk/stack/src/oicgroup.c @@ -46,7 +46,7 @@ #define ACTIONSET "ActionSet" #define DELETE_ACTIONSET "DelActionSet" -#define OIC_ACTION_PREFIX "{\"oc\":[{\"rep\":{" +#define OIC_ACTION_PREFIX "{\"oic\":[{\"rep\":{" #define VARIFY_POINTER_NULL(pointer, result, toExit) \ if(pointer == NULL) \ {\ diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h old mode 100644 new mode 100755 index a6e9f35..2032ca7 --- a/resource/include/OCApi.h +++ b/resource/include/OCApi.h @@ -210,7 +210,7 @@ namespace OC const std::string BATCH_INTERFACE = "oic.if.b"; // Used in GET, PUT, POST methods on links to other remote resources of a group. - const std::string GROUP_INTERFACE = "oc.mi.grp"; + const std::string GROUP_INTERFACE = "oic.mi.grp"; typedef std::function)> FindCallback; -- 2.7.4