fix master because cherry-picked change broke build

Change-Id: Idded4c0bedd28ce6d2064737f1ec1b7ddc630599
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1243
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c
index 679151b..8e6e7c0 100644 (file)
--- a/resource/csdk/security/src/aclresource.c
+++ b/resource/csdk/security/src/aclresource.c
@@ -340,7 +340,8 @@ static OCEntityHandlerResult HandleACLPostRequest (const OCEntityHandlerRequest
  * will handle REST request (GET/PUT/POST/DEL) for them.
  */
 OCEntityHandlerResult ACLEntityHandler (OCEntityHandlerFlag flag,
-                                        OCEntityHandlerRequest * ehRequest)
+                                        OCEntityHandlerRequest * ehRequest,
+                                        void* callbackParameter)
 {
     OCEntityHandlerResult ehRet = OC_EH_ERROR;
 
@@ -384,6 +385,7 @@ OCStackResult CreateACLResource()
                            OIC_MI_DEF,
                            OIC_RSRC_ACL_URI,
                            ACLEntityHandler,
+                           NULL,
                            OC_OBSERVABLE);
 
     if (OC_STACK_OK != ret)

diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c
index 53b286c..56c0927 100755 (executable)
--- a/resource/csdk/security/src/credresource.c
+++ b/resource/csdk/security/src/credresource.c
@@ -447,7 +447,8 @@ static OCEntityHandlerResult HandlePostRequest(const OCEntityHandlerRequest * eh
  * to handle REST request (PUT/POST/DEL)
  */
 OCEntityHandlerResult CredEntityHandler (OCEntityHandlerFlag flag,
-                                        OCEntityHandlerRequest * ehRequest)
+                                        OCEntityHandlerRequest * ehRequest,
+                                        void* callbackParameter)
 {
     OCEntityHandlerResult ret = OC_EH_ERROR;
 
@@ -492,6 +493,7 @@ OCStackResult CreateCredResource()
                            OIC_MI_DEF,
                            OIC_RSRC_CRED_URI,
                            CredEntityHandler,
+                           NULL,
                            OC_RES_PROP_NONE);
 
     if (OC_STACK_OK != ret)

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index eb6df1b..aa7380f 100755 (executable)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -469,7 +469,8 @@ exit:
  * This internal method is the entity handler for DOXM resources.
  */
 OCEntityHandlerResult DoxmEntityHandler (OCEntityHandlerFlag flag,
-                                        OCEntityHandlerRequest * ehRequest)
+                                        OCEntityHandlerRequest * ehRequest,
+                                        void* callbackParam)
 {
     OCEntityHandlerResult ehRet = OC_EH_ERROR;
 
@@ -514,6 +515,7 @@ OCStackResult CreateDoxmResource()
                            OIC_MI_DEF,
                            OIC_RSRC_DOXM_URI,
                            DoxmEntityHandler,
+                           NULL,
                            OC_OBSERVABLE);
 
     if (OC_STACK_OK != ret)

diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c
index 19702a7..b0b0a58 100644 (file)
--- a/resource/csdk/security/src/pstatresource.c
+++ b/resource/csdk/security/src/pstatresource.c
@@ -287,7 +287,8 @@ static OCEntityHandlerResult HandlePstatPutRequest(const OCEntityHandlerRequest
  * This internal method is the entity handler for pstat resources.
  */
 OCEntityHandlerResult PstatEntityHandler(OCEntityHandlerFlag flag,
-        OCEntityHandlerRequest * ehRequest)
+        OCEntityHandlerRequest * ehRequest,
+        void *callbackParam)
 {
     OCEntityHandlerResult ehRet = OC_EH_ERROR;
     // This method will handle REST request (GET/POST) for /oic/sec/pstat
@@ -323,6 +324,7 @@ OCStackResult CreatePstatResource()
                            OIC_MI_DEF,
                            OIC_RSRC_PSTAT_URI,
                            PstatEntityHandler,
+                           NULL,
                            OC_RES_PROP_NONE);
 
     if (ret != OC_STACK_OK)

diff --git a/resource/csdk/stack/test/stacktests.cpp b/resource/csdk/stack/test/stacktests.cpp
index 4ae33cf..eb35e6f 100644 (file)
--- a/resource/csdk/stack/test/stacktests.cpp
+++ b/resource/csdk/stack/test/stacktests.cpp
@@ -375,6 +375,7 @@ TEST(StackResource, CreateResourceBadUri)
                                             "core.rw",
                                             NULL, //"/a/led",
                                             0,
+                                            0,
                                             OC_DISCOVERABLE|OC_OBSERVABLE));
 
     EXPECT_EQ(OC_STACK_INVALID_URI, OCCreateResource(&handle,
@@ -382,6 +383,7 @@ TEST(StackResource, CreateResourceBadUri)
                                             "core.rw",
                                             "", //"/a/led",
                                             0,
+                                            0,
                                             OC_DISCOVERABLE|OC_OBSERVABLE));
 
     EXPECT_EQ(OC_STACK_INVALID_URI, OCCreateResource(&handle,
@@ -389,6 +391,7 @@ TEST(StackResource, CreateResourceBadUri)
                                             "core.rw",
                                             uri65, //"/a/led",
                                             0,
+                                            0,
                                             OC_DISCOVERABLE|OC_OBSERVABLE));
 
     EXPECT_EQ(OC_STACK_OK, OCStop());