From 6c9e4bea8eeb22665269226fb240f62fff850f81 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Thu, 8 Apr 2010 12:16:52 +0000
Subject: Purge FETCH_TYPE which is unused throughout NetSurf.  Clearing a todo
 in llcachec.

svn path=/trunk/netsurf/; revision=10300
---
 amiga/fetch_file.c            | 4 ++--
 content/fetch.c               | 4 ++--
 content/fetch.h               | 1 -
 content/fetchers/fetch_curl.c | 4 ++--
 content/llcache.c             | 3 ---
 riscos/plugin.c               | 1 -
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/amiga/fetch_file.c b/amiga/fetch_file.c
index f0b509203..8624b469a 100755
--- a/amiga/fetch_file.c
+++ b/amiga/fetch_file.c
@@ -122,10 +122,10 @@ void ami_fetch_file_finalise(const char *scheme)
  *
  * The caller must supply a callback function which is called when anything
  * interesting happens. The callback function is first called with msg
- * FETCH_TYPE, with the Content-Type header in data, then one or more times
+ * FETCH_HEADER, with the header in data, then one or more times
  * with FETCH_DATA with some data for the url, and finally with
  * FETCH_FINISHED. Alternatively, FETCH_ERROR indicates an error occurred:
- * data contains an error message. FETCH_REDIRECT may replace the FETCH_TYPE,
+ * data contains an error message. FETCH_REDIRECT may replace the FETCH_HEADER,
  * FETCH_DATA, FETCH_FINISHED sequence if the server sends a replacement URL.
  *
  * Some private data can be passed as the last parameter to fetch_start, and
diff --git a/content/fetch.c b/content/fetch.c
index acb4b3766..b1c2e216c 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -200,10 +200,10 @@ void fetch_unref_fetcher(scheme_fetcher *fetcher)
  *
  * The caller must supply a callback function which is called when anything
  * interesting happens. The callback function is first called with msg
- * FETCH_TYPE, with the Content-Type header in data, then one or more times
+ * FETCH_HEADER, with the header in data, then one or more times
  * with FETCH_DATA with some data for the url, and finally with
  * FETCH_FINISHED. Alternatively, FETCH_ERROR indicates an error occurred:
- * data contains an error message. FETCH_REDIRECT may replace the FETCH_TYPE,
+ * data contains an error message. FETCH_REDIRECT may replace the FETCH_HEADER,
  * FETCH_DATA, FETCH_FINISHED sequence if the server sends a replacement URL.
  *
  */
diff --git a/content/fetch.h b/content/fetch.h
index 24d8816b8..c872518c0 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -27,7 +27,6 @@
 #include "utils/config.h"
 
 typedef enum {
-              FETCH_TYPE,
               FETCH_PROGRESS,
               FETCH_HEADER,
               FETCH_DATA,
diff --git a/content/fetchers/fetch_curl.c b/content/fetchers/fetch_curl.c
index dd9f3ca17..62b8228d1 100644
--- a/content/fetchers/fetch_curl.c
+++ b/content/fetchers/fetch_curl.c
@@ -282,10 +282,10 @@ void fetch_curl_finalise(const char *scheme)
  *
  * The caller must supply a callback function which is called when anything
  * interesting happens. The callback function is first called with msg
- * FETCH_TYPE, with the Content-Type header in data, then one or more times
+ * FETCH_HEADER, with the header in data, then one or more times
  * with FETCH_DATA with some data for the url, and finally with
  * FETCH_FINISHED. Alternatively, FETCH_ERROR indicates an error occurred:
- * data contains an error message. FETCH_REDIRECT may replace the FETCH_TYPE,
+ * data contains an error message. FETCH_REDIRECT may replace the FETCH_HEADER,
  * FETCH_DATA, FETCH_FINISHED sequence if the server sends a replacement URL.
  *
  * Some private data can be passed as the last parameter to fetch_start, and
diff --git a/content/llcache.c b/content/llcache.c
index d2891d4c8..1d1b043b3 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -1473,9 +1473,6 @@ void llcache_fetch_callback(fetch_msg msg, void *p, const void *data,
 		object->fetch.state = LLCACHE_FETCH_HEADERS;
 
 		error = llcache_fetch_process_header(object, data, size);
-	case FETCH_TYPE:
-		/** \todo Purge FETCH_TYPE completely */
-		break;
 	case FETCH_DATA:
 		/* Received some data */
 		object->fetch.state = LLCACHE_FETCH_DATA;
diff --git a/riscos/plugin.c b/riscos/plugin.c
index 5778e531b..eae6ad0ed 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -1766,7 +1766,6 @@ void plugin_fetch_callback(fetch_msg msg, void *p, const void *data,
 			content_broadcast(s->c, CONTENT_MSG_ERROR, msg_data);
 			break;
 
-		case FETCH_TYPE:
 		case FETCH_NOTMODIFIED:
 		case FETCH_AUTH:
 		case FETCH_CERT_ERR:
-- 
cgit v1.2.3