commit 8f137979fc5e284a136cf8950e8b3895d7ea208b from: Omar Polo date: Thu Jul 07 13:40:32 2022 UTC get rid of unneeded recv_imsg_error calls got_privsep_recv_imsg users don't need to bother to look whether the imsg type is GOT_IMSG_ERROR because got_privsep_recv_imsg already takes care of that and turns GOT_IMSG_ERROR into `struct got_error's automatically. ok stsp@ commit - 80985c16b7649d82b559b180b486ac017c864e5a commit + 8f137979fc5e284a136cf8950e8b3895d7ea208b blob - 1b9cd072c5f6b42f27f9626ef92aa04fa7c9b34c blob + 22b5fe916ef3380f1ead6796d6ddd366191190a2 --- lib/privsep.c +++ lib/privsep.c @@ -710,9 +710,6 @@ got_privsep_recv_fetch_progress(int *done, struct got_ datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_FETCH_SYMREFS: if (datalen < sizeof(*isymrefs)) { err = got_error(GOT_ERR_PRIVSEP_LEN); @@ -934,9 +931,6 @@ got_privsep_recv_send_remote_refs(struct got_pathlist_ return err; datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - goto done; case GOT_IMSG_SEND_REMOTE_REF: if (datalen < sizeof(iremote_ref)) { err = got_error(GOT_ERR_PRIVSEP_MSG); @@ -1017,9 +1011,6 @@ got_privsep_recv_send_progress(int *done, off_t *bytes datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_SEND_UPLOAD_PROGRESS: if (datalen < sizeof(*bytes_sent)) { err = got_error(GOT_ERR_PRIVSEP_MSG); @@ -1100,9 +1091,6 @@ got_privsep_recv_index_progress(int *done, int *nobj_t datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_IDXPACK_PROGRESS: if (datalen < sizeof(*iprogress)) { err = got_error(GOT_ERR_PRIVSEP_LEN); @@ -1603,9 +1591,6 @@ got_privsep_recv_tree(struct got_tree_object **tree, s datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_TREE: /* This message should only appear once. */ if (*tree != NULL) { @@ -2401,9 +2386,6 @@ got_privsep_recv_gotconfig_str(char **str, struct imsg datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_GOTCONFIG_STR_VAL: if (datalen == 0) break; @@ -2447,9 +2429,6 @@ got_privsep_recv_gotconfig_remotes(struct got_remote_r datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_GOTCONFIG_REMOTES: if (datalen != sizeof(iremotes)) { err = got_error(GOT_ERR_PRIVSEP_LEN); @@ -2488,9 +2467,6 @@ got_privsep_recv_gotconfig_remotes(struct got_remote_r datalen = imsg.hdr.len - IMSG_HEADER_SIZE; switch (imsg.hdr.type) { - case GOT_IMSG_ERROR: - err = recv_imsg_error(&imsg, datalen); - break; case GOT_IMSG_GOTCONFIG_REMOTE: remote = &(*remotes)[*nremotes]; memset(remote, 0, sizeof(*remote));