From: Juho Vähä-Herttua <juhovh@iki.fi>
Date: Wed, 26 Feb 2014 10:07:52 +0000 (+0200)
Subject: Clean up a series of ifs, remove redundant processing.
X-Git-Tag: upstream/0.9.0~4^2~10
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=51114600970199152e737dce64f0aa2d9e266c2c;p=deb_shairplay.git

Clean up a series of ifs, remove redundant processing.

Also add brackets, we do not want to make the same kind of mistake
Apple did with their SSL goto bug.
---

diff --git a/src/lib/digest.c b/src/lib/digest.c
index 2291215..58c8578 100644
--- a/src/lib/digest.c
+++ b/src/lib/digest.c
@@ -128,16 +128,17 @@ digest_is_valid(const char *our_realm, const char *password,
 		else *last = '\0';
 
 		/* Store value if it is relevant */
-		if (!strncmp("username=\"", first, 10))
+		if (!strncmp("username=\"", first, 10)) {
 			username = first+10;
-		if (!strncmp("realm=\"", first, 7))
+		} else if (!strncmp("realm=\"", first, 7)) {
 			realm = first+7;
-		if (!strncmp("nonce=\"", first, 7))
+		} else if (!strncmp("nonce=\"", first, 7)) {
 			nonce = first+7;
-		if (!strncmp("uri=\"", first, 5))
+		} else if (!strncmp("uri=\"", first, 5)) {
 			uri = first+5;
-		if (!strncmp("response=\"", first, 10))
+		} else if (!strncmp("response=\"", first, 10)) {
 			response = first+10;
+		}
 	}
 
 	if (!username || !realm || !nonce || !uri || !response) {