remove invalid code / warnings detected by Intel compiler

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

diff --git a/exec/ipc.c b/exec/ipc.c
index 6812c812a783950911b41fcc5cf6cf007d4c48b0..253c5b701ba6f0625b168858a656e087d3a631c5 100644 (file)
--- a/exec/ipc.c
+++ b/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 {

diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index d68e617d22bf13f3c7e36332f90c60112eb653df..5c5a27bf649c99dce430816d2c7c8521c8b76736 100644 (file)
--- a/exec/totemconfig.c
+++ b/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;
        }

diff --git a/exec/totemnet.c b/exec/totemnet.c
index 4cf5999c34d07b053437cb984df040ecffa9a8a9..0eaf54e9ce1569bb67875d73c1e8df8fdf65edda 100644 (file)
--- a/exec/totemnet.c
+++ b/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,

diff --git a/exec/totemrrp.c b/exec/totemrrp.c
index bb84e4f8c6ba3c56f58c6e6e385a52e5244d729f..9b99187669ec28396032d5c5e5a1b64ac3db18d1 100644 (file)
--- a/exec/totemrrp.c
+++ b/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);
        }
 
        /*

diff --git a/include/sq.h b/include/sq.h
index ea7d51a2637785ea72a58ae30de18f614432c0f0..f5514677e4517f46e2a5be2f95ae66cffd710363 100644 (file)
--- a/include/sq.h
+++ b/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;

diff --git a/lcr/lcr_ifact.c b/lcr/lcr_ifact.c
index d3107669c46421ac3235f97a0ec32289ef0df489..5a2ce254da84b119b4a347015307435303daab35 100644 (file)
--- a/lcr/lcr_ifact.c
+++ b/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);

diff --git a/lib/ckpt.c b/lib/ckpt.c
index cc5fb21710ca00efd4d6b51c02ae8192dd30658e..70c6dee64221b031f627d4496956d64df5064aeb 100644 (file)
--- a/lib/ckpt.c
+++ b/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);
 }
 
 /** @} */

diff --git a/lib/msg.c b/lib/msg.c
index a17656a56258b6dbe39c570e2f87eac2b80741ed..8c3f8f7b97d7edfe8fcbd56284167c4af446c057 100644 (file)
--- a/lib/msg.c
+++ b/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;
        }