Commit a3500804a1dff06d6f16bf00324060331968428b
2018-01-23T13:52:21
add a helper function to reduce size of a switch statement
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/lib/pack.c b/lib/pack.c
index 6ffdffe..6c4139f 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -439,6 +439,25 @@ parse_offset_delta(off_t *base_offset, FILE *packfile, off_t offset)
return NULL;
}
+static const struct got_error *resolve_delta_chain(struct got_delta_chain *,
+ FILE *, const char *, off_t, size_t);
+
+static const struct got_error *
+resolve_offset_delta(struct got_delta_chain *deltas, FILE *packfile,
+ const char *path_packfile, off_t offset, size_t delta_size)
+{
+ const struct got_error *err;
+ off_t next_offset;
+
+ err = parse_offset_delta(&next_offset, packfile, offset);
+ if (err)
+ return err;
+
+ /* Next offset must be in the same packfile. */
+ return resolve_delta_chain(deltas, packfile, path_packfile,
+ next_offset, delta_size);
+}
+
static const struct got_error *
resolve_delta_chain(struct got_delta_chain *deltas, FILE *packfile,
const char *path_packfile, off_t offset, size_t delta_size)
@@ -471,16 +490,10 @@ resolve_delta_chain(struct got_delta_chain *deltas, FILE *packfile,
case GOT_OBJ_TYPE_BLOB:
case GOT_OBJ_TYPE_TAG:
break;
- case GOT_OBJ_TYPE_OFFSET_DELTA: {
- off_t next_offset;
- err = parse_offset_delta(&next_offset, packfile, offset);
- if (err)
- return err;
- /* Next offset must be in the same packfile. */
- err = resolve_delta_chain(deltas, packfile, path_packfile,
- next_offset, base_size);
+ case GOT_OBJ_TYPE_OFFSET_DELTA:
+ err = resolve_offset_delta(deltas, packfile, path_packfile,
+ offset, base_size);
break;
- }
case GOT_OBJ_TYPE_REF_DELTA:
default:
return got_error(GOT_ERR_NOT_IMPL);