From: Sebastian Hahn <sebastian@torproject.org>
Date: Thu, 23 Apr 2009 22:04:10 +0000 (+0000)
Subject: Return -1 in the error case from read_bandwidth_usage.
X-Git-Tag: tor-0.2.1.15-rc~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5675be39a0bd08ac2e5793ae2a688a39f3755c91;p=thirdparty%2Ftor.git

Return -1 in the error case from read_bandwidth_usage.

svn:r19367
---

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,