Pārlūkot izejas kodu

objdb: fix some strange types (uint8_t* -> void*).

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@3045 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld 15 gadi atpakaļ
vecāks
revīzija
42a44572d8

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

@@ -212,12 +212,12 @@ 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,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt);
 
 typedef void (*object_destroy_notify_fn_t) (
 	hdb_handle_t parent_object_handle,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt);
 
 typedef void (*object_notify_callback_fn_t)(

+ 9 - 9
include/corosync/engine/objdb.h

@@ -81,18 +81,18 @@ typedef void (*object_key_change_notify_fn_t)(
 	const void *key_value_pt, size_t key_value_len,
 	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, size_t name_len,
-void *priv_data_pt);
+typedef void (*object_create_notify_fn_t) (hdb_handle_t parent_object_handle,
+	hdb_handle_t object_handle,
+	const void *name_pt, size_t name_len,
+	void *priv_data_pt);
 
-typedef void (*object_destroy_notify_fn_t) (unsigned int parent_object_handle,
-					    const void *name_pt,
-					    size_t name_len,
-											void *priv_data_pt);
+typedef void (*object_destroy_notify_fn_t) (hdb_handle_t parent_object_handle,
+	const 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,
-											void *priv_data_pt);
+	void *priv_data_pt);
 
 struct object_valid {
 	char *object_name;

+ 4 - 4
services/confdb.c

@@ -131,12 +131,12 @@ static void confdb_notify_lib_of_key_change(
 static void confdb_notify_lib_of_new_object(
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt);
 
 static void confdb_notify_lib_of_destroyed_object(
 	hdb_handle_t parent_object_handle,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt);
 
 static void confdb_notify_lib_of_reload(
@@ -814,7 +814,7 @@ static void confdb_notify_lib_of_key_change(object_change_type_t change_type,
 
 static void confdb_notify_lib_of_new_object(hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt)
 {
 	struct res_lib_confdb_object_create_callback res;
@@ -832,7 +832,7 @@ static void confdb_notify_lib_of_new_object(hdb_handle_t parent_object_handle,
 
 static void confdb_notify_lib_of_destroyed_object(
 	hdb_handle_t parent_object_handle,
-	const uint8_t *name_pt, size_t name_len,
+	const void *name_pt, size_t name_len,
 	void *priv_data_pt)
 {
 	struct res_lib_confdb_object_destroy_callback res;