projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-01-31)
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
security
/
provisioning
/
src
/
provisioningdatabasemanager.c
diff --git
a/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
b/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
index
359b510
..
0bf88e0
100644
(file)
--- a/
resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
+++ b/
resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
@@
-52,9
+52,10
@@
* Macro to verify sqlite success.
* eg: VERIFY_NON_NULL(TAG, ptrData, ERROR,OC_STACK_ERROR);
*/
* Macro to verify sqlite success.
* eg: VERIFY_NON_NULL(TAG, ptrData, ERROR,OC_STACK_ERROR);
*/
-#define PDM_VERIFY_SQLITE_OK(tag, arg, logLevel, retValue) do{ if (SQLITE_OK != (arg)) \
+#define PDM_VERIFY_SQLITE_OK(tag, arg,
stmt,
logLevel, retValue) do{ if (SQLITE_OK != (arg)) \
{ OIC_LOG_V((logLevel), tag, "Error in " #arg ", Error Message: %s", \
{ OIC_LOG_V((logLevel), tag, "Error in " #arg ", Error Message: %s", \
- sqlite3_errmsg(g_db)); return retValue; }}while(0)
+ sqlite3_errmsg(g_db)); sqlite3_finalize(stmt); return retValue; }}while(0)
+
#define PDM_SQLITE_TRANSACTION_BEGIN "BEGIN TRANSACTION;"
#define PDM_SQLITE_TRANSACTION_COMMIT "COMMIT;"
#define PDM_SQLITE_TRANSACTION_BEGIN "BEGIN TRANSACTION;"
#define PDM_SQLITE_TRANSACTION_COMMIT "COMMIT;"
@@
-98,14
+99,14
@@
static OCStackResult createDB(const char* path)
int result = 0;
result = sqlite3_open_v2(path, &g_db, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, NULL);
int result = 0;
result = sqlite3_open_v2(path, &g_db, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, result, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, result,
NULL,
ERROR, OC_STACK_ERROR);
result = sqlite3_exec(g_db, PDM_CREATE_T_DEVICE_LIST, NULL, NULL, NULL);
result = sqlite3_exec(g_db, PDM_CREATE_T_DEVICE_LIST, NULL, NULL, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, result, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, result,
NULL,
ERROR, OC_STACK_ERROR);
OIC_LOG(INFO, TAG, "Created T_DEVICE_LIST");
result = sqlite3_exec(g_db, PDM_CREATE_T_DEVICE_LINK, NULL, NULL, NULL);
OIC_LOG(INFO, TAG, "Created T_DEVICE_LIST");
result = sqlite3_exec(g_db, PDM_CREATE_T_DEVICE_LINK, NULL, NULL, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, result, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, result,
NULL,
ERROR, OC_STACK_ERROR);
OIC_LOG(INFO, TAG, "Created T_DEVICE_LINK_STATE");
gInit = true;
OIC_LOG(INFO, TAG, "Created T_DEVICE_LINK_STATE");
gInit = true;
@@
-123,7
+124,7
@@
static OCStackResult begin()
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_BEGIN, NULL, NULL, NULL);
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_BEGIN, NULL, NULL, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
NULL,
ERROR, OC_STACK_ERROR);
return OC_STACK_OK;
}
return OC_STACK_OK;
}
@@
-134,7
+135,7
@@
static OCStackResult commit()
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_COMMIT, NULL, NULL, NULL);
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_COMMIT, NULL, NULL, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
NULL,
ERROR, OC_STACK_ERROR);
return OC_STACK_OK;
}
return OC_STACK_OK;
}
@@
-145,7
+146,7
@@
static OCStackResult rollback()
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_ROLLBACK, NULL, NULL, NULL);
{
int res = 0;
res = sqlite3_exec(g_db, PDM_SQLITE_TRANSACTION_ROLLBACK, NULL, NULL, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
NULL,
ERROR, OC_STACK_ERROR);
return OC_STACK_OK;
}
return OC_STACK_OK;
}
@@
-224,13
+225,13
@@
OCStackResult PDMAddDevice(const OicUuid_t *UUID)
int res =0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_INSERT_T_DEVICE_LIST,
strlen(PDM_SQLITE_INSERT_T_DEVICE_LIST) + 1, &stmt, NULL);
int res =0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_INSERT_T_DEVICE_LIST,
strlen(PDM_SQLITE_INSERT_T_DEVICE_LIST) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_SECOND, UUID, UUID_LENGTH, SQLITE_STATIC);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_SECOND, UUID, UUID_LENGTH, SQLITE_STATIC);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, PDM_DEVICE_INIT);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, PDM_DEVICE_INIT);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_step(stmt);
if (SQLITE_DONE != res)
res = sqlite3_step(stmt);
if (SQLITE_DONE != res)
@@
-262,10
+263,10
@@
static OCStackResult getIdForUUID(const OicUuid_t *UUID , int *id)
sqlite3_stmt *stmt = 0;
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_ID, strlen(PDM_SQLITE_GET_ID) + 1, &stmt, NULL);
sqlite3_stmt *stmt = 0;
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_ID, strlen(PDM_SQLITE_GET_ID) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, UUID, UUID_LENGTH, SQLITE_STATIC);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, UUID, UUID_LENGTH, SQLITE_STATIC);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
OIC_LOG(DEBUG, TAG, "Binding Done");
while (SQLITE_ROW == sqlite3_step(stmt))
OIC_LOG(DEBUG, TAG, "Binding Done");
while (SQLITE_ROW == sqlite3_step(stmt))
@@
-297,10
+298,10
@@
OCStackResult PDMIsDuplicateDevice(const OicUuid_t* UUID, bool *result)
sqlite3_stmt *stmt = 0;
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_ID, strlen(PDM_SQLITE_GET_ID) + 1, &stmt, NULL);
sqlite3_stmt *stmt = 0;
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_ID, strlen(PDM_SQLITE_GET_ID) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, UUID, UUID_LENGTH, SQLITE_STATIC);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, UUID, UUID_LENGTH, SQLITE_STATIC);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
OIC_LOG(DEBUG, TAG, "Binding Done");
bool retValue = false;
OIC_LOG(DEBUG, TAG, "Binding Done");
bool retValue = false;
@@
-328,16
+329,16
@@
static OCStackResult addlink(int id1, int id2)
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_INSERT_LINK_DATA,
strlen(PDM_SQLITE_INSERT_LINK_DATA) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_INSERT_LINK_DATA,
strlen(PDM_SQLITE_INSERT_LINK_DATA) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, PDM_DEVICE_ACTIVE);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, PDM_DEVICE_ACTIVE);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (sqlite3_step(stmt) != SQLITE_DONE)
{
if (sqlite3_step(stmt) != SQLITE_DONE)
{
@@
-413,13
+414,13
@@
static OCStackResult removeLink(int id1, int id2)
int res = 0;
sqlite3_stmt *stmt = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_LINK, strlen(PDM_SQLITE_DELETE_LINK) + 1, &stmt, NULL);
int res = 0;
sqlite3_stmt *stmt = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_LINK, strlen(PDM_SQLITE_DELETE_LINK) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (SQLITE_DONE != sqlite3_step(stmt))
{
if (SQLITE_DONE != sqlite3_step(stmt))
{
@@
-469,10
+470,10
@@
static OCStackResult removeFromDeviceList(int id)
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_DEVICE,
strlen(PDM_SQLITE_DELETE_DEVICE) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_DEVICE,
strlen(PDM_SQLITE_DELETE_DEVICE) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (sqlite3_step(stmt) != SQLITE_DONE)
{
if (sqlite3_step(stmt) != SQLITE_DONE)
{
@@
-521,16
+522,16
@@
static OCStackResult updateLinkState(int id1, int id2, int state)
int res = 0 ;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_LINK,
strlen(PDM_SQLITE_UPDATE_LINK) + 1, &stmt, NULL);
int res = 0 ;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_LINK,
strlen(PDM_SQLITE_UPDATE_LINK) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id1);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id1);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, id2);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_THIRD, id2);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (SQLITE_DONE != sqlite3_step(stmt))
{
if (SQLITE_DONE != sqlite3_step(stmt))
{
@@
-586,7
+587,7
@@
OCStackResult PDMGetOwnedDevices(OCUuidList_t **uuidList, size_t *numOfDevices)
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_LIST_ALL_UUID,
strlen(PDM_SQLITE_LIST_ALL_UUID) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_LIST_ALL_UUID,
strlen(PDM_SQLITE_LIST_ALL_UUID) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
@@
-618,10
+619,10
@@
static OCStackResult getUUIDforId(int id, OicUuid_t *uid, bool *result)
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_UUID,
strlen(PDM_SQLITE_GET_UUID) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_UUID,
strlen(PDM_SQLITE_GET_UUID) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
while (SQLITE_ROW == sqlite3_step(stmt))
{
while (SQLITE_ROW == sqlite3_step(stmt))
{
@@
-689,13
+690,13
@@
OCStackResult PDMGetLinkedDevices(const OicUuid_t *UUID, OCUuidList_t **UUIDLIST
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_LINKED_DEVICES,
strlen(PDM_SQLITE_GET_LINKED_DEVICES) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_LINKED_DEVICES,
strlen(PDM_SQLITE_GET_LINKED_DEVICES) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
@@
-745,10
+746,10
@@
OCStackResult PDMGetToBeUnlinkedDevices(OCPairList_t **staleDevList, size_t *num
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_STALE_INFO,
strlen(PDM_SQLITE_GET_STALE_INFO) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_STALE_INFO,
strlen(PDM_SQLITE_GET_STALE_INFO) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, PDM_DEVICE_STALE);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, PDM_DEVICE_STALE);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
size_t counter = 0;
while (SQLITE_ROW == sqlite3_step(stmt))
@@
-785,7
+786,7
@@
OCStackResult PDMClose()
CHECK_PDM_INIT(TAG);
int res = 0;
res = sqlite3_close(g_db);
CHECK_PDM_INIT(TAG);
int res = 0;
res = sqlite3_close(g_db);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
NULL,
ERROR, OC_STACK_ERROR);
OIC_LOG_V(DEBUG, TAG, "OUT %s", __func__);
return OC_STACK_OK;
}
OIC_LOG_V(DEBUG, TAG, "OUT %s", __func__);
return OC_STACK_OK;
}
@@
-878,13
+879,13
@@
OCStackResult PDMIsLinkExists(const OicUuid_t* uuidOfDevice1, const OicUuid_t* u
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_DEVICE_LINKS,
strlen(PDM_SQLITE_GET_DEVICE_LINKS) + 1, &stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_DEVICE_LINKS,
strlen(PDM_SQLITE_GET_DEVICE_LINKS) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id1);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id2);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
bool ret = false;
while(SQLITE_ROW == sqlite3_step(stmt))
bool ret = false;
while(SQLITE_ROW == sqlite3_step(stmt))
@@
-906,13
+907,13
@@
static OCStackResult updateDeviceState(const OicUuid_t *uuid, PdmDeviceState_t s
int res = 0 ;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_DEVICE,
strlen(PDM_SQLITE_UPDATE_DEVICE) + 1, &stmt, NULL);
int res = 0 ;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_DEVICE,
strlen(PDM_SQLITE_UPDATE_DEVICE) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_SECOND, uuid, UUID_LENGTH, SQLITE_STATIC);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_SECOND, uuid, UUID_LENGTH, SQLITE_STATIC);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (SQLITE_DONE != sqlite3_step(stmt))
{
if (SQLITE_DONE != sqlite3_step(stmt))
{
@@
-942,13
+943,13
@@
static OCStackResult updateLinkForStaleDevice(const OicUuid_t *devUuid)
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_LINK_STALE_FOR_STALE_DEVICE,
strlen(PDM_SQLITE_UPDATE_LINK_STALE_FOR_STALE_DEVICE) + 1,
&stmt, NULL);
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_UPDATE_LINK_STALE_FOR_STALE_DEVICE,
strlen(PDM_SQLITE_UPDATE_LINK_STALE_FOR_STALE_DEVICE) + 1,
&stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_SECOND, id);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (SQLITE_DONE != sqlite3_step(stmt))
{
if (SQLITE_DONE != sqlite3_step(stmt))
{
@@
-1012,10
+1013,10
@@
OCStackResult PDMGetDeviceState(const OicUuid_t *uuid, PdmDeviceState_t* result)
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_DEVICE_STATUS, strlen(PDM_SQLITE_GET_DEVICE_STATUS) + 1,
&stmt, NULL);
int res = 0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_GET_DEVICE_STATUS, strlen(PDM_SQLITE_GET_DEVICE_STATUS) + 1,
&stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, uuid, UUID_LENGTH, SQLITE_STATIC);
res = sqlite3_bind_blob(stmt, PDM_BIND_INDEX_FIRST, uuid, UUID_LENGTH, SQLITE_STATIC);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
*result = PDM_DEVICE_UNKNOWN;
while(SQLITE_ROW == sqlite3_step(stmt))
*result = PDM_DEVICE_UNKNOWN;
while(SQLITE_ROW == sqlite3_step(stmt))
@@
-1044,10
+1045,10
@@
OCStackResult PDMDeleteDeviceWithState(const PdmDeviceState_t state)
int res =0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_DEVICE_WITH_STATE,
strlen(PDM_SQLITE_DELETE_DEVICE_WITH_STATE) + 1, &stmt, NULL);
int res =0;
res = sqlite3_prepare_v2(g_db, PDM_SQLITE_DELETE_DEVICE_WITH_STATE,
strlen(PDM_SQLITE_DELETE_DEVICE_WITH_STATE) + 1, &stmt, NULL);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
res = sqlite3_bind_int(stmt, PDM_BIND_INDEX_FIRST, state);
- PDM_VERIFY_SQLITE_OK(TAG, res, ERROR, OC_STACK_ERROR);
+ PDM_VERIFY_SQLITE_OK(TAG, res,
stmt,
ERROR, OC_STACK_ERROR);
if (SQLITE_DONE != sqlite3_step(stmt))
{
if (SQLITE_DONE != sqlite3_step(stmt))
{