[corosync] [PATCH] Fix last warnings so we can build with --enable-fatal-warnings

Angus Salkeld asalkeld at redhat.com
Mon Nov 14 22:44:41 GMT 2011


On Thu, Nov 10, 2011 at 08:31:43PM -0700, Steven Dake wrote:
> Reviewed-by: Steven Dake <sdake at redhat.com>
> 
> Not excited about enable-fatal-warnings by default..  Makes distro
> maintenance difficult.

Don't stress, I wasn't suggesting we do that we do it by default.
But it could be done in something like buildbot.

-A

> 
> On 11/10/2011 03:15 PM, Angus Salkeld wrote:
> > Signed-off-by: Angus Salkeld <asalkeld at redhat.com>
> > ---
> >  test/testsam.c           |    1 +
> >  tools/corosync-notifyd.c |    6 ------
> >  2 files changed, 1 insertions(+), 6 deletions(-)
> > 
> > diff --git a/test/testsam.c b/test/testsam.c
> > index 28bc7dc..46f0de9 100644
> > --- a/test/testsam.c
> > +++ b/test/testsam.c
> > @@ -272,6 +272,7 @@ static int test3 (void) {
> >  		tmp2 = rand ();
> >  		tmp3 = 0;
> >  		tmp1 = tmp2 / tmp3;
> > +		tmp3 = tmp1;
> >  
> >  		return 1;
> >  	}
> > diff --git a/tools/corosync-notifyd.c b/tools/corosync-notifyd.c
> > index 767c949..aba0045 100644
> > --- a/tools/corosync-notifyd.c
> > +++ b/tools/corosync-notifyd.c
> > @@ -450,7 +450,6 @@ static void
> >  _cs_dbus_node_quorum_event(char *nodename, uint32_t nodeid, const char *state)
> >  {
> >  	DBusMessage *msg = NULL;
> > -	int ret = -1;
> >  
> >  	if (err_set) {
> >  		qb_log(LOG_ERR, "%s", _err);
> > @@ -487,7 +486,6 @@ _cs_dbus_node_quorum_event(char *nodename, uint32_t nodeid, const char *state)
> >  	}
> >  
> >  	dbus_connection_send(db, msg, NULL);
> > -	ret = 0;
> >  
> >  out_unlock:
> >  	if (msg) {
> > @@ -501,7 +499,6 @@ static void
> >  _cs_dbus_node_membership_event(char *nodename, uint32_t nodeid, char *state, char* ip)
> >  {
> >  	DBusMessage *msg = NULL;
> > -	int ret = -1;
> >  
> >  	if (err_set) {
> >  		qb_log(LOG_ERR, "%s", _err);
> > @@ -539,7 +536,6 @@ _cs_dbus_node_membership_event(char *nodename, uint32_t nodeid, char *state, cha
> >  	}
> >  
> >  	dbus_connection_send(db, msg, NULL);
> > -	ret = 0;
> >  
> >  out_unlock:
> >  	if (msg) {
> > @@ -553,7 +549,6 @@ static void
> >  _cs_dbus_application_connection_event(char *nodename, uint32_t nodeid, char *app_name, const char *state)
> >  {
> >  	DBusMessage *msg = NULL;
> > -	int ret = -1;
> >  
> >  	if (err_set) {
> >  		qb_log(LOG_ERR, "%s", _err);
> > @@ -591,7 +586,6 @@ _cs_dbus_application_connection_event(char *nodename, uint32_t nodeid, char *app
> >  	}
> >  
> >  	dbus_connection_send(db, msg, NULL);
> > -	ret = 0;
> >  
> >  out_unlock:
> >  	if (msg) {


More information about the discuss mailing list