coroapi.h, confdb.h, objdb.h: big s/int/size_t/ change

* exec/mainconfig.c (objdb_get_string, objdb_get_int):
* exec/totemconfig.c (objdb_get_string, objdb_get_int)
(totem_config_keyread, totem_key_change_notify):
* include/corosync/confdb.h (confdb_callbacks_t):
* include/corosync/engine/coroapi.h (group_len, object_len)
(key_len, validate_callback, object_key_change_notify_fn_t)
(object_create_notify_fn_t, object_destroy_notify_fn_t)
(object_notify_callback_fn_t, object_reload_notify_fn_t)
(object_create, object_key_create, object_find_create)
(object_key_get, object_key_replace, object_key_delete)
(object_iter, object_key_iter, object_name_get)
(object_key_iter_from, object_key_increment)
(object_key_decrement):
* include/corosync/engine/objdb.h (object_key_change_notify_fn_t)
(object_create_notify_fn_t, object_destroy_notify_fn_t)
(object_len, key_len, validate_callback, object_create)
(object_key_create, object_find_create, object_key_get)
(object_key_replace, object_key_delete, object_iter)
(object_key_iter, object_name_get, object_key_iter_from)
(object_key_increment, object_key_decrement):
* lib/confdb.c (confdb_object_create, confdb_key_create)
(confdb_key_delete, confdb_key_get, confdb_key_increment)
(confdb_key_decrement, confdb_key_replace, confdb_object_find)
(confdb_object_iter, confdb_key_iter):
* lib/sa-confdb.c (confdb_sa_object_create, confdb_sa_key_create)
(confdb_sa_key_delete, confdb_sa_key_get)
(confdb_sa_key_increment, confdb_sa_key_decrement)
(confdb_sa_key_replace, confdb_sa_object_find)
(confdb_sa_object_iter, confdb_sa_key_iter):
* lib/sa-confdb.h:
* services/confdb.c (message_handler_req_lib_confdb_key_replace):
* services/votequorum.c (objdb_get_string, objdb_get_int)
(quorum_key_change_notify, votequorum_objdb_reload_notify):

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2040 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/mainconfig.c

