From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 22 Feb 2013 10:30:56 +0000 (+0000)
Subject: afsmonitor: Allow CBSTATS collection to work
X-Git-Tag: upstream/1.6.8^2~71
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=440583f39b3791de9b58a2c9bd3b74aced68c182;p=packages%2Fo%2Fopenafs.git

afsmonitor: Allow CBSTATS collection to work

The switch which selects the collection number was missing a
'break', so selecting the CBSTATS collection would always fall
through to the default, error, case.

Caught by clang-analyzer

Reviewed-on: http://gerrit.openafs.org/9235
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 75ef02d9dfb43079f111ea22ae351cf0eec13fab)

Change-Id: I45bd1152385bdb05d1d027905b52592b1bc0869f
Reviewed-on: http://gerrit.openafs.org/10749
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
index f7992d64c..feb177d77 100644
--- a/src/afsmonitor/afsmonitor.c
+++ b/src/afsmonitor/afsmonitor.c
@@ -1735,12 +1735,11 @@ save_FS_results_inCB(int a_newProbeCycle)	/* start of a new probe cycle ? */
 	break;
     case AFS_XSTATSCOLL_CBSTATS:
 	index = 1;
+	break;
     default:
-	if (index < 0) {
-	    fprintf(stderr, "[ %s ] collection number %d is out of range.\n",
-		    rn, xstat_fs_Results.collectionNumber);
-	    afsmon_Exit(51);
-	}
+	fprintf(stderr, "[ %s ] collection number %d is out of range.\n",
+		rn, xstat_fs_Results.collectionNumber);
+	afsmon_Exit(51);
     }
 
     /* If a new probe cycle started, mark the list in the current buffer