X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=fd82bc0fa6d998e51072284aefe1dc5d79dd3663;hp=abd0419f6f99bb2529982beeecf0d813061b5fd6;hb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf;hpb=4b4c68de8d7390f966e46d9402d5499d2e8ee227

diff --git a/recv.c b/recv.c
index abd0419f..fd82bc0f 100644
--- a/recv.c
+++ b/recv.c
@@ -25,7 +25,7 @@ struct gengetopt_args_info conf;
 
 INIT_RECV_ERRLISTS;
 
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 
@@ -47,7 +47,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 		printf("available receivers: ");
 		for (i = 0; receivers[i].name; i++)
 			printf("%s%s", i? " " : "", receivers[i].name);
-		printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+		printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+			"for help on <receivername>.\n");
 		exit(EXIT_SUCCESS);
 	}
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
@@ -104,13 +105,13 @@ recv:
 		goto recv;
 	}
 	ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-	PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
+	PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);
 	if (ret < 0) {
 		ret = -E_WRITE_STDOUT;
 		goto out;
 	}
 	if (ret != rn.loaded) {
-		PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
+		PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);
 		memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
 	}
 	rn.loaded -= ret;
@@ -122,6 +123,6 @@ out:
 	if (r)
 		r->shutdown();
 	if (ret < 0)
-		PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	return ret;
 }