Commit Diff

Commit:
e215b807ba3c0b3e54a5ea161e750ac3466a1b0e
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
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@
Actions:
Patch | Tree
commit - 9b5e2ebd207db582ccb731c9543408456af87000
commit + e215b807ba3c0b3e54a5ea161e750ac3466a1b0e
blob - 94942480cdc9f231f775f9474a9ce692d2ec08b0
blob + 5680c43cfad2cffa827820a54963eeab9c76262e
--- lib/privsep.c
+++ lib/privsep.c
@@ -709,9 +709,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);
@@ -933,9 +930,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);
@@ -1016,9 +1010,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);
@@ -1099,9 +1090,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);
@@ -1602,9 +1590,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) {
@@ -2400,9 +2385,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;
@@ -2446,9 +2428,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);
@@ -2487,9 +2466,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));