gindent

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 886d7a459976ac95a81b0f9dc5e538d32bda10d2..8f15e3c194cbbdecf75c34f36a4ee7218faf6a8a 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.179 1997/04/25 21:43:56 wessels Exp $
+ * $Id: cache_cf.cc,v 1.180 1997/04/25 22:01:16 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -110,7 +110,7 @@ struct SquidConfig Config;
 #define DefaultMemMaxSize      (8 << 20)       /* 8 MB */
 #define DefaultMemHighWaterMark 90     /* 90% */
 #define DefaultMemLowWaterMark  75     /* 75% */
-#define DefaultSwapMaxSize     0 
+#define DefaultSwapMaxSize     0
 #define DefaultSwapHighWaterMark 95    /* 95% */
 #define DefaultSwapLowWaterMark  90    /* 90% */
 #define DefaultNetdbHigh       1000    /* counts, not percents */
@@ -858,7 +858,7 @@ parseCacheDir(void)
        self_destruct();
     dir = token;
     GetInteger(i);
-    size = i << 10;    /* Mbytes to kbytes */
+    size = i << 10;            /* Mbytes to kbytes */
     Config.Swap.maxSize += size;
     GetInteger(i);
     l1 = i;

diff --git a/src/store.cc b/src/store.cc
index 91129026829d85fb03e0bd72f6fe86f2b1eeefbb..98a1510ed5cc2284cfe13bb36b4ffacb774a16ae 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.220 1997/04/25 21:43:59 wessels Exp $
+ * $Id: store.cc,v 1.221 1997/04/25 22:01:18 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -188,11 +188,11 @@ const char *swapStatusStr[] =
 struct storeRebuildState {
     struct _rebuild_dir {
        int dirn;
-       FILE *log;
+       FILE *log;
        int speed;
        int clean;
        struct _rebuild_dir *next;
-    } *rebuild_dir;
+    }           *rebuild_dir;
     int objcount;              /* # objects successfully reloaded */
     int expcount;              /* # objects expired */
     int linecount;             /* # lines parsed from cache logfile */
@@ -884,9 +884,9 @@ storeAddDiskRestore(const char *url, int file_number, int size, time_t expires,
     e->lastmod = lastmod;
     e->ping_status = PING_NONE;
     if (store_rebuilding == STORE_REBUILDING_CLEAN)
-        BIT_SET(e->flag, ENTRY_VALIDATED);
-    else 
-        BIT_RESET(e->flag, ENTRY_VALIDATED);
+       BIT_SET(e->flag, ENTRY_VALIDATED);
+    else
+       BIT_RESET(e->flag, ENTRY_VALIDATED);
     return e;
 }
 
@@ -1400,19 +1400,19 @@ storeDoRebuildFromDisk(void *data)
     struct _rebuild_dir **D;
     /* load a number of objects per invocation */
     if ((d = RB->rebuild_dir) == NULL) {
-           storeRebuiltFromDisk(RB);
-           return;
+       storeRebuiltFromDisk(RB);
+       return;
     }
     for (count = 0; count < d->speed; count++) {
        if (fgets(RB->line_in, RB->line_in_sz, d->log) == NULL) {
-               debug(20,1,"Done reading Cache Dir #%d swap log\n", d->dirn);
-               fclose(d->log);
-               d->log = NULL;
-               storeDirCloseTmpSwapLog(d->dirn);
-               RB->rebuild_dir = d->next;
-               safe_free(d);
-               eventAdd("storeRebuild", storeDoRebuildFromDisk, RB, 0);
-               return;
+           debug(20, 1, "Done reading Cache Dir #%d swap log\n", d->dirn);
+           fclose(d->log);
+           d->log = NULL;
+           storeDirCloseTmpSwapLog(d->dirn);
+           RB->rebuild_dir = d->next;
+           safe_free(d);
+           eventAdd("storeRebuild", storeDoRebuildFromDisk, RB, 0);
+           return;
        }
        if ((++RB->linecount & 0x3FFF) == 0)
            debug(20, 1, "  %7d Lines read so far.\n", RB->linecount);
@@ -1535,7 +1535,7 @@ storeCleanup(void *data)
     if ((validnum % 4096) == 0)
        debug(20, 1, "  %7d Entries Validated so far.\n", validnum);
     if (!BIT_TEST(e->flag, ENTRY_VALIDATED))
-        storeValidate(e, storeCleanupComplete, e);
+       storeValidate(e, storeCleanupComplete, e);
     xfree(curr->key);
     xfree(curr);
     eventAdd("storeCleanup", storeCleanup, NULL, 0);
@@ -2563,20 +2563,20 @@ storeWriteCleanLogs(void)
     }
     debug(20, 1, "storeWriteCleanLogs: Starting...\n");
     start = getCurrentTime();
