Changed file and key-value API according GENIVI naming conventionsv0.4.0

6 files changed, 123 insertions, 123 deletions

diff --git a/include/persistence_client_library_file.h b/include/persistence_client_library_file.h
index 47a4927..cf85b84 100644
--- a/include/persistence_client_library_file.h
+++ b/include/persistence_client_library_file.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 
-#define 	PERSIST_FILEAPI_INTERFACE_VERSION   (0x02000000U)
+#define 	PERSIST_FILEAPI_INTERFACE_VERSION   (0x03000000U)
 
 
 
@@ -43,7 +43,7 @@ extern "C" {
  * @return zero on success. On error a negative value will be returned with th follwoing error codes:
  *                          EPERS_LOCKFS
  */
-int file_close(int fd);
+int pclFileClose(int fd);
 
 
 
@@ -54,7 +54,7 @@ int file_close(int fd);
  *
  * @return positive value. On error the negative value -1 will be returned
  */
-int file_get_size(int fd);
+int pclFileGetSize(int fd);
 
 
 
@@ -69,7 +69,7 @@ int file_get_size(int fd);
  * @return a pointer to the mapped area, or on error the value MAP_FAILED or
  *  EPERS_MAP_FAILEDLOCK if filesystem is currrently locked
  */
-void* file_map_data(void* addr, long size, long offset, int fd);
+void* pclFileMapData(void* addr, long size, long offset, int fd);
 
 
 
@@ -85,7 +85,7 @@ void* file_map_data(void* addr, long size, long offset, int fd);
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS, EPERS_MAXHANDLE, EPERS_NOKEY, EPERS_NOKEYDATA, EPERS_NOPRCTABLE or EPERS_COMMON,
  */
-int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclFileOpen(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 
 
@@ -100,7 +100,7 @@ int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no,
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS or EPERS_COMMON
  */
-int file_read_data(int fd, void * buffer, int buffer_size);
+int pclFileReadData(int fd, void * buffer, int buffer_size);
 
 
 
@@ -116,7 +116,7 @@ int file_read_data(int fd, void * buffer, int buffer_size);
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS or EPERS_COMMON
  */
-int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclFileRemove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 
 
@@ -137,7 +137,7 @@ int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_n
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS or EPERS_COMMON
  */
-int file_seek(int fd, long int offset, int whence);
+int pclFileSeek(int fd, long int offset, int whence);
 
 
 
@@ -151,7 +151,7 @@ int file_seek(int fd, long int offset, int whence);
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS or EPERS_COMMON
  */
-int file_unmap_data(void* address, long size);
+int pclFileUnmapData(void* address, long size);
 
 
 
@@ -166,7 +166,7 @@ int file_unmap_data(void* address, long size);
  * On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS or EPERS_COMMON
  */
-int file_write_data(int fd, const void * buffer, int buffer_size);
+int pclFileWriteData(int fd, const void * buffer, int buffer_size);
 
 
 
diff --git a/include/persistence_client_library_key.h b/include/persistence_client_library_key.h
index 2be3927..fc75498 100644
--- a/include/persistence_client_library_key.h
+++ b/include/persistence_client_library_key.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 
-#define 	PERSIST_KEYVALUEAPI_INTERFACE_VERSION   (0x02000000U)
+#define 	PERSIST_KEYVALUEAPI_INTERFACE_VERSION   (0x03000000U)
 
 
 
@@ -47,7 +47,7 @@ extern "C" {
  * @return positive value: success; On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS
  */
-int key_delete(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclKeyDelete(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 
 
@@ -62,7 +62,7 @@ int key_delete(unsigned int ldbid, const char* resource_id, unsigned int user_no
  * @return positive value: the size; On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS, EPERS_BADPOL, EPERS_NOKEY, EPERS_NOKEYDATA or EPERS_NOPRCTABLE
  */
-int key_get_size(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclKeyGetSize(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 /**
  * @brief close the access to a key-value identified by key handle
@@ -72,7 +72,7 @@ int key_get_size(unsigned int ldbid, const char* resource_id, unsigned int user_
  * @return positive value: success; On error a negative value will be returned with th follwoing error codes:
  * EPERS_LOCKFS
  */
-int key_handle_close(int key_handle);
+int pclKeyHandleClose(int key_handle);
 
 
 
@@ -83,7 +83,7 @@ int key_handle_close(int key_handle);
  *
  * @return positive value: the size; On error a negative value will be returned with th follwoing error codes:
  */
-int key_handle_get_size(int key_handle);
+int pclKeyHandleGetSize(int key_handle);
 
 
 
@@ -98,7 +98,7 @@ int key_handle_get_size(int key_handle);
  * @return positive value: the key handle to access the value;
  * On error a negative value will be returned with th follwoing error codes:
  */
-int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclKeyHandleOpen(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 
 
@@ -112,7 +112,7 @@ int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int us
  * @return positive value: the bytes read; On error a negative value will be returned with th follwoing error codes:
  *
  */
-int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size);
+int pclKeyHandleReadData(int key_handle, unsigned char* buffer, int buffer_size);
 
 
 
@@ -123,7 +123,7 @@ int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size)
  *
  * @return positive value: registration OK; On error a negative value will be returned with th follwoing error codes:
  */
-int key_handle_register_notify_on_change(int key_handle);
+int pclKeyHandleRegisterNotifyOnChange(int key_handle);
 
 
 
@@ -137,7 +137,7 @@ int key_handle_register_notify_on_change(int key_handle);
  *
  * @return positive value: the bytes written; On error a negative value will be returned with th follwoing error codes:
  */
-int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size);
+int pclKeyHandleWriteData(int key_handle, unsigned char* buffer, int buffer_size);
 
 
 
@@ -153,7 +153,7 @@ int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size
  *
  * @return positive value: the bytes read; On error a negative value will be returned with th follwoing error codes:
  */
-int key_read_data(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, unsigned char* buffer, int buffer_size);
+int pclKeyReadData(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, unsigned char* buffer, int buffer_size);
 
 
 
@@ -167,7 +167,7 @@ int key_read_data(unsigned int ldbid, const char* resource_id, unsigned int user
  *
  * @return positive value: registration OK; On error a negative value will be returned with th follwoing error codes:
  */
-int key_register_notify_on_change(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
+int pclKeyRegisterNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no);
 
 
 
@@ -184,7 +184,7 @@ int key_register_notify_on_change(unsigned int ldbid, const char* resource_id, u
  *
  * @return positive value: the bytes written; On error a negative value will be returned with th follwoing error codes:
  */
-int key_write_data(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, unsigned char* buffer, int buffer_size);
+int pclKeyWriteData(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, unsigned char* buffer, int buffer_size);
 
 
 #ifdef __cplusplus
diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c
index 25b51b9..a98357b 100644
--- a/src/persistence_client_library_file.c
+++ b/src/persistence_client_library_file.c
@@ -35,7 +35,7 @@
 
 
 
-int file_close(int fd)
+int pclFileClose(int fd)
 {
    int rval = -1;
 
@@ -49,7 +49,7 @@ int file_close(int fd)
 
 
 
-int file_get_size(int fd)
+int pclFileGetSize(int fd)
 {
    int rval = -1;
 
@@ -66,7 +66,7 @@ int file_get_size(int fd)
 
 
 
-void* file_map_data(void* addr, long size, long offset, int fd)
+void* pclFileMapData(void* addr, long size, long offset, int fd)
 {
    void* ptr = 0;
 
@@ -84,7 +84,7 @@ void* file_map_data(void* addr, long size, long offset, int fd)
 
 
 
-int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclFileOpen(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int handle = -1, shared_DB = 0, flags = O_RDWR;
 
@@ -188,14 +188,14 @@ int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no,
 
 
 
-int file_read_data(int fd, void * buffer, int buffer_size)
+int pclFileReadData(int fd, void * buffer, int buffer_size)
 {
    return read(fd, buffer, buffer_size);
 }
 
 
 
-int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclFileRemove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int rval = 0;
 
@@ -236,7 +236,7 @@ int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_n
 
 
 
-int file_seek(int fd, long int offset, int whence)
+int pclFileSeek(int fd, long int offset, int whence)
 {
    int rval = 0;
 
@@ -254,7 +254,7 @@ int file_seek(int fd, long int offset, int whence)
 
 
 
-int file_unmap_data(void* address, long size)
+int pclFileUnmapData(void* address, long size)
 {
    int rval = 0;
 
@@ -272,7 +272,7 @@ int file_unmap_data(void* address, long size)
 
 
 
-int file_write_data(int fd, const void * buffer, int buffer_size)
+int pclFileWriteData(int fd, const void * buffer, int buffer_size)
 {
    int size = 0;
 
diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c
index c8546e4..0d92a73 100644
--- a/src/persistence_client_library_key.c
+++ b/src/persistence_client_library_key.c
@@ -35,7 +35,7 @@
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclKeyHandleOpen(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int handle = 0;
    PersistenceInfo_s dbContext;
@@ -97,7 +97,7 @@ int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int us
 
 
 
-int key_handle_close(int key_handle)
+int pclKeyHandleClose(int key_handle)
 {
    int rval = 0;
 
@@ -136,7 +136,7 @@ int key_handle_close(int key_handle)
 
 
 
-int key_handle_get_size(int key_handle)
+int pclKeyHandleGetSize(int key_handle)
 {
    int size = 0;
 
@@ -167,7 +167,7 @@ int key_handle_get_size(int key_handle)
 
 
 
-int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size)
+int pclKeyHandleReadData(int key_handle, unsigned char* buffer, int buffer_size)
 {
    int size = 0;
    if(key_handle < MaxPersHandle)
@@ -197,7 +197,7 @@ int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size)
 
 
 
-int key_handle_register_notify_on_change(int key_handle)
+int pclKeyHandleRegisterNotifyOnChange(int key_handle)
 {
    int rval = -1;
 
@@ -206,7 +206,7 @@ int key_handle_register_notify_on_change(int key_handle)
 
 
 
-int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size)
+int pclKeyHandleWriteData(int key_handle, unsigned char* buffer, int buffer_size)
 {
    int size = 0;
 
@@ -263,7 +263,7 @@ int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-int key_delete(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclKeyDelete(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int rval = 0;
 
@@ -307,7 +307,7 @@ int key_delete(unsigned int ldbid, const char* resource_id, unsigned int user_no
 
 
 // status: OK
-int key_get_size(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclKeyGetSize(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int data_size = 0;
    PersistenceInfo_s dbContext;
@@ -347,7 +347,7 @@ int key_get_size(unsigned int ldbid, const char* resource_id, unsigned int user_
 
 
 // status: OK
-int key_read_data(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no,
+int pclKeyReadData(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no,
                   unsigned char* buffer, int buffer_size)
 {
    int data_size = 0;
@@ -392,7 +392,7 @@ int key_read_data(unsigned int ldbid, const char* resource_id, unsigned int user
 
 
 
-int key_write_data(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no,
+int pclKeyWriteData(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no,
                    unsigned char* buffer, int buffer_size)
 {
    int data_size = 0;
@@ -451,7 +451,7 @@ int key_write_data(unsigned int ldbid, const char* resource_id, unsigned int use
 
 
 // status: TODO implement register on change
-int key_register_notify_on_change(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
+int pclKeyRegisterNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no)
 {
    int rval = 0;
    PersistenceInfo_s dbContext;
diff --git a/test/persistence_client_library_dbus_test.c b/test/persistence_client_library_dbus_test.c
index 56cac76..caebd3e 100644
--- a/test/persistence_client_library_dbus_test.c
+++ b/test/persistence_client_library_dbus_test.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 
    printf("Dbus interface test application\n");
 
-   ret = key_read_data(0,    "/language/current_language", 3, 0, (unsigned char*)buffer, 128);
+   ret = pclKeyReadData(0,    "/language/current_language", 3, 0, (unsigned char*)buffer, 128);
 
    getchar();
 
diff --git a/test/persistence_client_library_test.c b/test/persistence_client_library_test.c
index b7011e5..945ec61 100644
--- a/test/persistence_client_library_test.c
+++ b/test/persistence_client_library_test.c
@@ -60,7 +60,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0xFF with user 0 and seat 0
     *       ==> local value accessible by all users (user 0, seat 0)
     */
-   ret = key_read_data(0xFF, "language/country_code",         0, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "language/country_code",         0, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "Custom plugin -> plugin_get_data_handle",
                strlen((char*)buffer)) == 0, "Buffer not correctly read");
    fail_unless(ret = strlen("Custom plugin -> plugin_get_data_handle"));
@@ -71,7 +71,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0xFF with user 0 and seat 0
     *       ==> local value accessible by all users (user 0, seat 0)
     */
-   ret = key_read_data(0xFF, "pos/last_position",         0, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "pos/last_position",         0, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "CACHE_ +48° 10' 38.95\", +8° 44' 39.06\"",
                strlen((char*)buffer)) == 0, "Buffer not correctly read");
    fail_unless(ret = strlen("CACHE_ +48° 10' 38.95\", +8° 44' 39.06\""));
@@ -82,7 +82,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0 with user 3 and seat 0
     *       ==> public shared user value (user 3, seat 0)
     */
-   ret = key_read_data(0,    "language/current_language", 3, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0,    "language/current_language", 3, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "CACHE_ Kisuaheli", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 
    memset(buffer, 0, READ_SIZE);
@@ -91,7 +91,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0xFF with user 3 and seat 2
     *       ==> local USER value (user 3, seat 2)
     */
-   ret = key_read_data(0xFF, "status/open_document",      3, 2, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "status/open_document",      3, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "WT_ /var/opt/user_manual_climateControl.pdf", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 
    memset(buffer, 0, READ_SIZE);
@@ -100,7 +100,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0x20 with user 4 and seat 0
     *       ==> shared user value accessible by a group (user 4 and seat 0)
     */
-   ret = key_read_data(0x20, "address/home_address",      4, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0x20, "address/home_address",      4, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "WT_ 55327 Heimatstadt, Wohnstrasse 31", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 
    memset(buffer, 0, READ_SIZE);
@@ -109,7 +109,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0xFF with user 0 and seat 0
     *       ==> local value accessible by ALL USERS (user 0, seat 0)
     */
-   ret = key_read_data(0xFF, "pos/last_satellites",       0, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "pos/last_satellites",       0, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "WT_ 17", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 
    memset(buffer, 0, READ_SIZE);
@@ -118,7 +118,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0x84 with user 4 and seat 0
     *       ==> shared user value accessible by A GROUP (user 4 and seat 0)
     */
-   ret = key_read_data(0x84, "links/last_link",           2, 0, buffer, READ_SIZE);
+   ret = pclKeyReadData(0x84, "links/last_link",           2, 0, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "CACHE_ /last_exit/brooklyn", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 
    memset(buffer, 0, READ_SIZE);
@@ -127,7 +127,7 @@ START_TEST (test_GetData)
     * Logical DB ID: 0x84 with user 2 and seat 1
     *       ==> local merge value
     */
-   ret = key_read_data(0x84, "links/last_link",           2, 1, buffer, READ_SIZE);
+   ret = pclKeyReadData(0x84, "links/last_link",           2, 1, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "CACHE_ /last_exit/queens", strlen((char*)buffer)) == 0, "Buffer not correctly read");
 }
 END_TEST
@@ -160,13 +160,13 @@ START_TEST (test_GetDataHandle)
     * Logical DB ID: 0xFF with user 0 and seat 0
     *       ==> local value accessible by ALL USERS (user 0, seat 0)
     */
-   handle = key_handle_open(0xFF, "posHandle/last_position", 0, 0);
+   handle = pclKeyHandleOpen(0xFF, "posHandle/last_position", 0, 0);
    fail_unless(handle >= 0, "Failed to open handle ==> /posHandle/last_position");
 
-   ret = key_handle_read_data(handle, buffer, READ_SIZE);
+   ret = pclKeyHandleReadData(handle, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "WT_ H A N D L E: +48° 10' 38.95\", +8° 44' 39.06\"", ret-1) == 0, "Buffer not correctly read");
 
-   size = key_handle_get_size(handle);
+   size = pclKeyHandleGetSize(handle);
    fail_unless(size = strlen("WT_ H A N D L E: +48° 10' 38.95\", +8° 44' 39.06\""));
    // ---------------------------------------------------------------------------------------------
 
@@ -176,13 +176,13 @@ START_TEST (test_GetDataHandle)
     * Logical DB ID: 0xFF with user 3 and seat 2
     *       ==> local USER value (user 3, seat 2)
     */
-   handle2 = key_handle_open(0xFF, "statusHandle/open_document", 3, 2);
+   handle2 = pclKeyHandleOpen(0xFF, "statusHandle/open_document", 3, 2);
    fail_unless(handle2 >= 0, "Failed to open handle /statusHandle/open_document");
 
-   size = key_handle_write_data(handle2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
+   size = pclKeyHandleWriteData(handle2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
    fail_unless(size = strlen(sysTimeBuffer));
    // close
-   ret = key_handle_close(handle2);
+   ret = pclKeyHandleClose(handle2);
    // ---------------------------------------------------------------------------------------------
 
 
@@ -192,16 +192,16 @@ START_TEST (test_GetDataHandle)
     *       ==> local value accessible by ALL USERS (user 0, seat 0)
     */
    memset(buffer, 0, READ_SIZE);
-   handle4 = key_handle_open(0xFF, "language/country_code", 0, 0);
+   handle4 = pclKeyHandleOpen(0xFF, "language/country_code", 0, 0);
    fail_unless(handle4 >= 0, "Failed to open handle /language/country_code");
 
-   ret = key_handle_read_data(handle4, buffer, READ_SIZE);
+   ret = pclKeyHandleReadData(handle4, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, "Custom plugin -> plugin_get_data_handle", -1) == 0, "Buffer not correctly read");
 
-   size = key_handle_get_size(handle4);
+   size = pclKeyHandleGetSize(handle4);
    fail_unless(size = strlen("Custom plugin -> plugin_get_data_handle"));
 
-   ret = key_handle_write_data(handle4, (unsigned char*)"Only dummy implementation behind custom library", READ_SIZE);
+   ret = pclKeyHandleWriteData(handle4, (unsigned char*)"Only dummy implementation behind custom library", READ_SIZE);
    // ---------------------------------------------------------------------------------------------
 
 
@@ -210,21 +210,21 @@ START_TEST (test_GetDataHandle)
     * Logical DB ID: 0xFF with user 3 and seat 2
     *       ==> local USER value (user 3, seat 2)
     */
-   handle3 = key_handle_open(0xFF, "statusHandle/open_document", 3, 2);
+   handle3 = pclKeyHandleOpen(0xFF, "statusHandle/open_document", 3, 2);
    fail_unless(handle3 >= 0, "Failed to open handle /statusHandle/open_document");
 
-   ret = key_handle_read_data(handle3, buffer, READ_SIZE);
+   ret = pclKeyHandleReadData(handle3, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, sysTimeBuffer, strlen(sysTimeBuffer)) == 0, "Buffer not correctly read");
 
-   size = key_handle_get_size(handle3);
+   size = pclKeyHandleGetSize(handle3);
    fail_unless(size = strlen(sysTimeBuffer));
    // ---------------------------------------------------------------------------------------------
 
 
    // close handle
-   ret = key_handle_close(handle);
-   ret = key_handle_close(handle3);
-   ret = key_handle_close(handle4);
+   ret = pclKeyHandleClose(handle);
+   ret = pclKeyHandleClose(handle3);
+   ret = pclKeyHandleClose(handle4);
 }
 END_TEST
 
@@ -260,7 +260,7 @@ START_TEST(test_SetData)
     *       ==> local USER value (user 1, seat 2)
     * Resource ID: 69
     */
-   ret = key_write_data(0xFF, "69", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
+   ret = pclKeyWriteData(0xFF, "69", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
    fail_unless(ret == strlen(sysTimeBuffer), "Wrong write size");
 
    snprintf(write1, 128, "%s %s", "/70",  sysTimeBuffer);
@@ -269,7 +269,7 @@ START_TEST(test_SetData)
     *       ==> local USER value (user 1, seat 2)
     * Resource ID: 70
     */
-   ret = key_write_data(0xFF, "70", 1, 2, (unsigned char*)write1, strlen(write1));
+   ret = pclKeyWriteData(0xFF, "70", 1, 2, (unsigned char*)write1, strlen(write1));
    fail_unless(ret == strlen(write1), "Wrong write size");
 
    snprintf(write2, 128, "%s %s", "/key_70",  sysTimeBuffer);
@@ -278,7 +278,7 @@ START_TEST(test_SetData)
     *       ==> local USER value (user 1, seat 2)
     * Resource ID: key_70
     */
-   ret = key_write_data(0xFF, "key_70", 1, 2, (unsigned char*)write2, strlen(write2));
+   ret = pclKeyWriteData(0xFF, "key_70", 1, 2, (unsigned char*)write2, strlen(write2));
    fail_unless(ret == strlen(write2), "Wrong write size");
 
 
@@ -289,19 +289,19 @@ START_TEST(test_SetData)
     */
    memset(buffer, 0, READ_SIZE);
 
-   ret = key_read_data(0xFF, "69", 1, 2, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "69", 1, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, sysTimeBuffer, strlen(sysTimeBuffer)) == 0, "Buffer not correctly read");
    fail_unless(ret == strlen(sysTimeBuffer), "Wrong read size");
 
    memset(buffer, 0, READ_SIZE);
 
-   ret = key_read_data(0xFF, "70", 1, 2, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "70", 1, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, write1, strlen(write1)) == 0, "Buffer not correctly read");
    fail_unless(ret == strlen(write1), "Wrong read size");
 
    memset(buffer, 0, READ_SIZE);
 
-   ret = key_read_data(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, write2, strlen(write2)) == 0, "Buffer not correctly read");
    fail_unless(ret == strlen(write2), "Wrong read size");
 
@@ -334,14 +334,14 @@ START_TEST(test_SetDataNoPRCT)
     * Logical DB ID: 0xFF with user 1 and seat 2
     *       ==> local USER value (user 1, seat 2)
     */
-   ret = key_write_data(0xFF, "NoPRCT", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
+   ret = pclKeyWriteData(0xFF, "NoPRCT", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
    fail_unless(ret == strlen(sysTimeBuffer), "Wrong write size");
    printf("Write Buffer : %s\n", sysTimeBuffer);
 
    // read data again and and verify datat has been written correctly
    memset(buffer, 0, READ_SIZE);
 
-   ret = key_read_data(0xFF, "NoPRCT", 1, 2, buffer, READ_SIZE);
+   ret = pclKeyReadData(0xFF, "NoPRCT", 1, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, sysTimeBuffer, strlen(sysTimeBuffer)) == 0, "Buffer not correctly read");
    fail_unless(ret == strlen(sysTimeBuffer), "Wrong read size");
    printf("read buffer  : %s\n", buffer);
@@ -363,7 +363,7 @@ START_TEST(test_GetDataSize)
     * Logical DB ID: 0xFF with user 3 and seat 2
     *       ==> local USER value (user 3, seat 2)
     */
-   size = key_get_size(0xFF, "status/open_document", 3, 2);
+   size = pclKeyGetSize(0xFF, "status/open_document", 3, 2);
    fail_unless(size == strlen("WT_ /var/opt/user_manual_climateControl.pdf"), "Invalid size");
 
 
@@ -371,7 +371,7 @@ START_TEST(test_GetDataSize)
     * Logical DB ID: 0x84 with user 2 and seat 1
     *       ==> shared user value accessible by A GROUP (user 2 and seat 1)
     */
-   size = key_get_size(0x84, "links/last_link", 2, 1);
+   size = pclKeyGetSize(0x84, "links/last_link", 2, 1);
    fail_unless(size == strlen("CACHE_ /last_exit/queens"), "Invalid size");
 }
 END_TEST
@@ -388,29 +388,29 @@ START_TEST(test_DeleteData)
    unsigned char buffer[READ_SIZE];
 
    // read data from key
-   rval = key_read_data(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
+   rval = pclKeyReadData(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
    fail_unless(rval != EPERS_NOKEY, "Read form key key_70 fails");
 
    // delete key
-   rval = key_delete(0xFF, "key_70", 1, 2);
+   rval = pclKeyDelete(0xFF, "key_70", 1, 2);
    fail_unless(rval == 0, "Failed to delete key");
 
    // after deleting the key, reading from key must fail now!
-   rval = key_read_data(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
+   rval = pclKeyReadData(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
    fail_unless(rval == EPERS_NOKEY, "Read form key key_70 works, but should fail");
 
 
 
    // read data from key
-   rval = key_read_data(0xFF, "70", 1, 2, buffer, READ_SIZE);
+   rval = pclKeyReadData(0xFF, "70", 1, 2, buffer, READ_SIZE);
    fail_unless(rval != EPERS_NOKEY, "Read form key 70 fails");
 
    // delete key
-   rval = key_delete(0xFF, "70", 1, 2);
+   rval = pclKeyDelete(0xFF, "70", 1, 2);
    fail_unless(rval == 0, "Failed to delete key");
 
    // after deleting the key, reading from key must fail now!
-   rval = key_read_data(0xFF, "70", 1, 2, buffer, READ_SIZE);
+   rval = pclKeyReadData(0xFF, "70", 1, 2, buffer, READ_SIZE);
    fail_unless(rval == EPERS_NOKEY, "Read form key 70 works, but should fail");
 }
 END_TEST
@@ -457,54 +457,54 @@ START_TEST(test_DataFile)
    close(fd);
 
    // open ----------------------------------------------------------
-   fd = file_open(0xFF, "media/mediaDB.db", 1, 1);
+   fd = pclFileOpen(0xFF, "media/mediaDB.db", 1, 1);
    fail_unless(fd != -1, "Could not open file ==> /media/mediaDB.db");
 
-   size = file_get_size(fd);
+   size = pclFileGetSize(fd);
    fail_unless(size == 68, "Wrong file size");
 
-   size = file_read_data(fd, buffer, READ_SIZE);
+   size = pclFileReadData(fd, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, refBuffer, strlen(refBuffer)) == 0, "Buffer not correctly read");
    fail_unless(size == (strlen(refBuffer)+1), "Wrong size returned");      // strlen + 1 ==> inlcude cr/lf
 
-   ret = file_close(fd);
+   ret = pclFileClose(fd);
    fail_unless(ret == 0, "Failed to close file");
 
 
    // open ----------------------------------------------------------
-   fd = file_open(0xFF, "media/mediaDBWrite.db", 1, 1);
+   fd = pclFileOpen(0xFF, "media/mediaDBWrite.db", 1, 1);
    fail_unless(fd != -1, "Could not open file ==> /media/mediaDBWrite.db");
 
-   size = file_write_data(fd, writeBuffer, strlen(writeBuffer));
+   size = pclFileWriteData(fd, writeBuffer, strlen(writeBuffer));
    fail_unless(size == strlen(writeBuffer), "Failed to write data");
 
-   ret = file_close(fd);
+   ret = pclFileClose(fd);
    fail_unless(ret == 0, "Failed to close file");
 
 
    // remove ----------------------------------------------------------
-   ret = file_remove(0xFF, "media/mediaDBWrite.db", 1, 1);
+   ret = pclFileRemove(0xFF, "media/mediaDBWrite.db", 1, 1);
    fail_unless(ret == 0, "File can't be removed ==> /media/mediaDBWrite.db");
 
-   fd = file_open(0xFF, "media/mediaDBWrite.db", 1, 1);
+   fd = pclFileOpen(0xFF, "media/mediaDBWrite.db", 1, 1);
    fail_unless(fd != -1, "File can't be opend ==> /media/mediaDBWrite.db");
 
-   ret = file_remove(0xFF, "media/mediaDBWrite.db", 1, 1);
+   ret = pclFileRemove(0xFF, "media/mediaDBWrite.db", 1, 1);
    fail_unless(ret == 0, "File can't be removed ==> /media/mediaDBWrite.db");
 
 
    // map file ------------------------------------------------------
-   fd = file_open(0xFF, "media/mediaDB.db", 1, 1);
+   fd = pclFileOpen(0xFF, "media/mediaDB.db", 1, 1);
 
-   size = file_get_size(fd);
-   file_map_data(fileMap, size, 0, fd);
+   size = pclFileGetSize(fd);
+   pclFileMapData(fileMap, size, 0, fd);
    fail_unless(fileMap != MAP_FAILED, "Failed to map file");
 
-   ret = file_unmap_data(fileMap, size);
+   ret = pclFileUnmapData(fileMap, size);
    fail_unless(ret != -1, "Failed to unmap file");
 
    // negative test
-   size = file_get_size(1024);
+   size = pclFileGetSize(1024);
    fail_unless(ret == 0, "Got size, but should not");
 
 
@@ -523,28 +523,28 @@ START_TEST(test_DataHandle)
    int ret = 0;
 
    // test file handles
-   handle1 = file_open(0xFF, "media/mediaDB.db", 1, 1);
+   handle1 = pclFileOpen(0xFF, "media/mediaDB.db", 1, 1);
    fail_unless(handle1 != -1, "Could not open file ==> /media/mediaDB.db");
 
-   ret = file_close(handle1);
+   ret = pclFileClose(handle1);
    fail_unless(handle1 != -1, "Could not closefile ==> /media/mediaDB.db");
 
-   ret = file_close(1024);
+   ret = pclFileClose(1024);
    fail_unless(ret == -1, "Could close file, but should not!!");
 
-   ret = file_close(17);
+   ret = pclFileClose(17);
    fail_unless(ret == -1, "Could close file, but should not!!");
 
 
 
    // test key handles
-   handle2 = key_handle_open(0xFF, "statusHandle/open_document", 3, 2);
+   handle2 = pclKeyHandleOpen(0xFF, "statusHandle/open_document", 3, 2);
    fail_unless(handle2 >= 0, "Failed to open handle /statusHandle/open_document");
 
-   ret = key_handle_close(handle2);
+   ret = pclKeyHandleClose(handle2);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(1024);
+   ret = pclKeyHandleClose(1024);
    fail_unless(ret == -1, "Could close, but should not!!");
 }
 END_TEST
@@ -560,61 +560,61 @@ START_TEST(test_DataHandleOpen)
    int hd1 = -2, hd2 = -2, hd3 = -2, hd4 = -2, hd5 = -2, hd6 = -2, hd7 = -2, hd8 = -2, hd9 = -2, ret = 0;
 
    // open handles ----------------------------------------------------
-   hd1 = key_handle_open(0xFF, "posHandle/last_position1", 0, 0);
+   hd1 = pclKeyHandleOpen(0xFF, "posHandle/last_position1", 0, 0);
    fail_unless(hd1 == 1, "Failed to open handle ==> /posHandle/last_position1");
 
-   hd2 = key_handle_open(0xFF, "posHandle/last_position2", 0, 0);
+   hd2 = pclKeyHandleOpen(0xFF, "posHandle/last_position2", 0, 0);
    fail_unless(hd2 == 2, "Failed to open handle ==> /posHandle/last_position2");
 
-   hd3 = key_handle_open(0xFF, "posHandle/last_position3", 0, 0);
+   hd3 = pclKeyHandleOpen(0xFF, "posHandle/last_position3", 0, 0);
    fail_unless(hd3 == 3, "Failed to open handle ==> /posHandle/last_position3");
 
    // close handles ---------------------------------------------------
-   ret = key_handle_close(hd1);
+   ret = pclKeyHandleClose(hd1);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd2);
+   ret = pclKeyHandleClose(hd2);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd3);
+   ret = pclKeyHandleClose(hd3);
    fail_unless(ret != -1, "Failed to close handle!!");
 
    // open handles ----------------------------------------------------
-   hd4 = key_handle_open(0xFF, "posHandle/last_position4", 0, 0);
+   hd4 = pclKeyHandleOpen(0xFF, "posHandle/last_position4", 0, 0);
    fail_unless(hd4 == 3, "Failed to open handle ==> /posHandle/last_position4");
 
-   hd5 = key_handle_open(0xFF, "posHandle/last_position5", 0, 0);
+   hd5 = pclKeyHandleOpen(0xFF, "posHandle/last_position5", 0, 0);
    fail_unless(hd5 == 2, "Failed to open handle ==> /posHandle/last_position5");
 
-   hd6 = key_handle_open(0xFF, "posHandle/last_position6", 0, 0);
+   hd6 = pclKeyHandleOpen(0xFF, "posHandle/last_position6", 0, 0);
    fail_unless(hd6 == 1, "Failed to open handle ==> /posHandle/last_position6");
 
-   hd7 = key_handle_open(0xFF, "posHandle/last_position7", 0, 0);
+   hd7 = pclKeyHandleOpen(0xFF, "posHandle/last_position7", 0, 0);
    fail_unless(hd7 == 4, "Failed to open handle ==> /posHandle/last_position7");
 
-   hd8 = key_handle_open(0xFF, "posHandle/last_position8", 0, 0);
+   hd8 = pclKeyHandleOpen(0xFF, "posHandle/last_position8", 0, 0);
    fail_unless(hd8 == 5, "Failed to open handle ==> /posHandle/last_position8");
 
-   hd9 = key_handle_open(0xFF, "posHandle/last_position9", 0, 0);
+   hd9 = pclKeyHandleOpen(0xFF, "posHandle/last_position9", 0, 0);
    fail_unless(hd9 == 6, "Failed to open handle ==> /posHandle/last_position9");
 
    // close handles ---------------------------------------------------
-   ret = key_handle_close(hd4);
+   ret = pclKeyHandleClose(hd4);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd5);
+   ret = pclKeyHandleClose(hd5);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd6);
+   ret = pclKeyHandleClose(hd6);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd7);
+   ret = pclKeyHandleClose(hd7);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd8);
+   ret = pclKeyHandleClose(hd8);
    fail_unless(ret != -1, "Failed to close handle!!");
 
-   ret = key_handle_close(hd9);
+   ret = pclKeyHandleClose(hd9);
    fail_unless(ret != -1, "Failed to close handle!!");
 }
 END_TEST