commit - 78527a0aa079d64a0cbe7def60d689e2fef5beb5
commit + 1a35c1bc90d05a6bac56e2602a0bcc2109796fce
blob - 9bf9884ba4fea911efb366206d1c811d1b35829e
blob + 9de81b2182424bdb982baa73a69d3d61ce93ee93
--- lib/pack.c
+++ lib/pack.c
err = add_delta(deltas, delta_offset, tslen, delta_type, delta_size,
delta_data_offset, delta_buf, delta_len);
if (err)
- goto done;
+ return err;
/* An offset delta must be in the same packfile. */
- if (base_offset >= pack->filesize) {
- err = got_error(GOT_ERR_PACK_OFFSET);
- goto done;
- }
+ if (base_offset >= pack->filesize)
+ return got_error(GOT_ERR_PACK_OFFSET);
err = parse_object_type_and_size(&base_type, &base_size, &base_tslen,
pack, base_offset);
if (err)
- goto done;
+ return err;
- err = resolve_delta_chain(deltas, packidx, pack, base_offset,
+ return resolve_delta_chain(deltas, packidx, pack, base_offset,
base_tslen, base_type, base_size, recursion - 1);
-done:
- if (err)
- free(delta_buf);
- return err;
}
static const struct got_error *
uint64_t base_size;
size_t base_tslen;
off_t delta_data_offset;
- uint8_t *delta_buf = NULL;
+ uint8_t *delta_buf;
size_t delta_len;
if (delta_offset >= pack->filesize)
err = got_inflate_to_mem_mmap(&delta_buf, &delta_len, pack->map,
mapoff, pack->filesize - mapoff);
if (err)
- goto done;
+ return err;
} else {
ssize_t n = read(pack->fd, &id, sizeof(id));
if (n < 0)
return got_error(GOT_ERR_BAD_PACKFILE);
err = got_inflate_to_mem_fd(&delta_buf, &delta_len, pack->fd);
if (err)
- goto done;
+ return err;
}
err = add_delta(deltas, delta_offset, tslen, delta_type, delta_size,
delta_data_offset, delta_buf, delta_len);
if (err)
- goto done;
+ return err;
/* Delta base must be in the same pack file. */
idx = got_packidx_get_object_idx(packidx, &id);
- if (idx == -1) {
- err = got_error(GOT_ERR_BAD_PACKFILE);
- goto done;
- }
+ if (idx == -1)
+ return got_error(GOT_ERR_BAD_PACKFILE);
base_offset = get_object_offset(packidx, idx);
- if (base_offset == (uint64_t)-1) {
- err = got_error(GOT_ERR_BAD_PACKIDX);
- goto done;
- }
+ if (base_offset == (uint64_t)-1)
+ return got_error(GOT_ERR_BAD_PACKIDX);
- if (base_offset >= pack->filesize) {
- err = got_error(GOT_ERR_PACK_OFFSET);
- goto done;
- }
+ if (base_offset >= pack->filesize)
+ return got_error(GOT_ERR_PACK_OFFSET);
err = parse_object_type_and_size(&base_type, &base_size, &base_tslen,
pack, base_offset);
if (err)
- goto done;
+ return err;
- err = resolve_delta_chain(deltas, packidx, pack, base_offset,
+ return resolve_delta_chain(deltas, packidx, pack, base_offset,
base_tslen, base_type, base_size, recursion - 1);
-done:
- if (err)
- free(delta_buf);
- return err;
}
static const struct got_error *
(*obj)->size = 0; /* Not known because deltas aren't applied yet. */
memcpy(&(*obj)->id, id, sizeof((*obj)->id));
(*obj)->pack_offset = offset + tslen;
+
+ SIMPLEQ_INIT(&(*obj)->deltas.entries);
+ (*obj)->flags |= GOT_OBJ_FLAG_DELTIFIED;
(*obj)->path_packfile = strdup(pack->path_packfile);
if ((*obj)->path_packfile == NULL) {
(*obj)->flags |= GOT_OBJ_FLAG_PACKED;
(*obj)->pack_idx = idx;
- SIMPLEQ_INIT(&(*obj)->deltas.entries);
- (*obj)->flags |= GOT_OBJ_FLAG_DELTIFIED;
-
err = resolve_delta_chain(&(*obj)->deltas, packidx, pack, offset,
tslen, delta_type, delta_size, GOT_DELTA_CHAIN_RECURSION_MAX);
if (err)