simplify ReferenceAge calculations

diff --git a/src/store.cc b/src/store.cc
index feacc442b129aa841007f50db3cb856f95562c1a..81e5e645a750e14a503d2776b0ada9f134857dea 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.199 1997/01/20 19:24:33 wessels Exp $
+ * $Id: store.cc,v 1.200 1997/01/22 04:41:12 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -2799,19 +2799,14 @@ storeCheckExpired(const StoreEntry * e)
 time_t
 storeExpiredReferenceAge(void)
 {
-    int half;
     double x;
     double z;
     time_t age;
     if (Config.referenceAge > -1)
        return Config.referenceAge;
-    half = (store_swap_high >> 1) + (store_swap_low >> 1);
-    x = (double) (half - store_swap_size) / (store_swap_high - half);
-    if (x < -1.0)
-       x = -1.0;
-    else if (x > 1.0)
-       x = 1.0;
-    z = pow(724.0, (x + 1.0)); /* minutes [1:525600] */
+    x = 2.0 * (store_swap_high - store_swap_size) / (store_swap_high - store_swap_low);
+    x = x < 0.0 ? 0.0 : x > 2.0 ? 2.0 : x;
+    z = pow(724.0, x);         /* minutes [1:525600] */
     age = (time_t) (z * 60.0);
     if (age < 60)
        age = 60;