summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2002-01-15 10:04:48 +0000
committerMartin Pool <mbp@samba.org>2002-01-15 10:04:48 +0000
commita9b31409d52f9c5527c9b04b9b49818035011ce0 (patch)
treee9626ba4314946a0141b8610ceb876f9b3a1bc93
parent98355b80864de1c52ffbdcf6855dabaa8a84b4a9 (diff)
downloadrsync-a9b31409d52f9c5527c9b04b9b49818035011ce0.tar.gz
Remove unused variable.
-rw-r--r--socket.c1
-rw-r--r--util.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/socket.c b/socket.c
index 57d895d8..dc9c4441 100644
--- a/socket.c
+++ b/socket.c
@@ -155,7 +155,6 @@ int open_socket_out(char *host, int port, const char *bind_address,
int type = SOCK_STREAM;
int error;
int s;
- int result;
struct addrinfo hints, *res0, *res;
char portbuf[10];
char *h;
diff --git a/util.c b/util.c
index 0006b006..c5bd662d 100644
--- a/util.c
+++ b/util.c
@@ -2,7 +2,7 @@
Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+ Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -836,7 +836,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
unsigned long diff = msdiff(&start_time, now);
double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
- const char *units, *rem_units;
+ const char *units;
double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
int remain_h, remain_m, remain_s;