commit e17fe79ed2af35cc59b6e45c577a715377c2e63f from: Omar Polo date: Wed Nov 06 18:42:57 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 - 197402aa5d504d7a3c4d10d6066757443632a777 commit + e17fe79ed2af35cc59b6e45c577a715377c2e63f blob - f0b3e23dc8afc1dde424443e06cb5831714793d0 blob + 23a37dbbe11d71dc588924f24f2d9ff4b4a35b89 --- 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 - f3b8ccf6b334a2f80606e4decf5ad9c40a484574 blob + 6e4b3757b5948f6a34ee747fdf5d7c03d32f9eed --- gotd/session_read.c +++ gotd/session_read.c @@ -558,7 +558,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 - 31a952259533a6860e070a48fc3dfe2eed787c4f blob + 1efd31bd7fbba8901c47aba134f6e6aa7381e4f5 --- lib/commit_graph.c +++ lib/commit_graph.c @@ -814,7 +814,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 - 30e62b560a15e5c2d8a460f28b8ea386e1b3b5cf blob + 8717d4c083ff9429232d344b13335043e9403933 --- lib/deltify.c +++ lib/deltify.c @@ -257,7 +257,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 - 80f4c2ec4a2985d8604998f23f8761ab601b2514 blob + 1958bf239d21b4b220fed7b8cb12e942ed4b8c24 --- 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 - 361e253cad3dc219aabf23e9274ab69447d1af1e blob + 99f0df084a62eddfcd9809402c5834ffea4040f3 --- lib/repository.c +++ lib/repository.c @@ -930,7 +930,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 - 1976fa9212d7b93d58eab0f3844f52e5f8d48f06 blob + 69ea82550f16667b29fd557fbb1fd94110971355 --- lib/send.c +++ lib/send.c @@ -153,7 +153,7 @@ pack_progress(void *arg, int ncolored, int nfound, int } return err; } - + a->ncolored= ncolored; a->nfound = nfound; a->ntrees = ntrees; blob - 28806a15451e401fae7d46afe3aa5c1ca838385b blob + 407601bbacc042b33ad5cb1d87afa5beeb6f6a9d --- lib/worktree.c +++ lib/worktree.c @@ -4079,7 +4079,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 - 920b8b12085e70e102a9c9f309d8eb555a2c9671 blob + 235f88168eaa1209540cb280c17e4f55629259a4 --- libexec/got-fetch-http/got-fetch-http.c +++ libexec/got-fetch-http/got-fetch-http.c @@ -160,7 +160,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"; @@ -185,7 +185,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)