@@ -66,7 +66,7 @@ static void add_logsys_config_notification(
 
 /* This just makes the code below a little neater */
 static inline int objdb_get_string (
-	struct objdb_iface_ver0 *objdb,
+	const struct objdb_iface_ver0 *objdb,
 	hdb_handle_t object_service_handle,
 	const char *key, char **value)
 {
@@ -87,7 +87,7 @@ static inline int objdb_get_string (
 }
 
 static inline void objdb_get_int (
-	struct objdb_iface_ver0 *objdb,
+	const struct objdb_iface_ver0 *objdb,
 	hdb_handle_t object_service_handle,
 	char *key, unsigned int *intvalue)
 {

exec/totemconfig.c

@@ -89,7 +89,7 @@ static void add_totem_config_notification(
 
 /* These just makes the code below a little neater */
 static inline int objdb_get_string (
-	struct objdb_iface_ver0 *objdb,
+	const struct objdb_iface_ver0 *objdb,
 	hdb_handle_t object_service_handle,
 	const char *key, const char **value)
 {
@@ -110,7 +110,7 @@ static inline int objdb_get_string (
 }
 
 static inline void objdb_get_int (
-	struct objdb_iface_ver0 *objdb,
+	const struct objdb_iface_ver0 *objdb,
 	hdb_handle_t object_service_handle,
 	const char *key, unsigned int *intvalue)
 {
@@ -672,7 +672,7 @@ int totem_config_keyread (
 		got_key = 1;
 	} else { /* Or the key itself may be in the objdb */
 		char *key = NULL;
-		int key_len;
+		size_t key_len;
 		res = objdb->object_key_get (object_totem_handle,
 			"key",
 			strlen ("key"),
@@ -711,9 +711,9 @@ key_error:
 static void totem_key_change_notify(object_change_type_t change_type,
 			      hdb_handle_t parent_object_handle,
 			      hdb_handle_t object_handle,
-			      const void *object_name_pt, int object_name_len,
-			      const void *key_name_pt, int key_len,
-			      const void *key_value_pt, int key_value_len,
+			      const void *object_name_pt, size_t object_name_len,
+			      const void *key_name_pt, size_t key_len,
+			      const void *key_value_pt, size_t key_value_len,
 			      void *priv_data_pt)
 {
 	struct totem_config *totem_config = priv_data_pt;

include/corosync/confdb.h

@@ -154,7 +154,7 @@ cs_error_t confdb_object_create (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	hdb_handle_t *object_handle);
 
 cs_error_t confdb_object_destroy (
@@ -173,17 +173,17 @@ cs_error_t confdb_key_create (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len);
+	size_t value_len);
 
 cs_error_t confdb_key_delete (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len);
+	size_t value_len);
 
 /*
  * Key queries
@@ -192,32 +192,32 @@ cs_error_t confdb_key_get (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	void *value,
-	int *value_len);
+	size_t *value_len);
 
 cs_error_t confdb_key_replace (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *old_value,
-	int old_value_len,
+	size_t old_value_len,
 	const void *new_value,
-	int new_value_len);
+	size_t new_value_len);
 
 cs_error_t confdb_key_increment (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value);
 
 cs_error_t confdb_key_decrement (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value);
 
 /*
@@ -234,7 +234,7 @@ cs_error_t confdb_object_find (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	hdb_handle_t *object_handle);
 
 cs_error_t confdb_object_find_destroy(
@@ -250,7 +250,7 @@ cs_error_t confdb_object_iter (
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t *object_handle,
 	void *object_name,
-	int *object_name_len);
+	size_t *object_name_len);
 
 cs_error_t confdb_object_iter_destroy(
 	confdb_handle_t handle,
@@ -267,9 +267,9 @@ cs_error_t confdb_key_iter (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	void *key_name,
-	int *key_name_len,
+	size_t *key_name_len,
 	void *value,
-	int *value_len);
+	size_t *value_len);
 
 /*
  * Get/set context variable

include/corosync/engine/coroapi.h

@@ -44,7 +44,7 @@ typedef void * corosync_timer_handle_t;
 
 struct corosync_tpg_group {
 	const void *group;
-	int group_len;
+	size_t group_len;
 };
 
 #define TOTEMIP_ADDRLEN (sizeof(struct in6_addr))
@@ -136,14 +136,14 @@ typedef enum {
 
 struct object_valid {
 	char *object_name;
-	int object_len;
+	size_t object_len;
 };
 
 struct object_key_valid {
 	char *key_name;
-	int key_len;
-	int (*validate_callback) (const void *key, int key_len,
-				  const void *value, int value_len);
+	size_t key_len;
+	int (*validate_callback) (const void *key, size_t key_len,
+				  const void *value, size_t value_len);
 };
 /* deprecated */
 
@@ -168,33 +168,33 @@ typedef void (*object_key_change_notify_fn_t)(
 	object_change_type_t change_type,
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	const void *object_name_pt, int object_name_len,
-	const void *key_name_pt, int key_len,
-	const void *key_value_pt, int key_value_len,
-	void *priv_data_pt);
+	const void *object_name_pt, size_t object_name_len,
+	const void *key_name_pt, size_t key_len,
+	const void *key_value_pt, size_t key_value_len,
+	const void *priv_data_pt);
 
 typedef void (*object_create_notify_fn_t) (
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	const uint8_t *name_pt, int name_len,
-	void *priv_data_pt);
+	const uint8_t *name_pt, size_t name_len,
+	const void *priv_data_pt);
 
 typedef void (*object_destroy_notify_fn_t) (
 	hdb_handle_t parent_object_handle,
-	const uint8_t *name_pt, int name_len,
-	void *priv_data_pt);
+	const uint8_t *name_pt, size_t name_len,
+	const void *priv_data_pt);
 
 typedef void (*object_notify_callback_fn_t)(
 	hdb_handle_t object_handle,
-	const void *key_name, int key_len,
-	const void *value, int value_len,
+	const void *key_name, size_t key_len,
+	const void *value, size_t value_len,
 	object_change_type_t type,
-	void * priv_data_pt);
+	const void * priv_data_pt);
 
 typedef void (*object_reload_notify_fn_t) (
 	objdb_reload_notify_type_t,
 	int flush,
-	void *priv_data_pt);
+	const void *priv_data_pt);
 
 #endif /* OBJECT_PARENT_HANDLE_DEFINED */
 
@@ -224,7 +224,8 @@ struct corosync_api_v1 {
 	int (*object_create) (
 		hdb_handle_t parent_object_handle,
 		hdb_handle_t *object_handle,
-		const void *object_name, unsigned int object_name_len);
+		const void *object_name,
+		size_t object_name_len);
 
 	int (*object_priv_set) (
 		hdb_handle_t object_handle,
@@ -233,9 +234,9 @@ struct corosync_api_v1 {
 	int (*object_key_create) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		const void *value,
-		int value_len);
+		size_t value_len);
 
 	int (*object_destroy) (
 		hdb_handle_t object_handle);
@@ -253,7 +254,7 @@ struct corosync_api_v1 {
 	int (*object_find_create) (
 		hdb_handle_t parent_object_handle,
 		const void *object_name,
-		int object_name_len,
+		size_t object_name_len,
 		hdb_handle_t *object_find_handle);
 
 	int (*object_find_next) (
@@ -266,9 +267,9 @@ struct corosync_api_v1 {
 	int (*object_key_get) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_priv_get) (
 		hdb_handle_t jobject_handle,
@@ -277,14 +278,14 @@ struct corosync_api_v1 {
 	int (*object_key_replace) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		const void *new_value,
-		int new_value_len);
+		size_t new_value_len);
 
 	int (*object_key_delete) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len);
+		size_t key_len);
 
 	int (*object_iter_reset) (
 		hdb_handle_t parent_object_handle);
@@ -292,7 +293,7 @@ struct corosync_api_v1 {
 	int (*object_iter) (
 		hdb_handle_t parent_object_handle,
 		void **object_name,
-		int *name_len,
+		size_t *name_len,
 		hdb_handle_t *object_handle);
 
 	int (*object_key_iter_reset) (
@@ -301,9 +302,9 @@ struct corosync_api_v1 {
 	int (*object_key_iter) (
 		hdb_handle_t parent_object_handle,
 		void **key_name,
-		int *key_len,
+		size_t *key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_parent_get) (
 		hdb_handle_t object_handle,
@@ -312,7 +313,7 @@ struct corosync_api_v1 {
 	int (*object_name_get) (
 		hdb_handle_t object_handle,
 		char *object_name,
-		int *object_name_len);
+		size_t *object_name_len);
 
 	int (*object_dump) (
 		hdb_handle_t object_handle,
@@ -322,9 +323,9 @@ struct corosync_api_v1 {
 		hdb_handle_t parent_object_handle,
 		hdb_handle_t start_pos,
 		void **key_name,
-		int *key_len,
+		size_t *key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_track_start) (
 		hdb_handle_t object_handle,
@@ -350,13 +351,13 @@ struct corosync_api_v1 {
 	int (*object_key_increment) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		unsigned int *value);
 
 	int (*object_key_decrement) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		unsigned int *value);
 
 	/*

include/corosync/engine/objdb.h

@@ -63,18 +63,18 @@ typedef void (*object_key_change_notify_fn_t)(
 	object_change_type_t change_type,
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	const void *object_name_pt, int object_name_len,
-	const void *key_name_pt, int key_len,
-	const void *key_value_pt, int key_value_len,
-void *priv_data_pt);
+	const void *object_name_pt, size_t object_name_len,
+	const void *key_name_pt, size_t key_len,
+	const void *key_value_pt, size_t key_value_len,
+	const void *priv_data_pt);
 
 typedef void (*object_create_notify_fn_t) (unsigned int parent_object_handle,
 hdb_handle_t object_handle,
-const void *name_pt, int name_len,
+const void *name_pt, size_t name_len,
 void *priv_data_pt);
 
 typedef void (*object_destroy_notify_fn_t) (unsigned int parent_object_handle,
-											void *name_pt, int name_len,
+					    void *name_pt, size_t name_len,
 											void *priv_data_pt);
 
 typedef void (*object_reload_notify_fn_t) (objdb_reload_notify_type_t, int flush,
@@ -82,14 +82,14 @@ typedef void (*object_reload_notify_fn_t) (objdb_reload_notify_type_t, int flush
 
 struct object_valid {
 	char *object_name;
-	int object_len;
+	size_t object_len;
 };
 
 struct object_key_valid {
 	char *key_name;
-	int key_len;
-	int (*validate_callback) (const void *key, int key_len,
-				  const void *value, int value_len);
+	size_t key_len;
+	int (*validate_callback) (const void *key, size_t key_len,
+				  const void *value, size_t value_len);
 };
 
 struct objdb_iface_ver0 {
@@ -99,7 +99,7 @@ struct objdb_iface_ver0 {
 		hdb_handle_t parent_object_handle,
 		hdb_handle_t *object_handle,
 		const void *object_name,
-		unsigned int object_name_len);
+		size_t object_name_len);
 
 	int (*object_priv_set) (
 		hdb_handle_t object_handle,
@@ -108,9 +108,9 @@ struct objdb_iface_ver0 {
 	int (*object_key_create) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		const void *value,
-		int value_len);
+		size_t value_len);
 
 	int (*object_destroy) (
 		hdb_handle_t object_handle);
@@ -128,7 +128,7 @@ struct objdb_iface_ver0 {
 	int (*object_find_create) (
 		hdb_handle_t parent_object_handle,
 		const void *object_name,
-		int object_name_len,
+		size_t object_name_len,
 		hdb_handle_t *object_find_handle);
 
 	int (*object_find_next) (
@@ -141,9 +141,9 @@ struct objdb_iface_ver0 {
 	int (*object_key_get) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_priv_get) (
 		hdb_handle_t jobject_handle,
@@ -152,14 +152,14 @@ struct objdb_iface_ver0 {
 	int (*object_key_replace) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		const void *new_value,
-		int new_value_len);
+		size_t new_value_len);
 
 	int (*object_key_delete) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len);
+		size_t key_len);
 
 	int (*object_iter_reset) (
 		hdb_handle_t parent_object_handle);
@@ -167,7 +167,7 @@ struct objdb_iface_ver0 {
 	int (*object_iter) (
 		hdb_handle_t parent_object_handle,
 		void **object_name,
-		int *name_len,
+		size_t *name_len,
 		hdb_handle_t *object_handle);
 
 	int (*object_key_iter_reset) (
@@ -176,9 +176,9 @@ struct objdb_iface_ver0 {
 	int (*object_key_iter) (
 		hdb_handle_t parent_object_handle,
 		void **key_name,
-		int *key_len,
+		size_t *key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_parent_get) (
 		hdb_handle_t object_handle,
@@ -187,7 +187,7 @@ struct objdb_iface_ver0 {
 	int (*object_name_get) (
 		hdb_handle_t object_handle,
 		char *object_name,
-		int *object_name_len);
+		size_t *object_name_len);
 
 	int (*object_dump) (
 		hdb_handle_t object_handle,
@@ -197,9 +197,9 @@ struct objdb_iface_ver0 {
 		hdb_handle_t parent_object_handle,
 		hdb_handle_t start_pos,
 		void **key_name,
-		int *key_len,
+		size_t *key_len,
 		void **value,
-		int *value_len);
+		size_t *value_len);
 
 	int (*object_track_start) (
 		hdb_handle_t object_handle,
@@ -226,13 +226,13 @@ struct objdb_iface_ver0 {
 	int (*object_key_increment) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		unsigned int *value);
 
 	int (*object_key_decrement) (
 		hdb_handle_t object_handle,
 		const void *key_name,
-		int key_len,
+		size_t key_len,
 		unsigned int *value);
 };
 

lib/confdb.c

@@ -430,7 +430,7 @@ cs_error_t confdb_object_create (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	hdb_handle_t *object_handle)
 {
 	cs_error_t error;
@@ -693,9 +693,9 @@ cs_error_t confdb_key_create (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len)
+	size_t value_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;
@@ -755,9 +755,9 @@ cs_error_t confdb_key_delete (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len)
+	size_t value_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;
@@ -817,9 +817,9 @@ cs_error_t confdb_key_get (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	void *value,
-	int *value_len)
+	size_t *value_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;
@@ -881,7 +881,7 @@ cs_error_t confdb_key_increment (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value)
 {
 	cs_error_t error;
@@ -943,7 +943,7 @@ cs_error_t confdb_key_decrement (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value)
 {
 	cs_error_t error;
@@ -1005,11 +1005,11 @@ cs_error_t confdb_key_replace (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *old_value,
-	int old_value_len,
+	size_t old_value_len,
 	const void *new_value,
-	int new_value_len)
+	size_t new_value_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;
@@ -1177,7 +1177,7 @@ cs_error_t confdb_object_find (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	hdb_handle_t *object_handle)
 {
 	cs_error_t error;
@@ -1250,7 +1250,7 @@ cs_error_t confdb_object_iter (
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t *object_handle,
 	void *object_name,
-	int *object_name_len)
+	size_t *object_name_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;
@@ -1325,9 +1325,9 @@ cs_error_t confdb_key_iter (
 	confdb_handle_t handle,
 	hdb_handle_t parent_object_handle,
 	void *key_name,
-	int *key_name_len,
+	size_t *key_name_len,
 	void *value,
-	int *value_len)
+	size_t *value_len)
 {
 	cs_error_t error;
 	struct confdb_inst *confdb_inst;

lib/sa-confdb.c

@@ -196,7 +196,7 @@ int confdb_sa_init (void)
 int confdb_sa_object_create (
 	hdb_handle_t parent_object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	hdb_handle_t *object_handle)
 {
 	return objdb->object_create(parent_object_handle,
@@ -220,9 +220,9 @@ int confdb_sa_object_parent_get (
 int confdb_sa_key_create (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len)
+	size_t value_len)
 {
 	return objdb->object_key_create(parent_object_handle,
 					key_name, key_name_len,
@@ -232,9 +232,9 @@ int confdb_sa_key_create (
 int confdb_sa_key_delete (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *value,
-	int value_len)
+	size_t value_len)
 {
 	return objdb->object_key_delete(parent_object_handle,
 					key_name, key_name_len);
@@ -243,9 +243,9 @@ int confdb_sa_key_delete (
 int confdb_sa_key_get (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	void *value,
-	int *value_len)
+	size_t *value_len)
 {
 	int res;
 	void *kvalue;
@@ -262,7 +262,7 @@ int confdb_sa_key_get (
 int confdb_sa_key_increment (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value)
 {
 	int res;
@@ -276,7 +276,7 @@ int confdb_sa_key_increment (
 int confdb_sa_key_decrement (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	unsigned int *value)
 {
 	int res;
@@ -291,11 +291,11 @@ int confdb_sa_key_decrement (
 int confdb_sa_key_replace (
 	hdb_handle_t parent_object_handle,
 	const void *key_name,
-	int key_name_len,
+	size_t key_name_len,
 	const void *old_value,
-	int old_value_len,
+	size_t old_value_len,
 	const void *new_value,
-	int new_value_len)
+	size_t new_value_len)
 {
 	return objdb->object_key_replace(parent_object_handle,
 					 key_name, key_name_len,
@@ -340,7 +340,7 @@ int confdb_sa_object_find (
 	hdb_handle_t *find_handle,
 	hdb_handle_t *object_handle,
 	const void *object_name,
-	int object_name_len)
+	size_t object_name_len)
 {
 	int res;
 
@@ -360,9 +360,9 @@ int confdb_sa_object_iter (
 	hdb_handle_t *find_handle,
 	hdb_handle_t *object_handle,
 	const void *object_name,
-	int object_name_len,
+	size_t object_name_len,
 	void *found_object_name,
-	int *found_object_name_len)
+	size_t *found_object_name_len)
 {
 	int res;
 
@@ -386,9 +386,9 @@ int confdb_sa_key_iter (
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t start_pos,
 	void *key_name,
-	int *key_name_len,
+	size_t *key_name_len,
 	void *value,
-	int *value_len)
+	size_t *value_len)
 {
 	int res;
 	void *kname, *kvalue;

lib/sa-confdb.h

@@ -33,18 +33,61 @@
  */
 
 extern int confdb_sa_init(void);
-extern int confdb_sa_object_create(hdb_handle_t parent_object_handle, const void *object_name, int object_name_len, hdb_handle_t *object_handle);
+extern int confdb_sa_object_create(hdb_handle_t parent_object_handle,
+				   const void *object_name,
+				   size_t object_name_len,
+				   hdb_handle_t *object_handle);
 extern int confdb_sa_object_destroy(hdb_handle_t object_handle);
-extern int confdb_sa_object_parent_get(hdb_handle_t object_handle, hdb_handle_t *parent_object_handle);
-extern int confdb_sa_key_create(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, const void *value, int value_len);
-extern int confdb_sa_key_delete(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, const void *value, int value_len);
-extern int confdb_sa_key_get(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, void *value, int *value_len);
-extern int confdb_sa_key_replace(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, const void *old_value, int old_value_len, const void *new_value, int new_value_len);
-extern int confdb_sa_object_find(hdb_handle_t parent_object_handle, hdb_handle_t *find_handle, hdb_handle_t *object_handle, const void *object_name, int object_name_len);
-extern int confdb_sa_object_iter(hdb_handle_t parent_object_handle, hdb_handle_t *find_handle, hdb_handle_t *object_handle, const void *object_name, int object_name_len, void *found_object_name, int *found_object_name_len);
-extern int confdb_sa_key_iter(hdb_handle_t parent_object_handle, hdb_handle_t start_pos, void *key_name, int *key_name_len, void *value, int *value_len);
-extern int confdb_sa_key_increment(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, unsigned int *value);
-extern int confdb_sa_key_decrement(hdb_handle_t parent_object_handle, const void *key_name, int key_name_len, unsigned int *value);
+extern int confdb_sa_object_parent_get(hdb_handle_t object_handle,
+				       hdb_handle_t *parent_object_handle);
+extern int confdb_sa_key_create(hdb_handle_t parent_object_handle,
+				const void *key_name,
+				size_t key_name_len,
+				const void *value,
+				size_t value_len);
+extern int confdb_sa_key_delete(hdb_handle_t parent_object_handle,
+				const void *key_name,
+				size_t key_name_len,
+				const void *value,
+				size_t value_len);
+extern int confdb_sa_key_get(hdb_handle_t parent_object_handle,
+			     const void *key_name,
+			     size_t key_name_len,
+			     void *value,
+			     size_t *value_len);
+extern int confdb_sa_key_replace(hdb_handle_t parent_object_handle,
+				 const void *key_name,
+				 size_t key_name_len,
+				 const void *old_value,
+				 size_t old_value_len,
+				 const void *new_value,
+				 size_t new_value_len);
+extern int confdb_sa_object_find(hdb_handle_t parent_object_handle,
+				 hdb_handle_t *find_handle,
+				 hdb_handle_t *object_handle,
+				 const void *object_name,
+				 size_t object_name_len);
+extern int confdb_sa_object_iter(hdb_handle_t parent_object_handle,
+				 hdb_handle_t *find_handle,
+				 hdb_handle_t *object_handle,
+				 const void *object_name,
+				 size_t object_name_len,
+				 void *found_object_name,
+				 size_t *found_object_name_len);
+extern int confdb_sa_key_iter(hdb_handle_t parent_object_handle,
+			      hdb_handle_t start_pos,
+			      void *key_name,
+			      size_t *key_name_len,
+			      void *value,
+			      size_t *value_len);
+extern int confdb_sa_key_increment(hdb_handle_t parent_object_handle,
+				   const void *key_name,
+				   size_t key_name_len,
+				   unsigned int *value);
+extern int confdb_sa_key_decrement(hdb_handle_t parent_object_handle,
+				   const void *key_name,
+				   size_t key_name_len,
+				   unsigned int *value);
 extern int confdb_sa_find_destroy(hdb_handle_t find_handle);
 extern int confdb_sa_write(char *error_text, size_t errbuf_len);
 extern int confdb_sa_reload(int flush, char *error_text, size_t errbuf_len);

services/confdb.c

@@ -426,7 +426,8 @@ static void message_handler_req_lib_confdb_key_decrement (void *conn, void *mess
 
 static void message_handler_req_lib_confdb_key_replace (void *conn, void *message)
 {
-	struct req_lib_confdb_key_replace *req_lib_confdb_key_replace = (struct req_lib_confdb_key_replace *)message;
+	const struct req_lib_confdb_key_replace *req_lib_confdb_key_replace
+	  = message;
 	mar_res_header_t res;
 	int ret = CS_OK;
 

services/votequorum.c

@@ -428,7 +428,8 @@ struct req_exec_quorum_killnode {
 };
 
 /* These just make the access a little neater */
-static inline int objdb_get_string(struct corosync_api_v1 *corosync, unsigned int object_service_handle,
+static inline int objdb_get_string(const struct corosync_api_v1 *corosync,
+				   unsigned int object_service_handle,
 				   char *key, char **value)
 {
 	int res;
@@ -445,7 +446,7 @@ static inline int objdb_get_string(struct corosync_api_v1 *corosync, unsigned in
 	return -1;
 }
 
-static inline void objdb_get_int(struct corosync_api_v1 *corosync,
+static inline void objdb_get_int(const struct corosync_api_v1 *corosync,
 				 unsigned int object_service_handle,
 				 const char *key, unsigned int *intvalue,
 				 unsigned int default_value)
@@ -1625,10 +1626,10 @@ static void quorum_key_change_notify(object_change_type_t change_type,
 				     hdb_handle_t parent_object_handle,
 				     hdb_handle_t object_handle,
 				     const void *object_name_pt,
-				     int object_name_len,
-				     const void *key_name_pt, int key_len,
-				     const void *key_value_pt, int key_value_len,
-				     void *priv_data_pt)
+				     size_t object_name_len,
+				     const void *key_name_pt, size_t key_len,
+				     const void *key_value_pt, size_t key_value_len,
+				     const void *priv_data_pt)
 {
 	if (memcmp(object_name_pt, "quorum", object_name_len) == 0)
 		reread_config(object_handle);
@@ -1638,7 +1639,7 @@ static void quorum_key_change_notify(object_change_type_t change_type,
 /* Called when the objdb is reloaded */
 static void votequorum_objdb_reload_notify(
 	objdb_reload_notify_type_t type, int flush,
-	void *priv_data_pt)
+	const void *priv_data_pt)
 {
 	/*
 	 * A new quorum {} key might exist, cancel the