Update snapshot(2018-01-10)

[platform/upstream/iotivity.git] / resource / csdk / security / provisioning / src / secureresourceprovider.c

diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c
index a5e1382..9fca96e 100644 (file)
--- a/resource/csdk/security/provisioning/src/secureresourceprovider.c
+++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c
@@ -155,6 +155,7 @@ struct RemoveData {
     OCProvisionDev_t* linkedDevList;        /**< A list of devices which have invalid credential.**/
     OCProvisionResult_t* removeRes;         /**< Result array.**/
     OCProvisionResultCB resultCallback;     /**< Pointer to result callback.**/
+    OCClientContextDeleter deleteCallback;  /**< Pointer to delete callback.**/
     size_t numOfResults;                    /**< Number of results in result array.**/
     size_t sizeOfResArray;
     bool hasError;
@@ -1697,7 +1698,7 @@ static OCStackApplicationResult SRPSyncDeviceCredCB(void *delDevCtx, OCDoHandle
 
     RemoveData_t* removeData = (RemoveData_t*)delDevCtx;
     OCProvisionDev_t * pTargetDev = PMCloneOCProvisionDev(removeData->revokeTargetDev);
-    OCProvisionResultCB resultCallback = removeData->resultCallback;
+    OCClientContextDeleter deleteCallback = removeData->deleteCallback;
     if (clientResponse)
     {
         OicUuid_t revDevUuid = {.id={0}};
@@ -1752,7 +1753,7 @@ static OCStackApplicationResult SRPSyncDeviceCredCB(void *delDevCtx, OCDoHandle
         OIC_LOG(ERROR, TAG, "SRPSyncDevice received Null clientResponse");
     }
 
-    SRPResetDevice(pTargetDev, resultCallback);
+    SRPResetDevice(pTargetDev, deleteCallback);
 
     return OC_STACK_DELETE_TRANSACTION;
 }
@@ -2355,7 +2356,7 @@ error:
  *         OC_STACK_CONTINUE means operation is success but no request is need to be initiated.
  */
 OCStackResult SRPResetDevice(const OCProvisionDev_t* pTargetDev,
-        OCProvisionResultCB resultCallback)
+        OCClientContextDeleter deleteCallback)
 {
     OIC_LOG(INFO, TAG, "IN SRPResetDevice");
     if (!pTargetDev)
@@ -2363,7 +2364,7 @@ OCStackResult SRPResetDevice(const OCProvisionDev_t* pTargetDev,
         OIC_LOG(INFO, TAG, "SRPResetDevice : NULL parameters");
         return OC_STACK_INVALID_PARAM;
     }
-    if (!resultCallback)
+    if (!deleteCallback)
     {
         OIC_LOG(INFO, TAG, "SRPResetDevice : NULL Callback");
         return OC_STACK_INVALID_CALLBACK;
@@ -2438,7 +2439,7 @@ OCStackResult SRPResetDevice(const OCProvisionDev_t* pTargetDev,
     }
     cbData.cb = &SRPResetDeviceCB;
     cbData.context = (void *) targetDev;
-    cbData.cd = NULL;
+    cbData.cd = deleteCallback;
     OIC_LOG(DEBUG, TAG, "Sending PSTAT info to resource server");
     res = OCDoResource(&handle, method, query,
             &targetDev->endpoint, (OCPayload *)secPayload,