summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIngo Huerner <ingo_huerner@mentor.com>2017-01-03 08:44:01 +0100
committerIngo Huerner <ingo_huerner@mentor.com>2017-01-03 08:44:01 +0100
commitb52af93c62400b6bf53225a5ddcbb7439d684143 (patch)
tree36410f02619f1e8cc419b4b1aa7c09c625a0bd39 /tools
parent3912e1c00f57782d927aab1efdbb921473ea034e (diff)
downloadpersistence-client-library-b52af93c62400b6bf53225a5ddcbb7439d684143.tar.gz
Added DLT log message for every API call
New compiler flags Splitted tests in key and file api tests, make multi thread tests work again
Diffstat (limited to 'tools')
-rw-r--r--tools/persistence_client_tool.c22
-rw-r--r--tools/persistence_db_viewer.c10
2 files changed, 16 insertions, 16 deletions
diff --git a/tools/persistence_client_tool.c b/tools/persistence_client_tool.c
index 93a0d22..fdd2562 100644
--- a/tools/persistence_client_tool.c
+++ b/tools/persistence_client_tool.c
@@ -76,7 +76,7 @@ void printHexDump(unsigned char* buffer, int formatNumPerRow)
-int readKey(char * resource_id, unsigned int user, unsigned int seat, unsigned int ldbid, unsigned int doHexdump, unsigned char* buffer, unsigned int size)
+int readKey(const char * resource_id, unsigned int user, unsigned int seat, unsigned int ldbid, unsigned int doHexdump, unsigned char* buffer, int size)
{
int rval = 0;
int numPerRow = 8;
@@ -103,7 +103,7 @@ int readKey(char * resource_id, unsigned int user, unsigned int seat, unsigned i
-int writeKey(char * resource_id, unsigned int user, unsigned int seat, unsigned int ldbid, unsigned char* buffer, unsigned int doHexdump)
+int writeKey(const char * resource_id, unsigned int user, unsigned int seat, unsigned int ldbid, unsigned char* buffer, unsigned int doHexdump)
{
int rval = 0, size = 0;
int numPerRow = 8;
@@ -112,7 +112,7 @@ int writeKey(char * resource_id, unsigned int user, unsigned int seat, unsigned
printf(" ResourceID: \"%s\" \n", resource_id);
printf(" Data : \"%s \"\n", buffer);
- size = pclKeyWriteData(ldbid, resource_id, user, seat, buffer, strlen((char*)buffer));
+ size = pclKeyWriteData(ldbid, resource_id, user, seat, buffer, (int)strlen((char*)buffer));
if(doHexdump == 1)
{
@@ -169,7 +169,7 @@ int writeDataToFile(char* fileName, unsigned char* buffer, int size)
rval = ftruncate(fd, size);
if(rval != -1)
{
- rval = write(fd, buffer, size);
+ rval = (int)write(fd, buffer, (size_t)size);
if(rval == -1)
{
@@ -202,14 +202,14 @@ unsigned char* readDataFromFile(char* fileName)
int fd = open(fileName, O_RDONLY);
if(fd != -1)
{
- int readSize = 0;
- writeBuffer = malloc(buffer.st_size );
+ ssize_t readSize = 0;
+ writeBuffer = malloc((size_t)buffer.st_size );
if(writeBuffer != NULL)
{
- readSize = read(fd, writeBuffer, buffer.st_size-1); //-1 - just read content, not line endings
+ readSize = read(fd, writeBuffer, (size_t)(buffer.st_size-1)); //-1 - just read content, not line endings
if(readSize < 0)
{
- printf("Failed to read data: %d\n", readSize);
+ printf("Failed to read data: %d\n", (int)readSize);
}
}
else
@@ -362,7 +362,7 @@ int main(int argc, char *argv[])
{
printf("Application name: %s\n", appName);
- unsigned int shutdownReg = PCL_SHUTDOWN_TYPE_FAST | PCL_SHUTDOWN_TYPE_NORMAL;
+ int shutdownReg = PCL_SHUTDOWN_TYPE_FAST | PCL_SHUTDOWN_TYPE_NORMAL;
(void)pclInitLibrary(appName, shutdownReg);
switch(opMode)
@@ -374,10 +374,10 @@ int main(int argc, char *argv[])
if(keysize > 0)
{
- buffer = malloc(keysize);
+ buffer = malloc((size_t)keysize);
if(buffer != NULL)
{
- memset(buffer, 0, keysize-1);
+ memset(buffer, 0, (size_t)(keysize-1));
readKey(resourceID, user_no, seat_no, ldbid, doHexdump, buffer, keysize);
if(fileName != NULL)
diff --git a/tools/persistence_db_viewer.c b/tools/persistence_db_viewer.c
index bff8007..15f20df 100644
--- a/tools/persistence_db_viewer.c
+++ b/tools/persistence_db_viewer.c
@@ -146,8 +146,8 @@ void printDBcontent(const char* appname, dbType type)
listSize = persComDbGetSizeKeysList(handle);
if(listSize > 0 && listSize < 2048)
{
- resourceList = (char*)malloc(listSize+4);
- memset(resourceList, 0, listSize+4-1);
+ resourceList = (char*)malloc((size_t)listSize+4);
+ memset(resourceList, 0, (size_t)listSize+4-1);
if(resourceList != NULL)
{
@@ -222,8 +222,8 @@ void printRCTcontent(const char* appname, int full)
listSize = persComRctGetSizeResourcesList(handle);
if(listSize > 0 && listSize < 2048)
{
- resourceList = (char*)malloc(listSize+4);
- memset(resourceList, 0, listSize+4-1);
+ resourceList = (char*)malloc((size_t)listSize+4);
+ memset(resourceList, 0, (size_t)listSize+4-1);
if(resourceList != NULL)
{
@@ -319,7 +319,7 @@ void printSingleApplicationDBs(const char* appname, const char* thePath, unsigne
if(databaseTypes != dbTypeNone)
{
- int i = 0;
+ int i = 0;
for(i=1; i<=5; i++)
{
if(databaseTypes & gDbMaskArray[i]) // check if db content needs to be printed