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

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;

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
 

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;
 

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;
 

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);

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);

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];

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);

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 &&