X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=fetch-clone.c;h=c5cf4776fabb8f9f09028dd1f0cfaf1d55e1397c;hb=3899e7a329aabfc22eca9beb82599e1bb214b3d2;hp=c16b0c481bb4b7dd3810e7dfbcb21243572f6844;hpb=9d24ed4f019e035eeb8125c2c595876ad1211a3a;p=git.git

diff --git a/fetch-clone.c b/fetch-clone.c
index c16b0c481..c5cf4776f 100644
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -44,9 +44,8 @@ static int finish_pack(const char *pack_tmp_name, const char *me)
 
 	for (;;) {
 		int status, code;
-		int retval = waitpid(pid, &status, 0);
 
-		if (retval < 0) {
+		if (waitpid(pid, &status, 0) < 0) {
 			if (errno == EINTR)
 				continue;
 			error("waitpid failed (%s)", strerror(errno));
@@ -129,10 +128,12 @@ static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2])
 			len--;
 			switch (buf[0] & 0xFF) {
 			case 3:
+				safe_write(2, "remote: ", 8);
 				safe_write(2, buf+1, len);
-				fprintf(stderr, "\n");
+				safe_write(2, "\n", 1);
 				exit(1);
 			case 2:
+				safe_write(2, "remote: ", 8);
 				safe_write(2, buf+1, len);
 				continue;
 			case 1:
@@ -198,8 +199,8 @@ int receive_unpack_pack(int xd[2], const char *me, int quiet, int sideband)
 
 /*
  * A "binary msec" is a power-of-two-msec, aka 1/1024th of a second.
- * Keeing the time in that format means that "bytes / msecs" means
- * is the same as kB/s (modulo rounding).
+ * Keeping the time in that format means that "bytes / msecs" means
+ * the same as kB/s (modulo rounding).
  *
  * 1000512 is a magic number (usecs in a second, rounded up by half
  * of 1024, to make "rounding" come out right ;)