diff options
author | Ingo Huerner <ingo.huerner@xse.de> | 2013-01-08 14:35:36 +0100 |
---|---|---|
committer | Ingo Huerner <ingo.huerner@xse.de> | 2013-01-08 14:35:36 +0100 |
commit | fc4d54c73fbb292b6e4700ff772a355d09ca0ff9 (patch) | |
tree | c40580fa0e7aec703f930f368421f02942021468 | |
parent | b7250822718b2e91e00d06bc96da728814699db4 (diff) | |
download | persistence-client-library-fc4d54c73fbb292b6e4700ff772a355d09ca0ff9.tar.gz |
changed datatype of ldbid, user_no and deat_no form unsigned char to unsigned int; changed resource_id datatype form char* to const char*
-rw-r--r-- | include/persistence_client_library_file.h | 6 | ||||
-rw-r--r-- | include/persistence_client_library_key.h | 14 | ||||
-rw-r--r-- | include_protected/persistence_client_library_rc_table.h | 6 | ||||
-rw-r--r-- | src/persistence_client_library_file.c | 4 | ||||
-rw-r--r-- | src/persistence_client_library_key.c | 12 | ||||
-rw-r--r-- | src/persistence_client_library_prct_access.c | 4 | ||||
-rw-r--r-- | src/persistence_client_library_prct_access.h | 4 |
7 files changed, 25 insertions, 25 deletions
diff --git a/include/persistence_client_library_file.h b/include/persistence_client_library_file.h index 06b0700..47a4927 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 (0x01030000U) +#define PERSIST_FILEAPI_INTERFACE_VERSION (0x02000000U) @@ -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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no); @@ -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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no); diff --git a/include/persistence_client_library_key.h b/include/persistence_client_library_key.h index becee04..2be3927 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 (0x01030000U) +#define PERSIST_KEYVALUEAPI_INTERFACE_VERSION (0x02000000U) @@ -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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int key_delete(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no); @@ -62,7 +62,7 @@ int key_delete(unsigned char ldbid, char* resource_id, unsigned char user_no, un * @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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int key_get_size(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 @@ -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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no); @@ -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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, int buffer_size); +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); @@ -167,7 +167,7 @@ int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, * * @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 char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no); +int key_register_notify_on_change(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 char ldbid, char* resource_id, unsign * * @return positive value: the bytes written; On error a negative value will be returned with th follwoing error codes: */ -int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, int buffer_size); +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); #ifdef __cplusplus diff --git a/include_protected/persistence_client_library_rc_table.h b/include_protected/persistence_client_library_rc_table.h index 1ec8731..7ea58d3 100644 --- a/include_protected/persistence_client_library_rc_table.h +++ b/include_protected/persistence_client_library_rc_table.h @@ -57,9 +57,9 @@ typedef enum _PersistenceStorage_e /// structure used to manage database context typedef struct _PersistenceDbContext_s { - unsigned char ldbid; - unsigned char user_no; - unsigned char seat_no; + unsigned int ldbid; + unsigned int user_no; + unsigned int seat_no; } PersistenceDbContext_s; diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c index cbf970d..c825005 100644 --- a/src/persistence_client_library_file.c +++ b/src/persistence_client_library_file.c @@ -84,7 +84,7 @@ void* file_map_data(void* addr, long size, long offset, int fd) -int file_open(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int file_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no) { int handle = -1, shared_DB = 0, flags = O_RDWR; @@ -136,7 +136,7 @@ int file_read_data(int fd, void * buffer, int buffer_size) -int file_remove(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int file_remove(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no) { int rval = 0; diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c index 3cc19cd..c8546e4 100644 --- a/src/persistence_client_library_key.c +++ b/src/persistence_client_library_key.c @@ -35,7 +35,7 @@ // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -int key_handle_open(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int key_handle_open(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no) { int handle = 0; PersistenceInfo_s dbContext; @@ -263,7 +263,7 @@ int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -int key_delete(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int key_delete(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 char ldbid, char* resource_id, unsigned char user_no, un // status: OK -int key_get_size(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int key_get_size(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 char ldbid, char* resource_id, unsigned char user_no, // status: OK -int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, +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 data_size = 0; @@ -392,7 +392,7 @@ int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, -int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, +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 data_size = 0; @@ -451,7 +451,7 @@ int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no // status: TODO implement register on change -int key_register_notify_on_change(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no) +int key_register_notify_on_change(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no) { int rval = 0; PersistenceInfo_s dbContext; diff --git a/src/persistence_client_library_prct_access.c b/src/persistence_client_library_prct_access.c index f4b8ddb..7330ccb 100644 --- a/src/persistence_client_library_prct_access.c +++ b/src/persistence_client_library_prct_access.c @@ -115,7 +115,7 @@ itzam_btree* get_resource_cfg_table(PersistenceRCT_e rct, int group) // status: OK -int get_db_context(PersistenceInfo_s* dbContext, char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]) +int get_db_context(PersistenceInfo_s* dbContext, const char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]) { int rval = 0, resourceFound = 0, groupId = 0; @@ -177,7 +177,7 @@ int get_db_context(PersistenceInfo_s* dbContext, char* resource_id, unsigned int // status: OK -int get_db_path_and_key(PersistenceInfo_s* dbContext, char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]) +int get_db_path_and_key(PersistenceInfo_s* dbContext, const char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]) { int storePolicy = PersistenceStoragePolicy_LastEntry; diff --git a/src/persistence_client_library_prct_access.h b/src/persistence_client_library_prct_access.h index 31dbca6..9632826 100644 --- a/src/persistence_client_library_prct_access.h +++ b/src/persistence_client_library_prct_access.h @@ -40,7 +40,7 @@ * @return 1 if shared database and 0 if local database or PersistenceStoragePolicy_LastEntry * when no valid database has been found */ -int get_db_path_and_key(PersistenceInfo_s* dbContext, char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]); +int get_db_path_and_key(PersistenceInfo_s* dbContext, const char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]); @@ -58,7 +58,7 @@ int get_db_path_and_key(PersistenceInfo_s* dbContext, char* resource_id, unsigne * * @return 0 or a negative value with one of the following errors: EPERS_NOKEY, EPERS_NOKEYDATA or EPERS_NOPRCTABLE */ -int get_db_context(PersistenceInfo_s* dbContext, char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]); +int get_db_context(PersistenceInfo_s* dbContext, const char* resource_id, unsigned int isFile, char dbKey[], char dbPath[]); |