change BIT_RESET to BIT_CLEAR

diff --git a/src/defines.h b/src/defines.h
index 9232886d3ccc3132f6f14a253e1b004e93b1598f..9fcf10be872a3c05f2234554279befb8962f5b0b 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -161,11 +161,11 @@
 #define DISK_PAGE_SIZE  8192
 
 #define BIT_SET(flag, bit)     ((flag) |= (bit))
-#define BIT_RESET(flag, bit)   ((flag) &= ~(bit))
+#define BIT_CLR(flag, bit)     ((flag) &= ~(bit))
 #define BIT_TEST(flag, bit)    ((flag) & (bit))
 
 #define EBIT_SET(flag, bit)    ((flag) |= ((1<<bit)))
-#define EBIT_RESET(flag, bit)  ((flag) &= ~((1<<bit)))
+#define EBIT_CLR(flag, bit)    ((flag) &= ~((1<<bit)))
 #define EBIT_TEST(flag, bit)   ((flag) & ((1<<bit)))
 
 /* 

diff --git a/src/disk.cc b/src/disk.cc
index 8fd64cfdaebbd85ca994abe349ce51c0b6d5bd54..4662339d0ace467ede048a8f7e524996e0a112a4 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: disk.cc,v 1.88 1997/10/27 22:53:09 wessels Exp $
+ * $Id: disk.cc,v 1.89 1997/10/28 21:59:03 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -315,8 +315,8 @@ diskHandleWriteComplete(void *data, int len, int errcode)
     if (fdd->write_q == NULL) {
        /* no more data */
        fdd->write_q_tail = NULL;
-       BIT_RESET(F->flags, FD_WRITE_PENDING);
-       BIT_RESET(F->flags, FD_WRITE_DAEMON);
+       BIT_CLR(F->flags, FD_WRITE_PENDING);
+       BIT_CLR(F->flags, FD_WRITE_DAEMON);
     } else {
        /* another block is queued */
        commSetSelect(fd, COMM_SELECT_WRITE, diskHandleWrite, NULL, 0);

diff --git a/src/ftp.cc b/src/ftp.cc
index ee0cddcf5a7e0cddf5e6d35ab1e3ecd6138a97b1..faac3d754bf26b5c2d62d70e427c73deeed21900 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.154 1997/10/27 22:49:48 wessels Exp $
+ * $Id: ftp.cc,v 1.155 1997/10/28 21:59:05 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -760,13 +760,13 @@ ftpCleanupUrlpath(FtpStateData * ftpState)
            /* remove any trailing slashes from path */
            *(request->urlpath + l - 1) = '\0';
            EBIT_SET(ftpState->flags, FTP_ISDIR);
-           EBIT_RESET(ftpState->flags, FTP_USE_BASE);
+           EBIT_CLR(ftpState->flags, FTP_USE_BASE);
            again = 1;
        } else if ((l >= 2) && (!strcmp(request->urlpath + l - 2, "/."))) {
            /* remove trailing /. */
            *(request->urlpath + l - 2) = '\0';
            EBIT_SET(ftpState->flags, FTP_ISDIR);
-           EBIT_RESET(ftpState->flags, FTP_USE_BASE);
+           EBIT_CLR(ftpState->flags, FTP_USE_BASE);
            again = 1;
        } else if (*request->urlpath == '/') {
            /* remove any leading slashes from path */
@@ -1375,7 +1375,7 @@ static void
 ftpSendPort(FtpStateData * ftpState)
 {
     debug(9, 3) ("This is ftpSendPort\n");
-    EBIT_RESET(ftpState->flags, FTP_PASV_SUPPORTED);
+    EBIT_CLR(ftpState->flags, FTP_PASV_SUPPORTED);
 }
 
 static void
@@ -1417,7 +1417,7 @@ ftpReadRest(FtpStateData * ftpState)
        ftpState->state = SENT_RETR;
     } else if (code > 0) {
        debug(9, 3) ("ftpReadRest: REST not supported\n");
-       EBIT_RESET(ftpState->flags, FTP_REST_SUPPORTED);
+       EBIT_CLR(ftpState->flags, FTP_REST_SUPPORTED);
     } else {
        ftpFail(ftpState);
     }

