Renamed and moved files, fixed problem with handle test

12 files changed, 52 insertions, 13 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f5b16a4..0c2cd5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,8 @@ if DEBUG
 AM_CFLAGS = $(DEPS_CFLAGS) -g -I../include \
                           -Idbus-1.0
 else
-AM_CFLAGS = $(DEPS_CFLAGS) -I../include \
-                          -Idbus-1.0
+AM_CFLAGS = $(DEPS_CFLAGS) -I../include -Idbus-1.0
+#AM_CFLAGS = -fprofile-arcs -ftest-coverage  $(DEPS_CFLAGS) -I../include -Idbus-1.0
 endif
 
 
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libpersistence_client_library_common_data.la libpersistence_cl
 
 
 libpersistence_client_library_common_data_la_SOURCES = \
-                                     persistence_client_library_common_data.c
+                                     persistence_client_library_data_organization.c
 
 
 
diff --git a/src/persistence_client_library_custom_loader.c b/src/persistence_client_library_custom_loader.c
index 0b4dc6e..c525a7f 100644
--- a/src/persistence_client_library_custom_loader.c
+++ b/src/persistence_client_library_custom_loader.c
@@ -17,7 +17,7 @@
  */
 
 #include "persistence_client_library_custom_loader.h"
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/persistence_client_library_common_data.c b/src/persistence_client_library_data_organization.c
index ba029b8..b53d15f 100644
--- a/src/persistence_client_library_common_data.c
+++ b/src/persistence_client_library_data_organization.c
@@ -9,14 +9,14 @@
  * with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ******************************************************************************/
  /**
- * @file           persistence_client_library_data_access_ll.c
+ * @file           persistence_client_library_data_organization.c
  * @ingroup        Persistence client library
  * @author         Ingo Huerner
  * @brief          Implementation of persistence database low level access
  * @see            
  */
 
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/persistence_client_library_db_access.c b/src/persistence_client_library_db_access.c
index 4d60c91..71fc930 100644
--- a/src/persistence_client_library_db_access.c
+++ b/src/persistence_client_library_db_access.c
@@ -18,6 +18,7 @@
  */
 
 #include "../include_protected/persistence_client_library_db_access.h"
+#include "../include_protected/persistence_client_library_rc_table.h"
 #include "persistence_client_library_custom_loader.h"
 #include "persistence_client_library_itzam_errors.h"
 
@@ -579,7 +580,7 @@ int pers_db_cursor_get_key(unsigned int handlerDB, char * bufKeyName_out, int bu
 
 
 
-int pers_db_cursor_get_key_data(unsigned int handlerDB, char * bufData_out, int bufSize)
+int pers_db_cursor_get_data(unsigned int handlerDB, char * bufData_out, int bufSize)
 {
    int rval = -1;
    KeyValuePair_s search;
diff --git a/src/persistence_client_library_db_access_ll.c b/src/persistence_client_library_db_access_ll.c
index 4452902..234191f 100644
--- a/src/persistence_client_library_db_access_ll.c
+++ b/src/persistence_client_library_db_access_ll.c
@@ -16,7 +16,7 @@
  * @see            
  */
 
-#include "../include_protected/persistence_client_library_db_access_ll.h"
+#include "persistence_client_library_db_access_ll.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/persistence_client_library_db_access_ll.h b/src/persistence_client_library_db_access_ll.h
new file mode 100644
index 0000000..5609db7
--- /dev/null
+++ b/src/persistence_client_library_db_access_ll.h
@@ -0,0 +1,34 @@
+#ifndef PERSISTENCE_CLIENT_LIBRARY_DB_ACCESS_LL_H
+#define PERSISTENCE_CLIENT_LIBRARY_DB_ACCESS_LL_H
+
+/******************************************************************************
+ * Project         Persistency
+ * (c) copyright   2012
+ * Company         XS Embedded GmbH
+ *****************************************************************************/
+/******************************************************************************
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed
+ * with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+******************************************************************************/
+ /**
+ * @file           persistence_client_library_data_access.h
+ * @ingroup        Persistence client library
+ * @author         Ingo Huerner
+ * @brief          Header of the persistence client library database low level access.
+ * @see            
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define  PERSIST_DATA_LL_ACCESS_INTERFACE_VERSION   (0x01000000U)
+
+// TODO: put here low level database access function
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PERSISTENCY_CLIENT_LIBRARY_DB_ACCESS_LL_H */
diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c
index 52f4bcb..cbf970d 100644
--- a/src/persistence_client_library_file.c
+++ b/src/persistence_client_library_file.c
@@ -18,7 +18,7 @@
  */
 
 #include "persistence_client_library_file.h"
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
 #include "../include_protected/persistence_client_library_db_access.h"
 
 #include "persistence_client_library_pas_interface.h"
diff --git a/src/persistence_client_library_handle.h b/src/persistence_client_library_handle.h
index 4cdb8e4..502db7d 100644
--- a/src/persistence_client_library_handle.h
+++ b/src/persistence_client_library_handle.h
@@ -20,7 +20,8 @@
  * @see            
  */
 
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
+#include "../include_protected/persistence_client_library_rc_table.h"
 
 /// handle structure definition
 typedef struct _PersistenceHandle_s
diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c
index c31caf3..3cc19cd 100644
--- a/src/persistence_client_library_key.c
+++ b/src/persistence_client_library_key.c
@@ -20,6 +20,7 @@
 #include "persistence_client_library_key.h"
 
 #include "../include_protected/persistence_client_library_db_access.h"
+#include "../include_protected/persistence_client_library_rc_table.h"
 #include "../include_protected/crc32.h"
 
 #include "persistence_client_library_handle.h"
diff --git a/src/persistence_client_library_lc_interface.c b/src/persistence_client_library_lc_interface.c
index 714c867..ae4c734 100644
--- a/src/persistence_client_library_lc_interface.c
+++ b/src/persistence_client_library_lc_interface.c
@@ -19,7 +19,7 @@
 
 #include "persistence_client_library_lc_interface.h"
 
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
 #include "../include_protected/persistence_client_library_db_access.h"
 
 #include "persistence_client_library_handle.h"
diff --git a/src/persistence_client_library_pas_interface.c b/src/persistence_client_library_pas_interface.c
index 9175317..36f0dcc 100644
--- a/src/persistence_client_library_pas_interface.c
+++ b/src/persistence_client_library_pas_interface.c
@@ -20,7 +20,7 @@
 #include "persistence_client_library_pas_interface.h"
 #include "persistence_client_library_dbus_service.h"
 
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/persistence_client_library_prct_access.h b/src/persistence_client_library_prct_access.h
index 02bab52..31dbca6 100644
--- a/src/persistence_client_library_prct_access.h
+++ b/src/persistence_client_library_prct_access.h
@@ -20,7 +20,9 @@
  * @see
  */
 
-#include "../include_protected/persistence_client_library_common_data.h"
+#include "../include_protected/persistence_client_library_data_organization.h"
+#include "../include_protected/persistence_client_library_rc_table.h"
+
 #include <itzam.h>
 
 /**