LINT: rename the overlay struct so they are uniq.

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

diff --git a/exec/ipc.c b/exec/ipc.c
index 91669a5f1f9e3275c5997c7a0e06f9cc43a61cf0..4a13f185ee7bb7a987e1585082e6e30fce5e5f2b 100644 (file)
--- 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 6d0375e9be6c0637a51968766eb0b4d6f72ab233..318db8ea3488bc2447e2ebdb69d5d2a256963197 100755 (executable)
--- 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 626502236d40fe6291c9c79a79ea0608ec6e8779..f015e5654a6c55cb5f0ded77d5a5a55fe7e9dc24 100755 (executable)
--- 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 b115c3940e2df2d2e96bb4a3990b7241563d5ef1..ee8b560f8a984a91d6307ff5a7af235095f61ec6 100755 (executable)
--- 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 ff1c55270c7f663095c70c9cd19b6269326cdad3..eecffe9a79056b62dc421a335f10b7003f4cac43 100644 (file)
--- 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 d717885b5f75dbd5c0527b81ecf1da2a530a47be..140221c33a6c9c8299baa7208b5231cdd728fce4 100644 (file)
--- 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 08989d42ce8c5d4d13fbe047720c64f07028a696..91a48be98d28be865e23557a843665e9a7f426c3 100644 (file)
--- 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 46eb7b518630df92494c7059255df8e1df50f368..a3044fecaca65839128d79cc75a15c6cbcf0818e 100644 (file)
--- 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 64719138f8569cdb3c248dd05b369ecea20c3a47..b5b3f3163ce3953000195a9210d9050271e03d02 100644 (file)
--- 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 &&