remove invalid code / warnings detected by Intel compiler

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

exec/ipc.c

@@ -1171,7 +1171,7 @@ retry_sendmsg_two:
 			conn_info->events = POLLIN|POLLNVAL;
 		}
 		if (res != -1) {
-			if (res + conn_info->byte_start != mlen) {
+			if (res != mlen) {
 				conn_info->byte_start += res;
 				res = -1;
 			} else {

exec/totemconfig.c

@@ -120,7 +120,6 @@ extern int totem_config_read (
 	char **error_string)
 {
 	int res = 0;
-	int parse_done = 0;
 	unsigned int object_totem_handle;
 	unsigned int object_interface_handle;
 	char *str;
@@ -129,7 +128,6 @@ extern int totem_config_read (
 	memset (totem_config, 0, sizeof (struct totem_config));
 	totem_config->interfaces = malloc (sizeof (struct totem_interface) * INTERFACE_MAX);
 	if (totem_config->interfaces == 0) {
-		parse_done = 1;
 		*error_string = "Out of memory trying to allocate ethernet interface storage area";
 		return -1;
 	}

exec/totemnet.c

@@ -248,7 +248,6 @@ static int authenticate_and_decrypt (
 	unsigned char *initial_vector = &keys[0];
 	unsigned char digest_comparison[HMAC_HASH_SIZE];
 	unsigned long len;
-	int res = 0;
 
 	/*
 	 * Generate MAC, CIPHER, IV keys from private key
@@ -283,7 +282,6 @@ static int authenticate_and_decrypt (
 
 	if (memcmp (digest_comparison, header->hash_digest, len) != 0) {
 		log_printf (instance->totemnet_log_level_security, "Received message has invalid digest... ignoring.\n");
-		res = -1;
 		return (-1);
 	}
 	
@@ -296,7 +294,7 @@ static int authenticate_and_decrypt (
 		(unsigned long)iov->iov_len - sizeof (struct security_header),
 		&stream_prng_state);
 
-	return (res);
+	return (0);
 }
 static void encrypt_and_sign_worker (
 	struct totemnet_instance *instance,

exec/totemrrp.c

@@ -712,7 +712,7 @@ static void passive_mcast_recv (
 			rrp_instance->totem_config->rrp_problem_count_threshold)) {
 			passive_instance->faulty[i] = 1;
 			sprintf (rrp_instance->status[i], 
-				"Marking ringid %d interface %s FAULTY - adminisrtative intervention required.",
+				"Marking ringid %u interface %s FAULTY - adminisrtative intervention required.",
 				i,
 				totemnet_iface_print (rrp_instance->net_handles[i]));
 			log_printf (
@@ -794,7 +794,7 @@ static void passive_token_recv (
 			rrp_instance->totem_config->rrp_problem_count_threshold)) {
 			passive_instance->faulty[i] = 1;
 			sprintf (rrp_instance->status[i], 
-				"Marking seqid %d ringid %d interface %s FAULTY - adminisrtative intervention required.",
+				"Marking seqid %d ringid %u interface %s FAULTY - adminisrtative intervention required.",
 				token_seq,
 				i,
 				totemnet_iface_print (rrp_instance->net_handles[i]));
@@ -1011,7 +1011,7 @@ static void timer_function_active_token_expired (void *context)
 		{
 			active_instance->faulty[i] = 1;
 			sprintf (rrp_instance->status[i], 
-				"Marking seqid %d ringid %d interface %s FAULTY - adminisrtative intervention required.",
+				"Marking seqid %d ringid %u interface %s FAULTY - adminisrtative intervention required.",
 				active_instance->last_token_seq,
 				i,
 				totemnet_iface_print (rrp_instance->net_handles[i]));
@@ -1416,7 +1416,6 @@ int totemrrp_initialize (
 		instance);
 	if (res == -1) {
 		goto error_put;
-		return (-1);
 	}
 
 	/*

include/sq.h

@@ -164,7 +164,6 @@ static inline void *sq_item_add (
 	if (sq_position > sq->pos_max) {
 		sq->pos_max = sq_position;
 	}
-	assert (sq_position >= 0);
 
 	sq_item = sq->items;
 	sq_item += sq_position * sq->size_per_item;

lcr/lcr_ifact.c

@@ -487,7 +487,6 @@ int lcr_ifact_release (unsigned int handle)
 
 	res = hdb_handle_get (&lcr_iface_instance_database,
 		handle, (void *)&iface_instance);
-	return (res);
 
 	if (iface_instance->destructor) {
 		iface_instance->destructor (iface_instance->context);

lib/ckpt.c

@@ -1864,8 +1864,6 @@ error_put:
 	saHandleInstancePut (&checkpointHandleDatabase, checkpointHandle);
 
 	return (error == SA_AIS_OK ? res_lib_ckpt_checkpointsynchronizeasync.header.error : error);
-
-	return (SA_AIS_OK);
 }
 
 /** @} */

lib/msg.c

@@ -747,7 +747,8 @@ saMsgQueueStatusGet (
 
 	saHandleInstancePut (&msgHandleDatabase, msgHandle);
 
-	error = SA_AIS_OK ? res_lib_msg_queuestatusget.header.error : error;
+	if (error == SA_AIS_OK)
+		error = res_lib_msg_queuestatusget.header.error;
 	if (error == SA_AIS_OK) {
 		memcpy (queueStatus, &res_lib_msg_queuestatusget.queueStatus,
 			sizeof (SaMsgQueueStatusT));
@@ -1137,7 +1138,8 @@ saMsgMessageGet (
 
 	saHandleInstancePut (&queueHandleDatabase, queueHandle);
 	
-	error = SA_AIS_OK ? res_lib_msg_messageget.header.error : error;
+	if (error == SA_AIS_OK)
+		error = res_lib_msg_messageget.header.error;
 	if (error == SA_AIS_OK) {
 		*sendTime = res_lib_msg_messageget.sendTime;
 		memcpy (senderId, &res_lib_msg_messageget.senderId,
@@ -1215,7 +1217,8 @@ saMsgMessageSendReceive (
 
 	saHandleInstancePut (&msgHandleDatabase, msgHandle);
 	
-	error = SA_AIS_OK ? res_lib_msg_messagesendreceive.header.error : error;
+	if (error == SA_AIS_OK)
+		error = res_lib_msg_messagesendreceive.header.error;
 	if (error == SA_AIS_OK) {
 		*replySendTime = res_lib_msg_messagesendreceive.replySendTime;
 	}