Commit 6ccb713b7c821120ac65a0ec17483294f6708c43
2018-01-19T16:28:55
Add helper function for opening packed plain objects
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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/lib/pack.c b/lib/pack.c
index c4087fb..366063e 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -363,6 +363,31 @@ decode_type_and_size(uint8_t *type, uint64_t *size, size_t *len, FILE *packfile)
}
static const struct got_error *
+open_packed_plain_object(struct got_object **obj, const char *path_packfile,
+ struct got_object_id *id, uint8_t type, off_t offset, size_t size)
+{
+ *obj = calloc(1, sizeof(**obj));
+ if (*obj == NULL)
+ return got_error(GOT_ERR_NO_MEM);
+
+ (*obj)->path_packfile = strdup(path_packfile);
+ if ((*obj)->path_packfile == NULL) {
+ free(*obj);
+ *obj = NULL;
+ return got_error(GOT_ERR_NO_MEM);
+ }
+
+ (*obj)->type = type;
+ (*obj)->flags = GOT_OBJ_FLAG_PACKED;
+ (*obj)->hdrlen = 0;
+ (*obj)->size = size;
+ memcpy(&(*obj)->id, id, sizeof((*obj)->id));
+ (*obj)->pack_offset = offset;
+
+ return NULL;
+}
+
+static const struct got_error *
open_packed_object(struct got_object **obj, struct got_repository *repo,
const char *path_packdir, struct got_packidx_v2_hdr *packidx,
struct got_object_id *id)
@@ -414,28 +439,14 @@ open_packed_object(struct got_object **obj, struct got_repository *repo,
if (err)
goto done;
- *obj = calloc(1, sizeof(**obj));
- if (*obj == NULL) {
- err = got_error(GOT_ERR_NO_MEM);
- goto done;
- }
-
switch (type) {
case GOT_OBJ_TYPE_COMMIT:
case GOT_OBJ_TYPE_TREE:
case GOT_OBJ_TYPE_BLOB:
- (*obj)->path_packfile = strdup(path_packfile);
- if ((*obj)->path_packfile == NULL) {
- err = got_error(GOT_ERR_NO_MEM);
- goto done;
- }
- (*obj)->type = type;
- (*obj)->flags = GOT_OBJ_FLAG_PACKED;
- (*obj)->hdrlen = 0;
- (*obj)->size = size;
- memcpy(&(*obj)->id, id, sizeof((*obj)->id));
- (*obj)->pack_offset = offset + tslen;
+ err = open_packed_plain_object(obj, path_packfile, id, type,
+ offset + tslen, size);
break;
+
case GOT_OBJ_TYPE_REF_DELTA:
case GOT_OBJ_TYPE_TAG:
case GOT_OBJ_TYPE_OFFSET_DELTA: