commit e23a5f1189bb1c81c7b6b5d2eaa9fcfc0c693fb3 from: Omar Polo via: Thomas Adam date: Sun Nov 10 11:01:43 2024 UTC delete trailing whitespaces done mechanically with $ find . -iname \*.[ch] -exec sed -i -E 's/[[:space:]]+$//' {} + with some revert for bundled files and a manual tweak for got-fetch-http.c commit - 3a8066da0696df5a2907f116bd426ca6a2be7c21 commit + e23a5f1189bb1c81c7b6b5d2eaa9fcfc0c693fb3 blob - 01004be305ffcd67c3e65eee2369956e16f23b5c blob + d8aa011cd5114e32d496b26b8a8ec15a7e606b92 --- gotctl/gotctl.c +++ gotctl/gotctl.c @@ -150,7 +150,7 @@ cmd_info(int argc, char *argv[], int gotd_sock) err = NULL; break; } - + switch (imsg.hdr.type) { case GOTD_IMSG_ERROR: err = gotd_imsg_recv_error(NULL, &imsg); @@ -203,7 +203,7 @@ cmd_stop(int argc, char *argv[], int gotd_sock) err = NULL; break; } - + switch (imsg.hdr.type) { case GOTD_IMSG_ERROR: err = gotd_imsg_recv_error(NULL, &imsg); blob - ce2ddd57c4faf088d21573be445bbde9945b8972 blob + eb49ad1a03f10321667debbae03b36d6fdef1400 --- gotd/session_read.c +++ gotd/session_read.c @@ -557,7 +557,7 @@ session_dispatch_client(int fd, short events, void *ar client->accept_flush_pkt = 1; break; case GOTD_IMSG_FLUSH: - if (gotd_session.state != GOTD_STATE_EXPECT_WANT && + if (gotd_session.state != GOTD_STATE_EXPECT_WANT && gotd_session.state != GOTD_STATE_EXPECT_HAVE_OR_DONE) { err = got_error_msg(GOT_ERR_BAD_REQUEST, blob - 25522c81fb2b8206f953e4b128d8aa1c9c000bad blob + d55ee39c8d8d1e13fe9955e810fc49a07f31aca4 --- lib/commit_graph.c +++ lib/commit_graph.c @@ -813,7 +813,7 @@ done: * 2. Walk the reachable commits, but only visit a commit if its in-degree * value is zero. When visiting a commit, decrement the in-degree value of * each parent. - * + * * This algorithm works because at least one of our starting points will * have in-degree zero, and then decrementing the in-degree value is similar * to deleting the commit from the graph, always having at least one commit blob - f8f7313be699328a8e3d97439f3493fde319cc12 blob + 9620bdf873585daa098962e7bb8c27a0446cac38 --- lib/deltify.c +++ lib/deltify.c @@ -258,7 +258,7 @@ lookupblk(struct got_delta_block **block, struct got_d *block = NULL; h = hashblk(p, len, seed); - + for (i = h % dt->size; dt->offs[i] != 0; i = (i + 1) % dt->size) { b = &dt->blocks[dt->offs[i] - 1]; if (b->hash != h || b->len != len) blob - 483de67587c2d77f3803f7fcd4a4efed723fbacc blob + af151dc9194aa4d51bcb204d303854c1515b5042 --- lib/diff.c +++ lib/diff.c @@ -686,7 +686,7 @@ diff_kind_mismatch(struct got_tree_entry *te1, struct { const struct got_error *err = NULL; - /* + /* * Handle files changing into directories and vice-versa. * Disregard edge cases with FIFOs, device nodes, etc for now. */ blob - 9a55e34a2f2a82ef53f2924e38bce6265f880bb1 blob + b211e83fe638695e53da3833362bdfc4273938d4 --- lib/repository.c +++ lib/repository.c @@ -926,7 +926,7 @@ got_repo_remote_repo_dup(struct got_remote_repo **newp new = calloc(1, sizeof(*new)); if (new == NULL) return got_error_from_errno("calloc"); - + if (repo->name) { new->name = strdup(repo->name); if (new->name == NULL) { blob - 3ac9e756473d9c9ce8acb2d432b106355cda9bfd blob + 4f69e0379f9bf1a344bab19dedbe8006d963fd97 --- lib/send.c +++ lib/send.c @@ -149,7 +149,7 @@ pack_progress(void *arg, int ncolored, int nfound, int } return err; } - + a->ncolored= ncolored; a->nfound = nfound; a->ntrees = ntrees; blob - 4a5d55c1a62fe7bcdba18d17dc7634cf2bd58910 blob + 77dc98a3e672b794cb81eab4ffc0e3cf439a4a42 --- lib/worktree.c +++ lib/worktree.c @@ -4076,7 +4076,7 @@ static const struct got_error * report_children(struct got_pathlist_head *children, struct got_worktree *worktree, struct got_fileindex *fileindex, struct got_repository *repo, int is_root_dir, int report_unchanged, - struct got_pathlist_head *ignores, int no_ignores, + struct got_pathlist_head *ignores, int no_ignores, got_worktree_status_cb status_cb, void *status_arg, got_cancel_cb cancel_cb, void *cancel_arg) { blob - 383d4aa4253b31679f7eaa3536201fccfd0bb9e9 blob + eb8ecc4066897d35b56e55f3dfc4bac2c6597358 --- libexec/got-fetch-http/got-fetch-http.c +++ libexec/got-fetch-http/got-fetch-http.c @@ -162,7 +162,7 @@ http_open(struct bufio *bio, int https, const char *me const char *chdr = NULL, *te = ""; char *p, *req; int r; - + if (strcmp(method, "POST") == 0) te = "\r\nTransfer-Encoding: chunked\r\n"; @@ -187,7 +187,6 @@ http_open(struct bufio *bio, int https, const char *me if (verbose > 0) fprintf(stderr, "%s: request: %s\n", getprogname(), req); - r = bufio_compose(bio, req, r); if (r == -1)