Removed compiler warnings; added check for shared data if application is allowed to modify

6 files changed, 24 insertions, 7 deletions

diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c
index f0f02fb..174c081 100644
--- a/src/persistence_client_library.c
+++ b/src/persistence_client_library.c
@@ -64,6 +64,7 @@ static int gAppCheckFlag = -1;
 
 int customAsyncInitClbk(int errcode)
 {
+   (void)errcode;
   printf("Dummy async init Callback\n");
 
   return 1;
diff --git a/src/persistence_client_library_data_organization.h b/src/persistence_client_library_data_organization.h
index df61287..85c0d4d 100644
--- a/src/persistence_client_library_data_organization.h
+++ b/src/persistence_client_library_data_organization.h
@@ -47,7 +47,7 @@ typedef struct _PersistenceDbContext_s
 	/// lofical database id
    unsigned int ldbid;
    /// user number
-   unsigned int user_no;
+   int user_no;
    /// seat number
    unsigned int seat_no;
 } PersistenceDbContext_s;
diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
index 4b487f3..d87e606 100644
--- a/src/persistence_client_library_dbus_service.c
+++ b/src/persistence_client_library_dbus_service.c
@@ -352,7 +352,7 @@ static dbus_bool_t addWatch(DBusWatch *watch, void *data)
    dbus_bool_t result = FALSE;
    (void)data;
 
-   if (ARRAY_SIZE(gPollInfo.fds)>gPollInfo.nfds)
+   if (ARRAY_SIZE(gPollInfo.fds) > (unsigned int)(gPollInfo.nfds))
    {
       int flags = dbus_watch_get_flags(watch);
 
@@ -418,7 +418,7 @@ static dbus_bool_t addTimeout(DBusTimeout *timeout, void *data)
    (void)data;
    dbus_bool_t ret = FALSE;
 
-   if (ARRAY_SIZE(gPollInfo.fds)>gPollInfo.nfds)
+   if(ARRAY_SIZE(gPollInfo.fds) > (unsigned int)(gPollInfo.nfds))
    {
       const int interval = dbus_timeout_get_interval(timeout);
       if ((0<interval)&&(TRUE==dbus_timeout_get_enabled(timeout)))
@@ -517,6 +517,10 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtable2,
    DBusConnection* conn = (DBusConnection*)userData;
    dbus_error_init(&err);
 
+#if USE_PASINTERFACE != 1
+   (void)vtable;
+#endif
+
    if (dbus_error_is_set(&err))
    {
       DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("mainLoop - Con Err:"), DLT_STRING(err.message) );
diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c
index a93fa8d..49bb5b3 100644
--- a/src/persistence_client_library_file.c
+++ b/src/persistence_client_library_file.c
@@ -173,6 +173,10 @@ void* pclFileMapData(void* addr, long size, long offset, int fd)
    void* ptr = 0;
 
 #if USE_FILECACHE
+   (void)addr;
+   (void)size;
+   (void)offset;
+   (void)fd;
    DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileMapData not supported when using file cache"));
 #else
    //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileMapData fd: "), DLT_INT(fd));
@@ -409,7 +413,7 @@ int pclFileOpen(unsigned int ldbid, const char* resource_id, unsigned int user_n
       //
       if(dbContext.configKey.type == PersistenceResourceType_file)
       {
-         if(user_no == PCL_USER_DEFAULTDATA)
+         if(user_no == (unsigned int)PCL_USER_DEFAULTDATA)
          {
             handle = pclFileOpenDefaultData(&dbContext, resource_id);
             set_file_user_id(handle, PCL_USER_DEFAULTDATA);
diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c
index 3834a71..2a67839 100644
--- a/src/persistence_client_library_key.c
+++ b/src/persistence_client_library_key.c
@@ -495,9 +495,17 @@ int pclKeyWriteData(unsigned int ldbid, const char* resource_id, unsigned int us
                   if(dbContext.configKey.permission != PersistencePermission_ReadOnly)  // don't write to a read only resource
                   {
                      // store data
-                     if(   dbContext.configKey.storage < PersistenceStorage_LastEntry)   // check if store policy is valid
+                     if(dbContext.configKey.storage < PersistenceStorage_LastEntry)   // check if store policy is valid
                      {
-                        data_size = persistence_set_data(dbPath, dbKey, resource_id, &dbContext, buffer, buffer_size);
+                        if(   (dbContext.configKey.storage == PersistenceStorage_shared)
+                           && (0 != strncmp(dbContext.configKey.reponsible, gAppId, MaxAppNameLen) ) )
+                        {
+                           data_size = EPERS_NOT_RESP_APP;
+                        }
+                        else
+                        {
+                           data_size = persistence_set_data(dbPath, dbKey, resource_id, &dbContext, buffer, buffer_size);
+                        }
                      }
                      else
                      {
diff --git a/src/rbtree.c b/src/rbtree.c
index 7107979..d3496ed 100644
--- a/src/rbtree.c
+++ b/src/rbtree.c
@@ -255,7 +255,7 @@ int jsw_rbinsert ( jsw_rbtree_t *tree, void *data )
 	  }
 	  else {
 
-		jsw_rbnode_t head = {0}; /* False tree root */
+		jsw_rbnode_t head = {0, NULL, {NULL, NULL} }; /* False tree root */
 		jsw_rbnode_t *g, *t;     /* Grandparent & parent */
 		jsw_rbnode_t *p, *q;     /* Iterator & parent */
 		int dir = 0, last = 0;