Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
98355b8
)
Remove unused variable.
author
Martin Pool
<mbp@samba.org>
Tue, 15 Jan 2002 10:04:48 +0000
(10:04 +0000)
committer
Martin Pool
<mbp@samba.org>
Tue, 15 Jan 2002 10:04:48 +0000
(10:04 +0000)
socket.c
patch
|
blob
|
blame
|
history
util.c
patch
|
blob
|
blame
|
history
diff --git
a/socket.c
b/socket.c
index
57d895d
..
dc9c444
100644
(file)
--- 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 type = SOCK_STREAM;
int error;
int s;
- int result;
struct addrinfo hints, *res0, *res;
char portbuf[10];
char *h;
struct addrinfo hints, *res0, *res;
char portbuf[10];
char *h;
diff --git
a/util.c
b/util.c
index
0006b00
..
c5bd662
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-2,7
+2,7
@@
Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
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
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;
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;
double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
int remain_h, remain_m, remain_s;