diff --git a/src/gopher.cc b/src/gopher.cc
index 202f7ebdb62503aa57ea4d99153cda7147db2afb..02b00f83edfa8dd420c0e08d04efc17af3e60a4f 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: gopher.cc,v 1.107 1997/10/27 20:05:13 wessels Exp $
+ * $Id: gopher.cc,v 1.108 1997/10/28 21:59:06 wessels Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -375,7 +375,7 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len)
            "<ISINDEX></BODY></HTML>\n", entry->url, entry->url);
        storeAppend(entry, outbuf, strlen(outbuf));
        /* now let start sending stuff to client */
-       BIT_RESET(entry->flag, DELAY_SENDING);
+       BIT_CLR(entry->flag, DELAY_SENDING);
        gopherState->data_in = 1;
 
        return;
@@ -391,7 +391,7 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len)
 
        storeAppend(entry, outbuf, strlen(outbuf));
        /* now let start sending stuff to client */
-       BIT_RESET(entry->flag, DELAY_SENDING);
+       BIT_CLR(entry->flag, DELAY_SENDING);
        gopherState->data_in = 1;
 
        return;
@@ -639,7 +639,7 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len)
     if ((int) strlen(outbuf) > 0) {
        storeAppend(entry, outbuf, strlen(outbuf));
        /* now let start sending stuff to client */
-       BIT_RESET(entry->flag, DELAY_SENDING);
+       BIT_CLR(entry->flag, DELAY_SENDING);
     }
     return;
 }
@@ -732,7 +732,7 @@ gopherReadReply(int fd, void *data)
        if (gopherState->conversion != NORMAL)
            gopherEndHTML(data);
        storeTimestampsSet(entry);
-       BIT_RESET(entry->flag, DELAY_SENDING);
+       BIT_CLR(entry->flag, DELAY_SENDING);
        storeComplete(entry);
        comm_close(fd);
     } else {

diff --git a/src/http.cc b/src/http.cc
index bade90ddf4747f56b92c55a85f664af722c96820..5a2cfa3394b93290be5fbc871733d2e1f7b07605 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.205 1997/10/28 18:10:38 wessels Exp $
+ * $Id: http.cc,v 1.206 1997/10/28 21:59:08 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -275,7 +275,7 @@ static void
 httpMakePrivate(StoreEntry * entry)
 {
     storeExpireNow(entry);
-    BIT_RESET(entry->flag, ENTRY_CACHABLE);
+    BIT_CLR(entry->flag, ENTRY_CACHABLE);
     storeReleaseRequest(entry);        /* delete object when not used */
 }
 

diff --git a/src/store.cc b/src/store.cc
index 9e53a707874ac10814d09cdeed42deb2142e1302..5fdec3bf40a24cbdf0a3f5e8de9f7d3d6c95bb3e 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.323 1997/10/28 21:56:08 wessels Exp $
+ * $Id: store.cc,v 1.324 1997/10/28 21:59:13 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -594,7 +594,7 @@ storeSetPrivateKey(StoreEntry * e)
        safe_free(e->key);
     e->key = xstrdup(newkey);
     storeHashInsert(e);
-    BIT_RESET(e->flag, KEY_URL);
+    BIT_CLR(e->flag, KEY_URL);
     BIT_SET(e->flag, KEY_CHANGE);
     BIT_SET(e->flag, KEY_PRIVATE);
 }
@@ -624,13 +624,13 @@ storeSetPublicKey(StoreEntry * e)
     if (e->method == METHOD_GET) {
        e->key = e->url;
        BIT_SET(e->flag, KEY_URL);
-       BIT_RESET(e->flag, KEY_CHANGE);
+       BIT_CLR(e->flag, KEY_CHANGE);
     } else {
        e->key = xstrdup(newkey);
-       BIT_RESET(e->flag, KEY_URL);
+       BIT_CLR(e->flag, KEY_URL);
        BIT_SET(e->flag, KEY_CHANGE);
     }
-    BIT_RESET(e->flag, KEY_PRIVATE);
+    BIT_CLR(e->flag, KEY_PRIVATE);
     storeHashInsert(e);
 }
 
