From aa99927f534a798a188816881bf52e9515390351 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 9 Jan 2015 13:52:02 -0800 Subject: [PATCH] smbclient: Fix unit reporting. smbclient transfer speed shown in kb/s but should be kB/s https://bugzilla.samba.org/show_bug.cgi?id=11023 Signed-off-by: Jeremy Allison --- source3/client/client.c | 2 +- source3/torture/torture.c | 2 +- source4/client/client.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/client/client.c b/source3/client/client.c index 5d70897..f290239 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1962,7 +1962,7 @@ static int do_put(const char *rname, const char *lname, bool reput) put_total_time_ms += this_time; put_total_size += state.nread; - DEBUG(1,("(%3.1f kb/s) (average %3.1f kb/s)\n", + DEBUG(1,("(%3.1f kB/s) (average %3.1f kB/s)\n", state.nread / (1.024*this_time + 1.0e-4), put_total_size / (1.024*put_total_time_ms))); } diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 2714655..d3dec3f 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -7223,7 +7223,7 @@ static bool run_windows_write(int dummy) kbytes = (double)torture_blocksize * torture_numops; kbytes /= 1024; - printf("Wrote %d kbytes in %.2f seconds: %d kb/sec\n", (int)kbytes, + printf("Wrote %d kbytes in %.2f seconds: %d kB/sec\n", (int)kbytes, (double)seconds, (int)(kbytes/seconds)); ret = true; diff --git a/source4/client/client.c b/source4/client/client.c index 2779824..61f5927 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -813,7 +813,7 @@ static int do_get(struct smbclient_context *ctx, char *rname, const char *p_lnam get_total_time_ms += this_time; get_total_size += nread; - DEBUG(2,("(%3.1f kb/s) (average %3.1f kb/s)\n", + DEBUG(2,("(%3.1f kB/s) (average %3.1f kB/s)\n", nread / (1.024*this_time + 1.0e-4), get_total_size / (1.024*get_total_time_ms))); } @@ -1220,7 +1220,7 @@ static int do_put(struct smbclient_context *ctx, char *rname, char *lname, bool put_total_time_ms += this_time; put_total_size += nread; - DEBUG(1,("(%3.1f kb/s) (average %3.1f kb/s)\n", + DEBUG(1,("(%3.1f kB/s) (average %3.1f kB/s)\n", nread / (1.024*this_time + 1.0e-4), put_total_size / (1.024*put_total_time_ms))); } -- 2.2.0.rc0.207.ga3a616c