remove DONT_DO_THIS code

diff --git a/src/disk.cc b/src/disk.cc
index bcf6352dcc03d4dee4f0f2a9c152c1da78a2b4ba..eeced6f6dc352566264444ff7449012047361180 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: disk.cc,v 1.46 1996/11/24 04:19:10 wessels Exp $
+ * $Id: disk.cc,v 1.47 1996/11/28 07:30:59 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -185,10 +185,6 @@ file_open(const char *path, int (*handler) _PARAMS((void)), int mode)
 
     conn = &fd_table[fd];
     memset(conn, '\0', sizeof(FD_ENTRY));
-#ifdef DONT_DO_THIS
-    if (commSetNonBlocking(fd) != COMM_ERROR)
-       conn->comm_type = COMM_NONBLOCKING;
-#endif
     return fd;
 }
 

diff --git a/src/stat.cc b/src/stat.cc
index 9ea7804c04aec22906b176a5d55c2d54478f16d1..549d65294b7c7a709d5410637e1ecf5575bc0f50 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.108 1996/11/25 18:50:31 wessels Exp $
+ * $Id: stat.cc,v 1.109 1996/11/28 07:31:02 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -805,10 +805,6 @@ info_get(const cacheinfo * obj, StoreEntry * sentry)
     t = mp.fsmblks + mp.fordblks;
     storeAppendPrintf(sentry, "{\tTotal free:            %6d KB %d%%}\n",
        t >> 10, percent(t, mp.arena));
-#ifdef WE_DONT_USE_KEEP
-    storeAppendPrintf(sentry, "{\tKeep option:           %6d KB}\n",
-       mp.keepcost >> 10);
-#endif
 #if HAVE_EXT_MALLINFO
     storeAppendPrintf(sentry, "{\tmax size of small blocks:\t%d}\n", mp.mxfast);
     storeAppendPrintf(sentry, "{\tnumber of small blocks in a holding block:\t%d}\n",

diff --git a/src/store.cc b/src/store.cc
index e851e0b84ccb70682f81b2bd03aa498c10ae5b98..a90ff173ae703412e08405b84ca9636f7ac97867 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.169 1996/11/22 05:06:00 wessels Exp $
+ * $Id: store.cc,v 1.170 1996/11/28 07:31:04 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -1419,24 +1419,12 @@ storeDoRebuildFromDisk(void *data)
                    safeunlink(swapfile, 1);
                continue;
            }
-#ifdef DONT_DO_THIS
-           /* timestamp might be a little bigger than sb.st_mtime */
-           delta = (int) (timestamp - sb.st_mtime);
-           if (delta > REBUILD_TIMESTAMP_DELTA_MAX || delta < 0) {
-               /* this log entry doesn't correspond to this file */
-               rebuildData->clashcount++;
-               continue;
-           }
-#endif
            /* Wrong size? */
            if (sb.st_size != size) {
                /* this log entry doesn't correspond to this file */
                rebuildData->clashcount++;
                continue;
            }
-#ifdef DONT_DO_THIS
-           timestamp = sb.st_mtime;
-#endif
            debug(20, 9, "storeRebuildFromDisk: swap file exists: '%s': %s\n",
                url, swapfile);
        }

diff --git a/src/tools.cc b/src/tools.cc
index ac929375fc67e15b77d95dd9f84f1003c7da2757..088a3a1ac893ebefdfc3a7255efb65876e0212cf 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.88 1996/11/25 02:36:46 wessels Exp $
+ * $Id: tools.cc,v 1.89 1996/11/28 07:31:05 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -184,10 +184,6 @@ dumpMallocStats(FILE * f)
     t = mp.fsmblks + mp.fordblks;
     fprintf(f, "\tTotal free:            %6d KB %d%%\n",
        t >> 10, percent(t, mp.arena));
-#ifdef WE_DONT_USE_KEEP
-    fprintf(f, "\tKeep option:           %6d KB\n",
-       mp.keepcost >> 10);
-#endif
 #if HAVE_EXT_MALLINFO
     fprintf(f, "\tmax size of small blocks:\t%d\n",
        mp.mxfast);