@@ -653,15 +653,15 @@ storeCreateEntry(const char *url, const char *log_url, int flags, method_t metho
        storeSetPublicKey(e);
     if (BIT_TEST(flags, REQ_CACHABLE)) {
        BIT_SET(e->flag, ENTRY_CACHABLE);
-       BIT_RESET(e->flag, RELEASE_REQUEST);
+       BIT_CLR(e->flag, RELEASE_REQUEST);
     } else {
-       BIT_RESET(e->flag, ENTRY_CACHABLE);
+       BIT_CLR(e->flag, ENTRY_CACHABLE);
        storeReleaseRequest(e);
     }
     if (BIT_TEST(flags, REQ_HIERARCHICAL))
        BIT_SET(e->flag, HIERARCHICAL);
     else
-       BIT_RESET(e->flag, HIERARCHICAL);
+       BIT_CLR(e->flag, HIERARCHICAL);
     e->store_status = STORE_PENDING;
     storeSetMemStatus(e, NOT_IN_MEMORY);
     e->swap_status = SWAPOUT_NONE;
@@ -713,8 +713,8 @@ storeAddDiskRestore(const char *url,
     e->refcount = refcount;
     e->flag = flags;
     BIT_SET(e->flag, ENTRY_CACHABLE);
-    BIT_RESET(e->flag, RELEASE_REQUEST);
-    BIT_RESET(e->flag, KEY_PRIVATE);
+    BIT_CLR(e->flag, RELEASE_REQUEST);
+    BIT_CLR(e->flag, KEY_PRIVATE);
     e->ping_status = PING_NONE;
     if (clean) {
        BIT_SET(e->flag, ENTRY_VALIDATED);
@@ -722,7 +722,7 @@ storeAddDiskRestore(const char *url,
        /* otherwise, set it in the validation procedure */
        storeDirMapBitSet(file_number);
     } else {
-       BIT_RESET(e->flag, ENTRY_VALIDATED);
+       BIT_CLR(e->flag, ENTRY_VALIDATED);
     }
     return e;
 }
@@ -1356,7 +1356,7 @@ storeValidate(StoreEntry * e, VCB callback, void *callback_data)
 #endif
     assert(!BIT_TEST(e->flag, ENTRY_VALIDATED));
     if (e->swap_file_number < 0) {
-       BIT_RESET(e->flag, ENTRY_VALIDATED);
+       BIT_CLR(e->flag, ENTRY_VALIDATED);
        callback(callback_data);
        return;
     }
@@ -1391,7 +1391,7 @@ storeValidateComplete(void *data, int retcode, int errcode)
        retcode = stat(path, sb);
     }
     if (retcode < 0 || sb->st_size == 0 || sb->st_size != e->object_len) {
-       BIT_RESET(e->flag, ENTRY_VALIDATED);
+       BIT_CLR(e->flag, ENTRY_VALIDATED);
     } else {
        BIT_SET(e->flag, ENTRY_VALIDATED);
        storeDirMapBitSet(e->swap_file_number);
@@ -1488,7 +1488,7 @@ storeCheckCachable(StoreEntry * e)
        return 1;
     }
     storeReleaseRequest(e);
-    BIT_RESET(e->flag, ENTRY_CACHABLE);
+    BIT_CLR(e->flag, ENTRY_CACHABLE);
     return 0;
 }
 

diff --git a/src/wais.cc b/src/wais.cc
index cc57d8133fb65e2a419f3594ff5c101299c2a77b..829a55903e78b3318df54f4cb29f503c8f2bc81a 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.91 1997/10/28 20:42:55 wessels Exp $
+ * $Id: wais.cc,v 1.92 1997/10/28 21:59:14 wessels Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -199,7 +199,7 @@ waisReadReply(int fd, void *data)
                waisReadReply, waisState, 0);
        } else {
            ErrorState *err;
-           BIT_RESET(entry->flag, ENTRY_CACHABLE);
+           BIT_CLR(entry->flag, ENTRY_CACHABLE);
            storeReleaseRequest(entry);
            err = xcalloc(1, sizeof(ErrorState));
            err->type = ERR_READ_ERROR;