Merge branch 'ds/object-file-unpack-loose-header-fix'

gitster · gitster · commit d8c8dccbaafd · 2022-06-03T14:30:35.000-07:00
Coding style fix.

* ds/object-file-unpack-loose-header-fix:
  object-file: convert 'switch' back to 'if'
diff --git a/object-file.c b/object-file.c
@@ -2628,12 +2628,8 @@ int read_loose_object(const char *path,
 		goto out;
 	}
 
-	switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
-				    NULL)) {
-	case ULHR_OK:
-		break;
-	case ULHR_BAD:
-	case ULHR_TOO_LONG:
+	if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+				NULL) != ULHR_OK) {
 		error(_("unable to unpack header of %s"), path);
 		goto out;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2628,12 +2628,8 @@ int read_loose_object(const char *path,`
`2628`	`2628`	`goto out;`
`2629`	`2629`	`}`
`2630`	`2630`
`2631`		`- switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),`
`2632`		`- NULL)) {`
`2633`		`- case ULHR_OK:`
`2634`		`- break;`
`2635`		`- case ULHR_BAD:`
`2636`		`- case ULHR_TOO_LONG:`
	`2631`	`+ if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),`
	`2632`	`+ NULL) != ULHR_OK) {`
`2637`	`2633`	`error(_("unable to unpack header of %s"), path);`
`2638`	`2634`	`goto out;`
`2639`	`2635`	`}`