Change '(*handler)()' to just handler()

diff --git a/src/client_side.cc b/src/client_side.cc
index c47237c08629bd489aab07f9fe0336fda6c49e1a..086bbcd3ef0dfbec2ed8b2afbd74e2fcb808c690 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.8 1996/08/19 22:46:00 wessels Exp $
+ * $Id: client_side.cc,v 1.9 1996/08/20 15:44:17 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -113,7 +113,7 @@ void clientAccessCheck(icpState, handler)
     requestUnlink(icpState->aclChecklist->request);
     safe_free(icpState->aclChecklist);
     icpState->aclHandler = NULL;
-    (*handler) (icpState, answer);
+    handler(icpState, answer);
 }
 
 void clientAccessCheckDone(icpState, answer)

diff --git a/src/redirect.cc b/src/redirect.cc
index fdff4af4b3f1547b9ee862b74f33b67629e052c9..472a0f64a0df8a8fab88aef969220f05b8354c31 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: redirect.cc,v 1.10 1996/08/19 22:46:01 wessels Exp $
+ * $Id: redirect.cc,v 1.11 1996/08/20 15:44:18 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -305,7 +305,7 @@ void redirectStart(cfd, icpState, handler, data)
     if (!icpState)
        fatal_dump("redirectStart: NULL icpState");
     if (Config.Program.redirect == NULL) {
-       (*handler) (data, NULL);
+       handler(data, NULL);
        return;
     }
     r = xcalloc(1, sizeof(redirectStateData));

diff --git a/src/store.cc b/src/store.cc
index 72517fd809e670ba9dd7a24d2a0a5565be618a0d..9a8a34bbbdd0436f9544ce5affc0783f0a1c44cf 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: store.cc,v 1.84 1996/08/19 23:09:25 wessels Exp $
+ * $Id: store.cc,v 1.85 1996/08/20 15:44:19 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -501,12 +501,9 @@ int storeLockObject(e, handler, data)
      SIH handler;
      void *data;
 {
-    int swap_in_stat = 0;
     int status = 0;
-
     e->lock_count++;
     debug(20, 3, "storeLockObject: locks %d: '%s'\n", e->lock_count, e->key);
-
     if (e->mem_status != NOT_IN_MEMORY)
        /* ok, its either IN_MEMORY or SWAPPING_IN */
        debug(20, 5, "storeLockObject: OK: mem_status is %s\n", memStatusStr[e->mem_status]);
@@ -519,27 +516,24 @@ int storeLockObject(e, handler, data)
     else
        fatal_dump(storeDescribeStatus(e));
     e->lastref = squid_curtime;
-
     /* If the object is NOT_IN_MEMORY, fault it in. */
     if ((e->mem_status == NOT_IN_MEMORY) && (e->swap_status == SWAP_OK)) {
        /* object is in disk and no swapping daemon running. Bring it in. */
-       if ((swap_in_stat = storeSwapInStart(e, handler, data)) < 0) {
-           /*
-            * We couldn't find or couldn't open object's swapfile.
+       if ((status = storeSwapInStart(e, handler, data)) < 0) {
+           /* We couldn't find or couldn't open object's swapfile.
             * So, return a -1 here, indicating that we will treat
             * the reference like a MISS_TTL, force a keychange and
             storeRelease.  */
            e->lock_count--;
        }
-       status = swap_in_stat;
     } else if (e->mem_status == IN_MEMORY && handler) {
        /* its already in memory, so call the handler */
-       (*handler) (0, data);
+       handler(0, data);
     } else if (handler) {
        /* The object is probably in state SWAPPING_IN, not much we can do.
         * Instead of returning failure here, we should have a list of complete
         * handlers which we could append to... */
-       (*handler) (1, data);
+       handler(1, data);
     }
     return status;
 }
@@ -2632,6 +2626,7 @@ static void storeCreateSwapSubDirs()
     for (j = 0; j < ncache_dirs; j++) {
        for (i = 0; i < SWAP_DIRECTORIES_L1; i++) {
            sprintf(name, "%s/%02X", swappath(j), i);
+           debug(20, 1, "Making directories in %s\n", name);
            if (mkdir(name, 0755) < 0) {
                if (errno != EEXIST) {
                    sprintf(tmp_error_buf,