commit - 6c3d326354af2183c210a5f1422d4c99a606ae66
commit + e26970ccc755b7327924d761d1772a1bc5a5bf01
blob - d9723d2768de50fbc762a863432cae47b27511ce
blob + 658362effe9f7a546e607cdc600ad87c21b66f60
--- gotd/repo_read.c
+++ gotd/repo_read.c
err = got_ref_resolve(&id, repo_read.repo, re->ref);
if (err)
goto done;
- err = got_object_get_type(&obj_type, repo_read.repo, id);
+ err = got_object_get_type(&obj_type, repo_read.repo, id);
free(id);
if (err)
goto done;
if (ret == -1) {
return got_error_from_errno("imsg compose "
"PACKFILE_PROGRESS");
- }
+ }
} else {
a->sent_ready = 1;
ret = imsg_compose(a->ibuf, GOTD_IMSG_PACKFILE_READY,
check_cancelled, NULL);
if (err)
goto done;
-
+
if (log_getverbose() > 0 &&
got_sha1_digest_to_str(packsha1, hex, sizeof(hex)))
log_debug("sent pack-%s.pack", hex);
blob - 92c95bf4a867f80378b7cb3e6f94566e95ae26b1
blob + 3c8cfad838be7bad650a556478fd84cdb32844f8
--- gotd/repo_write.c
+++ gotd/repo_write.c
err = got_ref_resolve(&id, repo_write.repo, re->ref);
if (err)
goto done;
- err = got_object_get_type(&obj_type, repo_write.repo, id);
+ err = got_object_get_type(&obj_type, repo_write.repo, id);
free(id);
if (err)
goto done;
err = buf_append(&newlen, buf, readahead, have);
if (err)
return err;
- return NULL;
+ return NULL;
}
static const struct got_error *
struct imsgbuf ibuf;
const char *unpack_ok = "unpack ok\n";
size_t len;
-
+
imsg_init(&ibuf, client->fd);
if (unpack_err)
packidx->fd = client->packidx_fd;
client->packidx_fd = -1;
packidx->len = sb.st_size;
-
+
err = got_packidx_init_hdr(packidx, 1, client->pack.filesize);
if (err)
return err;
}
}
-done:
+done:
close_err = got_packidx_close(packidx);
if (close_err && err == NULL)
err = close_err;