From 8a50571a0ea700fe2b9a3c7ef7ed2117c87ca9ba Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 16 May 2022 10:53:27 -0400 Subject: object-file: convert 'switch' back to 'if' This switch statement was recently added to make it clear that unpack_loose_header() returns an enum value, not an int. This adds complications for future developers if that enum gains new values, since that developer would need to add a case statement to this switch for little real value. Instead, we can revert back to an 'if' statement, but make the enum explicit by using "!= ULHR_OK" instead of assuming it has the numerical value zero. Co-authored-by: Junio C Hamano Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- object-file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'object-file.c') diff --git a/object-file.c b/object-file.c index b5d1d12b68..52e4ae1b5f 100644 --- a/object-file.c +++ b/object-file.c @@ -2623,12 +2623,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; } -- cgit v1.2.3