Removed global variables for notifications; use now pipe instead of eventfd for mainl...

[profile/ivi/persistence-client-library.git] / src / persistence_client_library_data_organization.c

diff --git a/src/persistence_client_library_data_organization.c b/src/persistence_client_library_data_organization.c
index 24bf993..83ecaec 100644 (file)
--- a/src/persistence_client_library_data_organization.c
+++ b/src/persistence_client_library_data_organization.c
@@ -22,17 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/// configurable default database name
-const char* gConfigDefault = "/configurable-default-data.itz";
-/// default database name
-const char* gDefault = "/default-data.itz";
-/// write through database name
-const char* gWt             = "/wt.itz";
-/// cached database name
-const char* gCached        = "/cached.itz";
-
-const char* gDefDataFolder = "/defaultData/";
-
 
 // define PERS_ORG_ROOT_PATH comes form persistence common object
 
@@ -81,23 +70,13 @@ const char* gSharedPublicCachePathKey = CACHEPREFIX "%s/shared_public%s";
 const char* gSharedPublicWtPathKey    = WTPREFIX "%s/shared_public%s";
 
 /// path prefix for local cached files: /Data/mnt_c/<appId>/<user>/<seat>/<resource>
-const char* gLocalCacheFilePath        = CACHEPREFIX "%s/user/%d/seat/%d/%s";
+const char* gLocalCacheFilePath        = CACHEPREFIX "%s"PERS_ORG_USER_FOLDER_NAME_"%d"PERS_ORG_SEAT_FOLDER_NAME_"%d/%s";
 
 
 const char* gChangeSignal = "PersistenceResChange";
 const char* gDeleteSignal = "PersistenceResDelete";
 const char* gCreateSignal = "PersistenceResCreate";
 
-
-char gNotifykey[DbKeyMaxLen] = { [0 ... DbKeyMaxLen-1] = 0};
-
-unsigned int gNotifyLdbid  = 0;
-unsigned int gNotifyUserNo = 0;
-unsigned int gNotifySeatNo = 0;
-pclNotifyStatus_e       gNotifyReason = 0;
-PersNotifyRegPolicy_e   gNotifyPolicy = 0;
-
-
 int gTimeoutMs = 5000;
 
 int gDbusPendingRvalue = 0;
@@ -119,3 +98,13 @@ DltContext gPclDLTContext;
 int(* gChangeNotifyCallback)(pclNotification_s * notifyStruct);
 
 
+const char gCharLookup[] =
+{
+   0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,  // from 0x0 (NULL)  to 0x1F (unit seperator)
+   0,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  // from 020 (space) to 0x2F (?)
+   1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  // from 040 (@)     to 0x5F (_)
+   1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1,1,  1,1,1,1,1,1,1     // from 060 (')     to 0x7E (~)
+
+};
+
+