commit 8652e5612d19bb8c006bbb4efcbb3554c67888b1 from: Omar Polo via: Thomas Adam date: Sat Jan 14 16:45:29 2023 UTC gotd: delete trailing blanks spotted while re-reading commit - 64d3958760b50d1c4319d8f68e55db60facf68cc commit + 8652e5612d19bb8c006bbb4efcbb3554c67888b1 blob - d9723d2768de50fbc762a863432cae47b27511ce blob + 658362effe9f7a546e607cdc600ad87c21b66f60 --- gotd/repo_read.c +++ gotd/repo_read.c @@ -328,7 +328,7 @@ list_refs(struct imsg *imsg) 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; @@ -549,7 +549,7 @@ pack_progress(void *arg, int ncolored, int nfound, int 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, @@ -653,7 +653,7 @@ send_packfile(struct imsg *imsg, struct gotd_imsgev *i 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 - 4b04661635e781d9e8816a8137cb79470be67bb7 blob + 8dd2c6be9a9fa4eb0d7a42d3cfbb8ba4b61a9d36 --- gotd/repo_write.c +++ gotd/repo_write.c @@ -279,7 +279,7 @@ list_refs(struct imsg *imsg) 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; @@ -467,7 +467,7 @@ read_more_pack_stream(int infd, BUF *buf, size_t minsi err = buf_append(&newlen, buf, readahead, have); if (err) return err; - return NULL; + return NULL; } static const struct got_error * @@ -824,7 +824,7 @@ report_pack_status(const struct got_error *unpack_err) struct imsgbuf ibuf; const char *unpack_ok = "unpack ok\n"; size_t len; - + imsg_init(&ibuf, client->fd); if (unpack_err) @@ -1025,7 +1025,7 @@ verify_packfile(void) 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; @@ -1044,7 +1044,7 @@ verify_packfile(void) } } -done: +done: close_err = got_packidx_close(packidx); if (close_err && err == NULL) err = close_err;