Return -1 in the error case from read_bandwidth_usage.

svn:r19367

diff --git a/ChangeLog b/ChangeLog
index ab81695112e6373a82ea2dad0f227bbc268c2627..3ca41e13b540ba36d2ad46c422bff7fce184d500 100644 (file)
--- 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 c0a750308e2e616d265a531885c4abeeeb255bc9..d62036afb91d300fd01c14374206d3727655a83f 100644 (file)
--- 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,