good for merge
Thanks!
-steve
On Mon, 2008-11-10 at 09:18 +1300, angus salkeld wrote:
> Avoid lint complaining of duplicate structure names.
>
> ---
> exec/ipc.c | 4 ++--
> lcr/Makefile | 2 +-
> lcr/uic.c | 6 +++---
> lcr/uis.c | 4 ++--
> lib/cfg.c | 4 ++--
> lib/confdb.c | 4 ++--
> lib/cpg.c | 4 ++--
> lib/evs.c | 4 ++--
> lib/quorum.c | 4 ++--
> 9 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/exec/ipc.c b/exec/ipc.c
> index 91669a5..4a13f18 100644
> --- a/exec/ipc.c
> +++ b/exec/ipc.c
> @@ -731,7 +731,7 @@ retry_sendmsg:
>
>
>
> -struct res_overlay {
> +struct ipc_res_overlay {
> mar_res_header_t header __attribute((aligned(8)));
> char buf[4096];
> };
> @@ -752,7 +752,7 @@ static void libais_deliver (struct conn_info *conn_info)
> int send_ok = 0;
> int send_ok_joined = 0;
> struct iovec send_ok_joined_iovec;
> - struct res_overlay res_overlay;
> + struct ipc_res_overlay res_overlay;
>
> msg_recv.msg_iov = &iov_recv;
> msg_recv.msg_iovlen = 1;
> diff --git a/lcr/Makefile b/lcr/Makefile
> index 6d0375e..318db8e 100755
> --- a/lcr/Makefile
> +++ b/lcr/Makefile
> @@ -85,5 +85,5 @@ clean:
> test_static
>
> lint:
> - -splint $(LINT_FLAGS) $(CFLAGS) *.c
> + -splint $(LINT_FLAGS) $(CFLAGS) lcr_ifact.c uic.c uis.c
>
> diff --git a/lcr/uic.c b/lcr/uic.c
> index 6265022..f015e56 100755
> --- a/lcr/uic.c
> +++ b/lcr/uic.c
> @@ -88,7 +88,7 @@ int uic_connect (int *fd)
> return 0;
> }
>
> -struct req_msg {
> +struct uic_req_msg {
> int len;
> char msg[0];
> };
> @@ -97,12 +97,12 @@ int uic_msg_send (int fd, char *msg)
> {
> struct msghdr msg_send;
> struct iovec iov_send[2];
> - struct req_msg req_msg;
> + struct uic_req_msg req_msg;
> int res;
>
> req_msg.len = strlen (msg) + 1;
> iov_send[0].iov_base = (void *)&req_msg;
> - iov_send[0].iov_len = sizeof (struct req_msg);
> + iov_send[0].iov_len = sizeof (struct uic_req_msg);
> iov_send[1].iov_base = (void *)msg;
> iov_send[1].iov_len = req_msg.len;
>
> diff --git a/lcr/uis.c b/lcr/uis.c
> index b115c39..ee8b560 100755
> --- a/lcr/uis.c
> +++ b/lcr/uis.c
> @@ -115,14 +115,14 @@ struct uis_commands uis_commands[] = {
> }
> };
>
> -struct req_msg {
> +struct uis_req_msg {
> int len;
> char msg[0];
> };
>
> static void lcr_uis_dispatch (int fd)
> {
> - struct req_msg header;
> + struct uis_req_msg header;
> char msg_contents[512];
> ssize_t readsize;
>
> diff --git a/lib/cfg.c b/lib/cfg.c
> index ff1c552..eecffe9 100644
> --- a/lib/cfg.c
> +++ b/lib/cfg.c
> @@ -52,7 +52,7 @@
> #include <corosync/ipc_cfg.h>
> #include <corosync/ais_util.h>
>
> -struct res_overlay {
> +struct cfg_res_overlay {
> mar_res_header_t header;
> char data[4096];
> };
> @@ -181,7 +181,7 @@ corosync_cfg_dispatch (
> struct res_lib_cfg_statetrackcallback *res_lib_cfg_statetrackcallback;
> #endif
> CorosyncCfgCallbacksT callbacks;
> - struct res_overlay dispatch_data;
> + struct cfg_res_overlay dispatch_data;
>
> error = saHandleInstanceGet (&cfg_hdb, cfg_handle,
> (void *)&cfg_instance);
> diff --git a/lib/confdb.c b/lib/confdb.c
> index d717885..140221c 100644
> --- a/lib/confdb.c
> +++ b/lib/confdb.c
> @@ -295,7 +295,7 @@ cs_error_t confdb_context_set (
> return (CS_OK);
> }
>
> -struct res_overlay {
> +struct confdb_res_overlay {
> mar_res_header_t header __attribute__((aligned(8)));
> char data[512000];
> };
> @@ -314,7 +314,7 @@ cs_error_t confdb_dispatch (
> struct res_lib_confdb_key_change_callback *res_key_changed_pt;
> struct res_lib_confdb_object_create_callback *res_object_created_pt;
> struct res_lib_confdb_object_destroy_callback *res_object_destroyed_pt;
> - struct res_overlay dispatch_data;
> + struct confdb_res_overlay dispatch_data;
> int ignore_dispatch = 0;
>
> error = saHandleInstanceGet (&confdb_handle_t_db, handle, (void
> *)&confdb_inst);
> diff --git a/lib/cpg.c b/lib/cpg.c
> index 08989d4..91a48be 100644
> --- a/lib/cpg.c
> +++ b/lib/cpg.c
> @@ -233,7 +233,7 @@ cs_error_t cpg_context_set (
> return (CS_OK);
> }
>
> -struct res_overlay {
> +struct cpg_res_overlay {
> mar_res_header_t header __attribute__((aligned(8)));
> char data[512000];
> };
> @@ -253,7 +253,7 @@ cs_error_t cpg_dispatch (
> struct res_lib_cpg_deliver_callback *res_cpg_deliver_callback;
> struct res_lib_cpg_groups_get_callback *res_lib_cpg_groups_get_callback;
> cpg_callbacks_t callbacks;
> - struct res_overlay dispatch_data;
> + struct cpg_res_overlay dispatch_data;
> int ignore_dispatch = 0;
> struct cpg_address member_list[CPG_MEMBERS_MAX];
> struct cpg_address left_list[CPG_MEMBERS_MAX];
> diff --git a/lib/evs.c b/lib/evs.c
> index 46eb7b5..a3044fe 100644
> --- a/lib/evs.c
> +++ b/lib/evs.c
> @@ -62,7 +62,7 @@ struct evs_inst {
> pthread_mutex_t dispatch_mutex;
> };
>
> -struct res_overlay {
> +struct evs_res_overlay {
> mar_res_header_t header __attribute__((aligned(8)));
> char data[512000];
> };
> @@ -218,7 +218,7 @@ cs_error_t evs_dispatch (
> struct res_evs_confchg_callback *res_evs_confchg_callback;
> struct res_evs_deliver_callback *res_evs_deliver_callback;
> evs_callbacks_t callbacks;
> - struct res_overlay dispatch_data;
> + struct evs_res_overlay dispatch_data;
> int ignore_dispatch = 0;
>
> error = saHandleInstanceGet (&evs_handle_t_db, handle, (void
> *)&evs_inst);
> diff --git a/lib/quorum.c b/lib/quorum.c
> index 6471913..b5b3f31 100644
> --- a/lib/quorum.c
> +++ b/lib/quorum.c
> @@ -343,7 +343,7 @@ error_exit:
> return (error);
> }
>
> -struct res_overlay {
> +struct quorum_res_overlay {
> mar_res_header_t header __attribute__((aligned(8)));
> char data[512000];
> };
> @@ -359,7 +359,7 @@ cs_error_t quorum_dispatch (
> int dispatch_avail;
> struct quorum_inst *quorum_inst;
> quorum_callbacks_t callbacks;
> - struct res_overlay dispatch_data;
> + struct quorum_res_overlay dispatch_data;
> struct res_lib_quorum_notification *res_lib_quorum_notification;
>
> if (dispatch_types != CS_DISPATCH_ONE &&
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
