change type_id to method everywhere

diff --git a/src/http.cc b/src/http.cc
index f3db3ed0b83aeb57249ff0c19b0cd5b8d4e74bfc..dae0c8adc9a1da4c4b529619dab3b6197b3f3581 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,4 +1,4 @@
-/* $Id: http.cc,v 1.39 1996/04/12 04:33:48 wessels Exp $ */
+/* $Id: http.cc,v 1.40 1996/04/12 04:53:48 wessels Exp $ */
 
 /*
  * DEBUG: Section 11          http: HTTP
@@ -535,7 +535,7 @@ int proxyhttpStart(e, url, entry)
     data->entry = entry;
 
     strncpy(data->request, url, sizeof(data->request) - 1);
-    data->method = entry->type_id;
+    data->method = entry->method;
     data->port = e->ascii_port;
     data->req_hdr = entry->mem_obj->mime_hdr;
     strncpy(data->host, e->host, sizeof(data->host) - 1);

diff --git a/src/store.cc b/src/store.cc
index be3c26d77c9686437e16aa33500fc4c95e9e6063..892029869b1c0c266917507504cbd539dff98314 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
-/* $Id: store.cc,v 1.44 1996/04/11 23:52:00 wessels Exp $ */
-#ident "$Id: store.cc,v 1.44 1996/04/11 23:52:00 wessels Exp $"
+/* $Id: store.cc,v 1.45 1996/04/12 04:53:50 wessels Exp $ */
+#ident "$Id: store.cc,v 1.45 1996/04/12 04:53:50 wessels Exp $"
 
 /*
  * DEBUG: Section 20          store
@@ -491,9 +491,9 @@ StoreEntry *storeGet(url)
     return NULL;
 }
 
-char *storeGeneratePrivateKey(url, type_id, num)
+char *storeGeneratePrivateKey(url, method, num)
      char *url;
-     int type_id;
+     int method;
      int num;
 {
     if (key_counter == 0)
@@ -504,17 +504,17 @@ char *storeGeneratePrivateKey(url, type_id, num)
     key_temp_buffer[0] = '\0';
     sprintf(key_temp_buffer, "%d/%s/%s",
        num,
-       RequestMethodStr[type_id],
+       RequestMethodStr[method],
        url);
     return key_temp_buffer;
 }
 
-char *storeGeneratePublicKey(url, request_type_id)
+char *storeGeneratePublicKey(url, method)
      char *url;
-     int request_type_id;
+     int method;
 {
-    debug(20, 3, "storeGeneratePublicKey: type=%d %s\n", request_type_id, url);
-    switch (request_type_id) {
+    debug(20, 3, "storeGeneratePublicKey: type=%d %s\n", method, url);
+    switch (method) {
     case METHOD_GET:
        return url;
        break;
@@ -543,7 +543,7 @@ void storeSetPrivateKey(e)
     if (e->key && BIT_TEST(e->flag, KEY_PRIVATE))
        return;                 /* is already private */
 
