summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-05-02 10:25:51 (GMT)
committer Ashish Gupta <ashmew2@gmail.com>2017-06-10 06:25:29 (GMT)
commit5aeb8eb5583d7d088c8132d3dca0dc3c34d8c565 (patch)
treec1baa401b342f8fb4306891bb045327992375a94
parent95cbdd36e355c2d4b0f10b45d1ea172672676e42 (diff)
downloadnetsurf-5aeb8eb5583d7d088c8132d3dca0dc3c34d8c565.tar.gz
netsurf-5aeb8eb5583d7d088c8132d3dca0dc3c34d8c565.tar.bz2
Fix description for FETCH_HEADER
Remove redundant FETCH_XXX description from the curl fetcher.
-rw-r--r--content/fetch.h8
-rw-r--r--content/fetchers/curl.c20
2 files changed, 6 insertions, 22 deletions
diff --git a/content/fetch.h b/content/fetch.h
index 5521778..79fb0ed 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -103,14 +103,14 @@ typedef void (*fetch_callback)(const fetch_msg *msg, void *p);
* The function returns immediately. The fetch may be queued for later
* processing.
*
- * A pointer to an opaque struct fetch is returned, which can be passed to
+ * A pointer to an opaque struct fetch_info is returned, which can be passed to
* fetch_abort() to abort the fetch at any time. Returns NULL if memory is
* exhausted (or some other fatal error occurred).
*
* The caller must supply a callback function which is called when anything
- * interesting happens. The callback function is first called with msg
- * FETCH_HEADER, with the header in data, then one or more times
- * with FETCH_DATA with some data for the url, and finally with
+ * interesting happens. The callback function is first called one or more times
+ * with msg.type FETCH_HEADER for each line of 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_HEADER,
* FETCH_DATA, FETCH_FINISHED sequence if the server sends a replacement URL.
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 7d0e40c..4b5745c 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -283,24 +283,8 @@ fetch_curl_post_convert(const struct fetch_multipart_data *control)
/**
* Start fetching data for the given URL.
- *
- * The function returns immediately. The fetch may be queued for later
- * processing.
- *
- * A pointer to an opaque struct curl_fetch_info is returned, which can be
- * passed to fetch_abort() to abort the fetch at any time. Returns 0 if memory
- * is exhausted (or some other fatal error occurred).
- *
- * The caller must supply a callback function which is called when anything
- * interesting happens. The callback function is first called with msg
- * 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_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
- * callbacks will contain this.
+ * Returns a pointer to struct curl_fetch_info.
+ * See content/fetch.h for more information.
*/
static void *
fetch_curl_setup(struct fetch *parent_fetch,