trim out code sections #ifdef'd out

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index d9112596e10b3de4a96d0dcd4c150ca48e615010..1e055761d787e6db09f79d0a115037015b9f8d9c 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.41 1996/04/15 22:56:31 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.42 1996/04/15 23:02:25 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -861,62 +861,6 @@ static void parseWAISRelayLine()
     Config.Wais.maxObjSize = i << 20;
 }
 
-#ifdef OLD_CODE
-static void parseProxyAllowLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&proxy_ip_acl, token, IP_ALLOW);
-}
-
-static void parseAccelAllowLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&accel_ip_acl, token, IP_ALLOW);
-}
-
-static void parseManagerAllowLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&manager_ip_acl, token, IP_ALLOW);
-}
-
-static void parseProxyDenyLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&proxy_ip_acl, token, IP_DENY);
-}
-
-static void parseAccelDenyLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&accel_ip_acl, token, IP_DENY);
-}
-
-static void parseManagerDenyLine()
-{
-    char *token;
-    token = strtok(NULL, w_space);
-    if (token == (char *) NULL)
-       return;
-    addToIPACL(&manager_ip_acl, token, IP_DENY);
-}
-#endif
-
 static void parseLocalIPLine()
 {
     char *token;
@@ -1223,32 +1167,6 @@ int parseConfigFile(file_name)
        else if (!strcmp(token, "cache_mgr"))
            parseMgrLine();
 
-#ifdef OLD_CODE
-       /* Parse a proxy_allow line */
-       else if (!strcmp(token, "proxy_allow"))
-           parseProxyAllowLine();
-
-       /* Parse a proxy_deny line */
-       else if (!strcmp(token, "proxy_deny"))
-           parseProxyDenyLine();
-
-       /* Parse a accel_allow line */
-       else if (!strcmp(token, "accel_allow"))
-           parseAccelAllowLine();
-
-       /* Parse a accel_deny line */
-       else if (!strcmp(token, "accel_deny"))
-           parseAccelDenyLine();
-
-       /* Parse a manager_allow line */
-       else if (!strcmp(token, "manager_allow"))
-           parseManagerAllowLine();
-
-       /* Parse a manager_deny line */
-       else if (!strcmp(token, "manager_deny"))
-           parseManagerDenyLine();
-#endif /* OLD_CODE */
-
        else if (!strcmp(token, "acl"))
            aclParseAclLine();
 
@@ -1288,12 +1206,6 @@ int parseConfigFile(file_name)
        else if (!strcmp(token, "ttl_pattern"))
            parseTTLPattern();
 
-#ifdef OLD_CODE
-       /* Parse a blocklist line */
-       else if (!strcmp(token, "blocklist"))
-           parseBlockListLine();
-#endif
-
        /* Parse a negative_ttl line */
        else if (!strcmp(token, "negative_ttl"))
            parseNegativeLine();

diff --git a/src/http.cc b/src/http.cc
index 766b2833e8fdcda2989fcd1c08545ae454e59cdd..216bf8ae20038e65374cd9e75798a60f470bac53 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,4 +1,4 @@
-/* $Id: http.cc,v 1.46 1996/04/15 22:52:04 wessels Exp $ */
+/* $Id: http.cc,v 1.47 1996/04/15 23:02:26 wessels Exp $ */
 
 /*
  * DEBUG: Section 11          http: HTTP
@@ -69,9 +69,9 @@ static int http_url_parser(url, host, port, request)
        return -1;
     } else if (t == 2)
        strcpy(request, "/");
-    if ((s = strchr(hostbuf, ':')) && *(s+1)) {
-        *s = '\0';
-        *port = atoi(s + 1);
+    if ((s = strchr(hostbuf, ':')) && *(s + 1)) {
+       *s = '\0';
+       *port = atoi(s + 1);
     }
     strncpy(host, hostbuf, SQUIDHOSTNAMELEN);
     return 0;

diff --git a/src/store.cc b/src/store.cc
index da762ec440f1ed3277e6fb4b5b438501050f9dba..49ce6465420bf58627ec4e81d2e72c675d0c5ed9 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
-/* $Id: store.cc,v 1.52 1996/04/15 22:54:23 wessels Exp $ */
-#ident "$Id: store.cc,v 1.52 1996/04/15 22:54:23 wessels Exp $"
+/* $Id: store.cc,v 1.53 1996/04/15 23:02:28 wessels Exp $ */
+#ident "$Id: store.cc,v 1.53 1996/04/15 23:02:28 wessels Exp $"
 
 /*
  * DEBUG: Section 20          store
@@ -109,7 +109,7 @@ static int storelog_fd = -1;
 static char key_temp_buffer[MAX_URL];
 static char swaplog_file[MAX_FILE_NAME_LEN];
 static char tmp_filename[MAX_FILE_NAME_LEN];
-static char logmsg[MAX_URL<<1];
+static char logmsg[MAX_URL << 1];
 
 /* patch cache_dir to accomodate multiple disk storage */
 dynamic_array *cache_dirs = NULL;
@@ -676,17 +676,9 @@ StoreEntry *storeAddDiskRestore(url, file_number, size, expires, timestamp)
     debug(20, 5, "StoreAddDiskRestore: <URL:%s>: size %d: expires %d: file_number %d\n",
        url, size, expires, file_number);
 
-#ifdef EXTRA_CODE
-    if (file_map_bit_test(file_number)) {
-       debug(20, 0, "This file number is already allocated!\n");
-       debug(20, 0, "    --> file_number %d\n", file_number);
-       debug(20, 0, "    --> <URL:%s>\n", url);
-       return (NULL);
-    }
-#else
     /* if you call this you'd better be sure file_number is not 
      * already in use! */
-#endif
+
     meta_data.store_entries++;
     meta_data.url_strings += strlen(url);
 
@@ -1252,14 +1244,7 @@ static int storeDoRebuildFromDisk(data)
     if (!fgets(data->line_in, 4095, data->log))
        return 0;
 
-#ifdef NOT_NEEDED
-    if ((data->linecount++ & 0x7F) == 0)       /* update current time */
-       getCurrentTime();
-#else
-    data->linecount++;
-#endif
-
-    if ((data->linecount & 0xFFF) == 0)
+    if ((data->linecount++ & 0xFFF) == 0)
        debug(20, 1, "  %7d Lines read so far.\n", data->linecount);
 
     debug(20, 10, "line_in: %s", data->line_in);
@@ -1457,21 +1442,21 @@ void storeStartRebuildFromDisk()
        file_close(swaplog_fd);
     sprintf(tmp_filename, "%s.new", swaplog_file);
     swaplog_fd = file_open(tmp_filename, NULL, O_WRONLY | O_CREAT | O_APPEND);
-    debug(20,3,"swaplog_fd %d is now '%s'\n", swaplog_fd, tmp_filename);
+    debug(20, 3, "swaplog_fd %d is now '%s'\n", swaplog_fd, tmp_filename);
     if (swaplog_fd < 0) {
        debug(20, 0, "storeStartRebuildFromDisk: %s: %s\n",
            tmp_filename, xstrerror());
        fatal("storeStartRebuildFromDisk: Can't open tmp swaplog");
     }
     swaplog_lock = file_write_lock(swaplog_fd);
-    debug(20,3,"swaplog_lock = %d\n", swaplog_lock);
+    debug(20, 3, "swaplog_lock = %d\n", swaplog_lock);
     /* Open the existing swap log for reading */
     if ((data->log = fopen(swaplog_file, "r")) == (FILE *) NULL) {
        sprintf(tmp_error_buf, "storeRebuildFromDisk: %s: %s",
            swaplog_file, xstrerror());
        fatal(tmp_error_buf);
     }
-    debug(20,3,"data->log %d is now '%s'\n", fileno(data->log), swaplog_file);
+    debug(20, 3, "data->log %d is now '%s'\n", fileno(data->log), swaplog_file);
     if (data->fast_mode)
        debug(20, 1, "Rebuilding in FAST MODE.\n");
 
@@ -2337,18 +2322,6 @@ int storeClientCopy(e, stateoffset, maxSize, buf, size, fd)
     return *size;
 }
 
