Removed test case; adjusted notify functions

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

diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c
index 0616ace..4986bef 100644 (file)
--- a/src/persistence_client_library_key.c
+++ b/src/persistence_client_library_key.c
@@ -240,36 +240,25 @@ int pclKeyHandleReadData(int key_handle, unsigned char* buffer, int buffer_size)
 
 int pclKeyHandleRegisterNotifyOnChange(int key_handle, pclChangeNotifyCallback_t callback)
 {
-   int rval = EPERS_NOT_INITIALIZED;
-
-   //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyHandleRegisterNotifyOnChange: "),
-   //             DLT_INT(gKeyHandleArray[key_handle].info.context.ldbid), DLT_STRING(gKeyHandleArray[key_handle].resourceID) );
+   DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyHandleRegisterNotifyOnChange: "),
+               DLT_INT(gKeyHandleArray[key_handle].info.context.ldbid), DLT_STRING(gKeyHandleArray[key_handle].resourceID) );
 
-   if(gPclInitialized >= PCLinitialized)
-   {
-      if(key_handle < MaxPersHandle)
-      {
-         rval = regNotifyOnChange(gKeyHandleArray[key_handle].info.context.ldbid,
-                                  gKeyHandleArray[key_handle].resourceID,
-                                  gKeyHandleArray[key_handle].info.context.user_no,
-                                  gKeyHandleArray[key_handle].info.context.seat_no,
-                                  callback,
-                                  Notify_register);
-      }
-      else
-      {
-         rval = EPERS_MAXHANDLE;
-      }
-   }
-   return rval;
+   return handleRegNotifyOnChange(key_handle, callback, Notify_register);
 }
 
 int pclKeyHandleUnRegisterNotifyOnChange(int key_handle, pclChangeNotifyCallback_t callback)
 {
-   int rval = EPERS_NOT_INITIALIZED;
+   DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyHandleUnRegisterNotifyOnChange: "),
+            DLT_INT(gKeyHandleArray[key_handle].info.context.ldbid), DLT_STRING(gKeyHandleArray[key_handle].resourceID) );
+
+   return handleRegNotifyOnChange(key_handle, callback, Notify_unregister);
+}
 
-   //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyHandleRegisterNotifyOnChange: "),
-   //             DLT_INT(gKeyHandleArray[key_handle].info.context.ldbid), DLT_STRING(gKeyHandleArray[key_handle].resourceID) );
+
+
+int handleRegNotifyOnChange(int key_handle, pclChangeNotifyCallback_t callback, PersNotifyRegPolicy_e regPolicy)
+{
+   int rval = EPERS_NOT_INITIALIZED;
 
    if(gPclInitialized >= PCLinitialized)
    {
@@ -280,7 +269,7 @@ int pclKeyHandleUnRegisterNotifyOnChange(int key_handle, pclChangeNotifyCallback
                                   gKeyHandleArray[key_handle].info.context.user_no,
                                   gKeyHandleArray[key_handle].info.context.seat_no,
                                   callback,
-                                  Notify_unregister);
+                                  regPolicy);
       }
       else
       {
@@ -291,6 +280,7 @@ int pclKeyHandleUnRegisterNotifyOnChange(int key_handle, pclChangeNotifyCallback
 }
 
 
+
 int pclKeyHandleWriteData(int key_handle, unsigned char* buffer, int buffer_size)
 {
    int size = EPERS_NOT_INITIALIZED;
@@ -565,20 +555,24 @@ int pclKeyWriteData(unsigned int ldbid, const char* resource_id, unsigned int us
 
 int pclKeyUnRegisterNotifyOnChange( unsigned int  ldbid, const char *  resource_id, unsigned int  user_no, unsigned int  seat_no, pclChangeNotifyCallback_t  callback)
 {
+   DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyUnRegisterNotifyOnChange: "),
+               DLT_INT(ldbid), DLT_STRING(resource_id) );
+
    return regNotifyOnChange(ldbid, resource_id, user_no, seat_no, callback, Notify_unregister);
 }
 
 
 int pclKeyRegisterNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, pclChangeNotifyCallback_t callback)
 {
-
+   DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyRegisterNotifyOnChange: "),
+               DLT_INT(ldbid), DLT_STRING(resource_id) );
    return regNotifyOnChange(ldbid, resource_id, user_no, seat_no, callback, Notify_register);
 }
 
 
 
 
-int regNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, pclChangeNotifyCallback_t callback, PersistenceNotifyRegPolicy_e regPolicy)
+int regNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, pclChangeNotifyCallback_t callback, PersNotifyRegPolicy_e regPolicy)
 {
    int rval = EPERS_NOT_INITIALIZED;