X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=ae20d70137a6bb097109d731dd6fce63afbd7c19;hp=b0f9f786932be2e44e5c87bb9411345746e16ff1;hb=586cea4b850e53eedf7426379f6af6a7e76dee6e;hpb=ff5444a95fa551c0bac1ca74f36770276a82703e

diff --git a/audiod.c b/audiod.c
index b0f9f786..ae20d701 100644
--- a/audiod.c
+++ b/audiod.c
@@ -609,17 +609,14 @@ __malloc static char *glob_cmd(char *cmd)
 	else
 		tv_diff(&server_stream_start, &sa_time_diff, &rss);
 	tv_add(&rss, &delay, &tmp);
-	replacement = make_message("%lu:%lu", tmp.tv_sec, tmp.tv_usec);
+	replacement = make_message("%lu:%lu",
+		(long unsigned)tmp.tv_sec,
+		(long unsigned)tmp.tv_usec);
 	ret = s_a_r(cmd, "STREAM_START", replacement);
 	free(replacement);
 	if (!ret)
 		goto out;
 	PARA_INFO_LOG("cmd: %s, repl: %s\n", cmd, ret);
-	{
-	struct timeval now;
-	gettimeofday(&now, NULL);
-	PARA_INFO_LOG("now: %lu:%lu\n", now.tv_sec, now.tv_usec);
-	}
 out:
 	return ret;
 }
@@ -797,11 +794,12 @@ static void compute_time_diff(const struct timeval *status_time)
 		count > 10? sign : sign * time_smooth, &diff,
 		&tmp);
 	sa_time_diff = tmp;
-	PARA_INFO_LOG("time diff (cur/avg): "
-		"%li:%lu/%li:%lu\n",
-		sign * diff.tv_sec, (diff.tv_usec + 500) / 1000,
-		sa_time_diff_sign * sa_time_diff.tv_sec,
-		(sa_time_diff.tv_usec + 500)/ 1000);
+	PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
+		sign > 0? "+" : "-",
+		tv2ms(&diff),
+		sa_time_diff_sign ? "+" : "-",
+		tv2ms(&sa_time_diff)
+	);
 }
 
 static void check_stat_line(char *line)
@@ -1443,7 +1441,6 @@ static int handle_connect(void)
 	if (ret < 0)
 		goto out;
 	PARA_INFO_LOG("connection from user %i\n",  ret);
-	buf[ret] = '\0';
 	ret = check_perms(ret);
 	if (ret < 0)
 		goto out;