summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2009-04-23 22:04:10 +0000
committerSebastian Hahn <sebastian@torproject.org>2009-04-23 22:04:10 +0000
commit5675be39a0bd08ac2e5793ae2a688a39f3755c91 (patch)
tree986e22e5e0fcaefda7062aee41ca9d7ac592eaf1
parentf33f2e95913f4d444bb469ed92dee0d2dd3f7575 (diff)
downloadtor-5675be39a0bd08ac2e5793ae2a688a39f3755c91.tar.gz
tor-5675be39a0bd08ac2e5793ae2a688a39f3755c91.zip
Return -1 in the error case from read_bandwidth_usage.
svn:r19367
-rw-r--r--ChangeLog6
-rw-r--r--src/or/hibernate.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab81695112..3ca41e13b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.1.15??? - ????-??-??
+ o Minor bugfixes:
+ - Actually return -1 in the error case for read_bandwidth_usage. Bug
+ was harmless, we currently don't care for the return value anywhere.
+ Bugfix on 0.2.0.9-alpha.
+
Changes in version 0.2.1.14-rc - 2009-04-12
o Major features:
- Clients replace entry guards that were chosen more than a few months
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index c0a750308e..d62036afb9 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -580,7 +580,7 @@ read_bandwidth_usage(void)
}
if (!state)
- return 0;
+ return -1;
/* Okay; it looks like the state file is more up-to-date than the
* bw_accounting file, or the bw_accounting file is nonexistant,