-#ifdef NOT_USED_CODE
-int storeGrep(e, string, nbytes)
-     StoreEntry *e;
-     char *string;
-     int nbytes;
-{
-    if (e && entry->mem_obj && e->mem_obj->data && (nbytes > 0))
-       return e->mem_obj->data->mem_grep(e->mem_obj->data, string, nbytes);
-    return 0;
-}
-#endif
-
 
 int storeEntryValidToSend(e)
      StoreEntry *e;
@@ -2481,13 +2454,13 @@ int storeInit()
     sprintf(swaplog_file, "%s/log", swappath(0));
 
     swaplog_fd = file_open(swaplog_file, NULL, O_WRONLY | O_CREAT | O_APPEND);
-    debug(20,3,"swaplog_fd %d is now '%s'\n", swaplog_fd, swaplog_file);
+    debug(20, 3, "swaplog_fd %d is now '%s'\n", swaplog_fd, swaplog_file);
     if (swaplog_fd < 0) {
        sprintf(tmp_error_buf, "Cannot open swap logfile: %s", swaplog_file);
        fatal(tmp_error_buf);
     }
     swaplog_lock = file_write_lock(swaplog_fd);
-    debug(20,3,"swaplog_lock = %d\n", swaplog_lock);
+    debug(20, 3, "swaplog_lock = %d\n", swaplog_lock);
 
     if (!zap_disk_store) {
        ok_write_clean_log = 0;

diff --git a/src/url.cc b/src/url.cc
index 569f52428b7108433ba9b7a11fb1f974fb087439..73e9f1c62485fe9888264f72268b0719fc7dc16e 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,4 +1,4 @@
-/* $Id: url.cc,v 1.14 1996/04/15 22:55:02 wessels Exp $ */
+/* $Id: url.cc,v 1.15 1996/04/15 23:02:28 wessels Exp $ */
 
 /* 
  * DEBUG: Section 23          url
@@ -102,60 +102,6 @@ char *url_escape(url)
     return tmpline;
 }
 
-
-#ifdef NOT_YET_USED
-/*
- * Strip the url from e->key, return a pointer to a static copy of it.
- * Planning ahead for removing e->url from meta-data
- */
-char *the_url(e)
-     StoreEntry *e;
-{
-    char *URL;
-    char *token;
-    static char line_in[MAX_URL + 1];
-    static char delim[] = "/";
-    int i;
-
-    strcpy(line_in, e->key);
-    token = strtok(line_in, delim);
-
-    if (!(e->flag & CACHABLE) && (sscanf(token, "%d", &i))) {
-       URL = strtok(NULL, "~");        /* Non_CACHABLE, key = /%d/url */
-       return URL;
-    }
-    if ((e->flag & KEY_CHANGE) && (sscanf(token, "x%d", &i))) {
-       /* key is changed, key = /x%d/url or /x%d/head/url or /x%d/post/url */
-       /* Now key is url or head/url or post/url */
-       token = strtok(NULL, "~");
-    } else {
-       /* key is url or /head/url or /post/url */
-       strcpy(token, e->key);
-    }
-
-    if (e->method == METHOD_GET) {
-       /* key is url */
-       return token;
-    } else if ((e->method == METHOD_POST) &&
-       (!(strncmp(token, "post/", 5)) || !(strncmp(token, "/post/", 6)))) {
-       URL = strtok(token, delim);
-       URL = strtok(NULL, "~");
-       /* discard "/post/" or "post/" from the key and get url */
-       return URL;
-    } else if ((e->method == METHOD_HEAD) &&
-       (!(strncmp(token, "head/", 5)) || !(strncmp(token, "/head/", 6)))) {
-       URL = strtok(token, delim);
-       URL = strtok(NULL, "~");
-       /* discard "/head/" or "head/" from the key and get url */
-       return URL;
-    } else {
-       debug(23, 0, "Should not be here. Unknown format of the key: %s\n",
-           e->key);
-       return (NULL);
-    }
-}
-#endif
-
 method_t urlParseMethod(s)
      char *s;
 {