apply: refactor to use a switch statement

b30dab8f · Patrick Steinhardt · 001d76e1 · b30dab8f
Commit b30dab8f authored Jul 11, 2019 by Patrick Steinhardt
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

src/apply.c
+14 -10

No files found.
--- a/src/apply.c
+++ b/src/apply.c
@@ -206,16 +206,20 @@ static int apply_hunk(
 			goto done;
 		}
-		if (line->origin == GIT_DIFF_LINE_CONTEXT ||
+		switch (line->origin) {
-			line->origin == GIT_DIFF_LINE_DELETION) {
+			case GIT_DIFF_LINE_CONTEXT:
-			if ((error = git_vector_insert(&preimage.lines, line)) < 0)
+				if ((error = git_vector_insert(&preimage.lines, line)) < 0 ||
-				goto done;
+				    (error = git_vector_insert(&postimage.lines, line)) < 0)
-		}
+					goto done;
+				break;
-		if (line->origin == GIT_DIFF_LINE_CONTEXT ||
+			case GIT_DIFF_LINE_DELETION:
-			line->origin == GIT_DIFF_LINE_ADDITION) {
+				if ((error = git_vector_insert(&preimage.lines, line)) < 0)
-			if ((error = git_vector_insert(&postimage.lines, line)) < 0)
+					goto done;
-				goto done;
+				break;
+			case GIT_DIFF_LINE_ADDITION:
+				if ((error = git_vector_insert(&postimage.lines, line)) < 0)
+					goto done;
+				break;
 		}
 	}