diff options
author | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
commit | 796673c38509300c988fbba2f2679ba3c76916db (patch) | |
tree | 403055b486d0a1d65561528582d4b0bdc66e53a0 /methods/http.cc | |
parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
parent | 2f958de6e883ba7b0c9895750d4dde35047f1e82 (diff) |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
apt-private/private-list.cc
doc/po/de.po
test/integration/framework
Diffstat (limited to 'methods/http.cc')
-rw-r--r-- | methods/http.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/methods/http.cc b/methods/http.cc index b22b61efc..e1390afcb 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -97,8 +97,6 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { - unsigned long long BwReadMax; - while (1) { // Woops, buffer is full @@ -106,7 +104,7 @@ bool CircleBuf::Read(int Fd) return true; // what's left to read in this tick - BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + unsigned long long const BwReadMax = CircleBuf::BwReadLimit/BW_HZ; if(CircleBuf::BwReadLimit) { struct timeval now; |