-    for (dirn = 0; dirn< ncache_dirs; dirn++) {
-        fd[dirn] = -1;
-       cur[dirn] = xstrdup(storeDirSwapLogFile(dirn, NULL));
-       new[dirn] = xstrdup(storeDirSwapLogFile(dirn, ".clean"));
-       cln[dirn] = xstrdup(storeDirSwapLogFile(dirn, ".last-clean"));
-        safeunlink(new[dirn], 1);
-        safeunlink(cln[dirn], 1);
-        fd[dirn] = open(new[dirn], O_WRONLY | O_APPEND | O_CREAT | O_TRUNC, 0644);
-        if (fd[dirn] < 0) {
+    for (dirn = 0; dirn < ncache_dirs; dirn++) {
+       fd[dirn] = -1;
+       cur[dirn] = xstrdup(storeDirSwapLogFile(dirn, NULL));
+       new[dirn] = xstrdup(storeDirSwapLogFile(dirn, ".clean"));
+       cln[dirn] = xstrdup(storeDirSwapLogFile(dirn, ".last-clean"));
+       safeunlink(new[dirn], 1);
+       safeunlink(cln[dirn], 1);
+       fd[dirn] = open(new[dirn], O_WRONLY | O_APPEND | O_CREAT | O_TRUNC, 0644);
+       if (fd[dirn] < 0) {
            debug(50, 0, "storeWriteCleanLogs: %s: %s\n", new[dirn], xstrerror());
            continue;
        }
 #if HAVE_FCHMOD
-        if (stat(cur[dirn], &sb) == 0)
+       if (stat(cur[dirn], &sb) == 0)
            fchmod(fd[dirn], sb.st_mode);
 #endif
     }
@@ -2619,13 +2619,13 @@ storeWriteCleanLogs(void)
        }
     }
     safe_free(line);
-    for (dirn=0; dirn<ncache_dirs; dirn++) {
-        file_close(fd[dirn]);
-        fd[dirn] = -1;
-        if (rename(new[dirn], cur[dirn]) < 0) {
+    for (dirn = 0; dirn < ncache_dirs; dirn++) {
+       file_close(fd[dirn]);
+       fd[dirn] = -1;
+       if (rename(new[dirn], cur[dirn]) < 0) {
            debug(50, 0, "storeWriteCleanLogs: rename failed: %s\n",
-               xstrerror());
-        }
+               xstrerror());
+       }
     }
     storeDirCloseSwapLogs();
     storeDirOpenSwapLogs();
@@ -2635,10 +2635,10 @@ storeWriteCleanLogs(void)
     debug(20, 1, "  Took %d seconds (%6.1lf lines/sec).\n",
        r > 0 ? r : 0, (double) n / (r > 0 ? r : 1));
     /* touch a timestamp file if we're not still validating */
-    for (dirn=0; dirn<ncache_dirs; dirn++) {
-        if (!store_validating)
+    for (dirn = 0; dirn < ncache_dirs; dirn++) {
+       if (!store_validating)
            file_close(file_open(cln[dirn], NULL,
-               O_WRONLY | O_CREAT | O_TRUNC, NULL, NULL));
+                   O_WRONLY | O_CREAT | O_TRUNC, NULL, NULL));
        safe_free(cur[dirn]);
        safe_free(new[dirn]);
        safe_free(cln[dirn]);

diff --git a/src/store_dir.cc b/src/store_dir.cc
index b704194d9e5f623020fa46e391817d8cf426fa78..b25cbeb8235120664e9563ec25ac61780329baad 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -69,7 +69,7 @@ storeAddSwapDisk(const char *path, int size, int l1, int l2, int read_only)
        xfree(SwapDirs);
        SwapDirs = tmp;
     }
-    tmp = SwapDirs+ncache_dirs;
+    tmp = SwapDirs + ncache_dirs;
     tmp->path = xstrdup(path);
     tmp->max_size = size;
     tmp->l1 = l1;
@@ -84,7 +84,7 @@ storeVerifyOrCreateDir(const char *path)
 {
     struct stat sb;
     if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
-       debug(20,3,"%s exists\n", path);
+       debug(20, 3, "%s exists\n", path);
        return 0;
     }
     safeunlink(path, 1);
@@ -365,14 +365,14 @@ storeDirUpdateSwapSize(int fn, size_t size, int sign)
 }
 
 void
-storeDirStats(StoreEntry *sentry)
+storeDirStats(StoreEntry * sentry)
 {
     int i;
     SwapDir *SD;
     storeAppendPrintf(sentry, "Store Directory Statistics:\n");
     storeAppendPrintf(sentry, "Store Entries: %d\n", meta_data.store_entries);
     storeAppendPrintf(sentry, "Store Swap Size: %d KB\n", store_swap_size);
-    for (i = 0; i<ncache_dirs; i++) {
+    for (i = 0; i < ncache_dirs; i++) {
        SD = &SwapDirs[i];
        storeAppendPrintf(sentry, "\n");
        storeAppendPrintf(sentry, "Store Directory #%d: %s\n", i, SD->path);
@@ -381,6 +381,6 @@ storeDirStats(StoreEntry *sentry)
        storeAppendPrintf(sentry, "Maximum Size: %d KB\n", SD->max_size);
        storeAppendPrintf(sentry, "Current Size: %d KB\n", SD->cur_size);
        storeAppendPrintf(sentry, "Percent Used: %0.2f%%\n",
-               100.0 * SD->cur_size /  SD->max_size);
+           100.0 * SD->cur_size / SD->max_size);
     }
 }