Ver Fonte

objdb.c, etc: add "const" to avoid warnings

* exec/objdb.c:
* include/corosync/engine/coroapi.h:
* include/corosync/engine/objdb.h:

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1928 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering há 17 anos atrás
pai
commit
b107445d5a
3 ficheiros alterados com 20 adições e 19 exclusões
  1. 14 14
      exec/objdb.c
  2. 2 2
      include/corosync/engine/coroapi.h
  3. 4 3
      include/corosync/engine/objdb.h

+ 14 - 14
exec/objdb.c

@@ -294,8 +294,8 @@ static void object_pre_deletion_notification(hdb_handle_t object_handle,
 }
 
 static void object_key_changed_notification(hdb_handle_t object_handle,
-	void *name_pt,	int name_len,
-	void *value_pt, int value_len,
+	const void *name_pt, int name_len,
+	const void *value_pt, int value_len,
 	object_change_type_t type)
 {
 	struct list_head * list;
@@ -490,9 +490,9 @@ error_exit:
 
 static int object_key_create (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len,
-	void *value,
+	const void *value,
 	int value_len)
 {
 	struct object_instance *instance;
@@ -582,7 +582,7 @@ static int object_key_create (
 	object_key->value_len = value_len;
 
 	object_key_changed_notification(object_handle, key_name, key_len,
-								value, value_len, OBJECT_KEY_CREATED);
+					value, value_len, OBJECT_KEY_CREATED);
 	objdb_rdunlock();
 	return (0);
 
@@ -731,7 +731,7 @@ error_exit:
  */
 static int object_find_create (
 	hdb_handle_t object_handle,
-	void *object_name,
+	const void *object_name,
 	int object_len,
 	hdb_handle_t *object_find_handle)
 {
@@ -853,7 +853,7 @@ error_exit:
 
 static int object_key_get (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len,
 	void **value,
 	int *value_len)
@@ -902,7 +902,7 @@ error_exit:
 
 static int object_key_increment (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len,
 	unsigned int *value)
 {
@@ -948,7 +948,7 @@ error_exit:
 
 static int object_key_decrement (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len,
 	unsigned int *value)
 {
@@ -994,7 +994,7 @@ error_exit:
 
 static int object_key_delete (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len)
 {
 	unsigned int res;
@@ -1046,9 +1046,9 @@ error_exit:
 
 static int object_key_replace (
 	hdb_handle_t object_handle,
-	void *key_name,
+	const void *key_name,
 	int key_len,
-	void *new_value,
+	const void *new_value,
 	int new_value_len)
 {
 	unsigned int res;
@@ -1511,7 +1511,7 @@ static int object_dump(hdb_handle_t object_handle,
 	return (res);
 }
 
-static int object_write_config(char **error_string)
+static int object_write_config(const char **error_string)
 {
 	struct config_iface_ver0 **modules;
 	int num_modules;
@@ -1535,7 +1535,7 @@ static int object_write_config(char **error_string)
 	return 0;
 }
 
-static int object_reload_config(int flush, char **error_string)
+static int object_reload_config(int flush, const char **error_string)
 {
 	struct config_iface_ver0 **modules;
 	int num_modules;

+ 2 - 2
include/corosync/engine/coroapi.h

@@ -176,8 +176,8 @@ typedef void (*object_key_change_notify_fn_t)(
 typedef void (*object_create_notify_fn_t) (
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	uint8_t *name_pt, int name_len,
-	void *priv_data_pt);
+	const uint8_t *name_pt, int name_len,
+	const void *priv_data_pt);
 
 typedef void (*object_destroy_notify_fn_t) (
 	hdb_handle_t parent_object_handle,

+ 4 - 3
include/corosync/engine/objdb.h

@@ -70,8 +70,8 @@ void *priv_data_pt);
 
 typedef void (*object_create_notify_fn_t) (unsigned int parent_object_handle,
 hdb_handle_t object_handle,
-void *name_pt, int name_len,
-void *priv_data_pt);
+const void *name_pt, int name_len,
+const void *priv_data_pt);
 
 typedef void (*object_destroy_notify_fn_t) (unsigned int parent_object_handle,
 											void *name_pt, int name_len,
@@ -88,7 +88,8 @@ struct object_valid {
 struct object_key_valid {
 	char *key_name;
 	int key_len;
-	int (*validate_callback) (void *key, int key_len, void *value, int value_len);
+	int (*validate_callback) (const void *key, int key_len,
+				  const void *value, int value_len);
 };
 
 struct objdb_iface_ver0 {