cluster: STABLE32 - rgmanager: Remove dead code
Fabio M. Di Nitto
fabbione at fedoraproject.org
Wed Aug 15 13:07:11 UTC 2012
Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=5c4dbed756583c48c6c53d264bf1143b80cb372d
Commit: 5c4dbed756583c48c6c53d264bf1143b80cb372d
Parent: cfa17970cce1d850912a7cdacf29bc8492b124e6
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Fri Sep 16 13:23:54 2011 -0400
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Wed Aug 15 11:04:38 2012 +0200
rgmanager: Remove dead code
Found during static analysis
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
rgmanager/src/clulib/msg_cluster.c | 21 ++++++++++-----------
rgmanager/src/clulib/msg_socket.c | 3 ---
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/rgmanager/src/clulib/msg_cluster.c b/rgmanager/src/clulib/msg_cluster.c
index 4e58e91..9ee9e45 100644
--- a/rgmanager/src/clulib/msg_cluster.c
+++ b/rgmanager/src/clulib/msg_cluster.c
@@ -542,19 +542,18 @@ cluster_msg_receive(msgctx_t *ctx, void *msg, size_t maxlen, int timeout)
free(n);
return 0;
default:
- pthread_mutex_lock(&ctx->u.cluster_info.mutex);
- n = ctx->u.cluster_info.queue;
- list_remove(&ctx->u.cluster_info.queue, n);
- pthread_mutex_unlock(&ctx->u.cluster_info.mutex);
-
- proto_error(ctx, n->message, "Illegal request on established pchannel");
- if (n->message)
- free(n->message);
- free(n);
- return -1;
+ break;
}
- printf("%s: CODE PATH ERROR\n", __FUNCTION__);
+ pthread_mutex_lock(&ctx->u.cluster_info.mutex);
+ n = ctx->u.cluster_info.queue;
+ list_remove(&ctx->u.cluster_info.queue, n);
+ pthread_mutex_unlock(&ctx->u.cluster_info.mutex);
+
+ proto_error(ctx, n->message, "Illegal request on established pchannel");
+ if (n->message)
+ free(n->message);
+ free(n);
return -1;
}
diff --git a/rgmanager/src/clulib/msg_socket.c b/rgmanager/src/clulib/msg_socket.c
index 456858a..ae33922 100644
--- a/rgmanager/src/clulib/msg_socket.c
+++ b/rgmanager/src/clulib/msg_socket.c
@@ -257,9 +257,6 @@ sock_msg_receive(msgctx_t *ctx, void *msg, size_t maxlen, int timeout)
memcpy(msg, priv_msg, priv_len);
return req;
-
- printf("%s: CODE PATH ERROR\n", __FUNCTION__);
- return -1;
}
More information about the cluster-commits
mailing list