Merge pull request libgit2#4326 from libgit2/peff/binary-search-do-while

ethomson · web-flow · commit e536fa33749f · 2017-08-14T21:59:11.000+01:00
sha1_position: convert do-while to while
diff --git a/src/sha1_lookup.c b/src/sha1_lookup.c
@@ -232,7 +232,7 @@ int sha1_position(const void *table,
 {
 	const unsigned char *base = table;
 
-	do {
+	while (lo < hi) {
 		unsigned mi = (lo + hi) / 2;
 		int cmp = git_oid__hashcmp(base + mi * stride, key);
 
@@ -243,7 +243,7 @@ int sha1_position(const void *table,
 			hi = mi;
 		else
 			lo = mi+1;
-	} while (lo < hi);
+	}
 
 	return -((int)lo)-1;
 }

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ int sha1_position(const void *table,`
`232`	`232`	`{`
`233`	`233`	`const unsigned char *base = table;`
`234`	`234`
`235`		`- do {`
	`235`	`+ while (lo < hi) {`
`236`	`236`	`unsigned mi = (lo + hi) / 2;`
`237`	`237`	`int cmp = git_oid__hashcmp(base + mi * stride, key);`
`238`	`238`
`@@ -243,7 +243,7 @@ int sha1_position(const void *table,`
`243`	`243`	`hi = mi;`
`244`	`244`	`else`
`245`	`245`	`lo = mi+1;`
`246`		`- } while (lo < hi);`
	`246`	`+ }`
`247`	`247`
`248`	`248`	`return -((int)lo)-1;`
`249`	`249`	`}`