-    newkey = storeGeneratePrivateKey(e->url, e->type_id, 0);
+    newkey = storeGeneratePrivateKey(e->url, e->method, 0);
     if ((table_entry = hash_lookup(table, newkey))) {
        e2 = (StoreEntry *) table_entry;
        debug(20, 0, "storeSetPrivateKey: Entry already exists with key '%s'\n",
@@ -572,7 +572,7 @@ void storeSetPublicKey(e)
     if (e->key && !BIT_TEST(e->flag, KEY_PRIVATE))
        return;                 /* is already public */
 
-    newkey = storeGeneratePublicKey(e->url, e->type_id);
+    newkey = storeGeneratePublicKey(e->url, e->method);
     while ((table_entry = hash_lookup(table, newkey))) {
        debug(20, 0, "storeSetPublicKey: Making old '%s' private.\n", newkey);
        e2 = (StoreEntry *) table_entry;
@@ -583,7 +583,7 @@ void storeSetPublicKey(e)
        storeHashDelete(e);
     if (e->key && !BIT_TEST(e->flag, KEY_URL))
        safe_free(e->key);
-    if (e->type_id == METHOD_GET) {
+    if (e->method == METHOD_GET) {
        e->key = e->url;
        BIT_SET(e->flag, KEY_URL);
        BIT_RESET(e->flag, KEY_CHANGE);
@@ -612,7 +612,7 @@ StoreEntry *storeCreateEntry(url, req_hdr, flags, method)
     m = e->mem_obj;
     e->url = xstrdup(url);
     meta_data.url_strings += strlen(url);
-    e->type_id = method;
+    e->method = method;
     if (req_hdr)
        m->mime_hdr = xstrdup(req_hdr);
     if (BIT_TEST(flags, REQ_NOCACHE))
@@ -684,7 +684,7 @@ StoreEntry *storeAddDiskRestore(url, file_number, size, expires, timestamp)
     e = new_StoreEntry(WITHOUT_MEMOBJ);
     e->url = xstrdup(url);
     BIT_RESET(e->flag, ENTRY_PRIVATE);
-    e->type_id = METHOD_GET;
+    e->method = METHOD_GET;
     storeSetPublicKey(e);
     e->flag = 0;
     BIT_SET(e->flag, CACHABLE);
@@ -713,12 +713,14 @@ int storeRegister(e, fd, handler, data)
      PIF handler;
      void *data;
 {
-    PendingEntry *pe = (PendingEntry *) xmalloc(sizeof(PendingEntry));
-    int old_size, i, j;
+    PendingEntry *pe = NULL;
+    int old_size;
+    int i;
+    int j;
 
     debug(20, 3, "storeRegister: FD %d '%s'\n", fd, e->key);
 
-    memset(pe, '\0', sizeof(PendingEntry));
+    pe = (PendingEntry *) xcalloc(1, sizeof(PendingEntry));
     pe->fd = fd;
     pe->handler = handler;
     pe->data = data;
@@ -1420,7 +1422,7 @@ static int storeCheckSwapable(e)
        debug(20, 2, "storeCheckSwapable: NO: private entry\n");
     } else if (e->expires <= cached_curtime) {
        debug(20, 2, "storeCheckSwapable: NO: already expired\n");
-    } else if (e->type_id != METHOD_GET) {
+    } else if (e->method != METHOD_GET) {
        debug(20, 2, "storeCheckSwapable: NO: non-GET method\n");
     } else if (!BIT_TEST(e->flag, CACHABLE)) {
        debug(20, 2, "storeCheckSwapable: NO: not cachable\n");
@@ -2045,7 +2047,7 @@ int storeRelease(e)
            fatal_dump(NULL);
        }
     }
-    if (e->type_id == METHOD_GET) {
+    if (e->method == METHOD_GET) {
        /* check if coresponding HEAD object exists. */
        head_table_entry = hash_lookup(table,
            storeGeneratePublicKey(e->url, METHOD_HEAD));

diff --git a/src/url.cc b/src/url.cc
index bbca28e44fc131357b2d1554ea2036d7e5b10763..41e591eb755d42a8c2a441c58823bf53977ba7a7 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,4 +1,4 @@
-/* $Id: url.cc,v 1.11 1996/04/11 22:53:42 wessels Exp $ */
+/* $Id: url.cc,v 1.12 1996/04/12 04:53:53 wessels Exp $ */
 
 /* 
  * DEBUG: Section 23          url
@@ -115,16 +115,16 @@ char *the_url(e)
        strcpy(token, e->key);
     }
 
-    if (e->type_id == METHOD_GET) {
+    if (e->method == METHOD_GET) {
        /* key is url */
        return token;
-    } else if ((e->type_id == METHOD_POST) &&
+    } 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->type_id == METHOD_HEAD) &&
+    } else if ((e->method == METHOD_HEAD) &&
        (!(strncmp(token, "head/", 5)) || !(strncmp(token, "/head/", 6)))) {
        URL = strtok(token, delim);
        URL = strtok(NULL, "~");