On 09/23/2010 06:55 PM, Angus Salkeld wrote: > Signed-off-by: Angus Salkeld<[email protected]> > --- > include/corosync/engine/coroapi.h | 4 ++-- > include/corosync/engine/objdb.h | 18 +++++++++--------- > services/confdb.c | 8 ++++---- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/corosync/engine/coroapi.h > b/include/corosync/engine/coroapi.h > index c3c812f..e6eae24 100644 > --- a/include/corosync/engine/coroapi.h > +++ b/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)( > diff --git a/include/corosync/engine/objdb.h b/include/corosync/engine/objdb.h > index 140753a..14b12d4 100644 > --- a/include/corosync/engine/objdb.h > +++ b/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; > diff --git a/services/confdb.c b/services/confdb.c > index 90dd7db..b9de935 100644 > --- a/services/confdb.c > +++ b/services/confdb.c > @@ -129,12 +129,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( > @@ -786,7 +786,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; > @@ -804,7 +804,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; good for merge
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
