summaryrefslogtreecommitdiff
path: root/content/fetchers
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-04-21 22:36:21 +0100
committerVincent Sanders <vince@kyllikki.org>2016-04-21 22:36:21 +0100
commit7d9c9dba3610bb14c0de6acb1bdaf9ec49a66f33 (patch)
tree5efbbb0accdce7586dfe518f3ea0c00a6e8a9c43 /content/fetchers
parent3488e337b64f7444f3021ca98f391d4ded3326e4 (diff)
downloadnetsurf-7d9c9dba3610bb14c0de6acb1bdaf9ec49a66f33.tar.gz
netsurf-7d9c9dba3610bb14c0de6acb1bdaf9ec49a66f33.tar.bz2
Split utils header into string functions and everything else
split out the string handling API from the rest of the utils header and fix up all the fallout.
Diffstat (limited to 'content/fetchers')
-rw-r--r--content/fetchers/about.c32
-rw-r--r--content/fetchers/curl.c1
-rw-r--r--content/fetchers/data.c26
-rw-r--r--content/fetchers/file.c12
-rw-r--r--content/fetchers/resource.c17
5 files changed, 25 insertions, 63 deletions
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index cf66a622b..605d3a8d9 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -16,7 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file content/fetchers/about.c
+/**
+ * \file
*
* URL handling for the "about" scheme.
*
@@ -25,39 +26,24 @@
* information from the browser from a known, fixed URL.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <inttypes.h>
+#include <stdlib.h>
#include <string.h>
-#include <strings.h>
-#include <time.h>
#include <stdio.h>
-#include <limits.h>
#include <stdarg.h>
-#include <libwapcaplet/libwapcaplet.h>
-
#include "testament.h"
+#include "utils/corestrings.h"
+#include "utils/nsoption.h"
+#include "utils/utils.h"
+#include "utils/ring.h"
-#include "utils/config.h"
-#include "utils/dirent.h"
#include "content/fetch.h"
#include "content/fetchers.h"
#include "content/fetchers/about.h"
-#include "content/urldb.h"
-#include "utils/nsoption.h"
-#include "utils/corestrings.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
-#include "utils/ring.h"
+#include "content/content_type.h"
#include "image/image_cache.h"
+
struct fetch_about_context;
typedef bool (*fetch_about_handler)(struct fetch_about_context *);
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 07b13d543..7b9c5f0d7 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -51,6 +51,7 @@
#include "utils/ring.h"
#include "utils/useragent.h"
#include "utils/file.h"
+#include "utils/string.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_internal.h"
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 6c18911e2..84d0aa3fa 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -16,32 +16,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* data: URL handling. See http://tools.ietf.org/html/rfc2397 */
+/**
+ * \file
+ * data scheme handling. See http://tools.ietf.org/html/rfc2397
+ */
-#include <assert.h>
-#include <errno.h>
#include <stdbool.h>
#include <string.h>
-#include <strings.h>
-#include <time.h>
-
-#include <curl/curl.h> /* for URL unescaping functions */
-
+#include <stdlib.h>
+#include <curl/curl.h> /* for URL unescaping functions */
#include <libwapcaplet/libwapcaplet.h>
-#include "utils/config.h"
-#include "content/fetch.h"
-#include "content/fetchers.h"
-#include "content/fetchers/data.h"
-#include "content/urldb.h"
+#include "utils/nsurl.h"
#include "utils/corestrings.h"
-#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/base64.h"
+#include "content/fetch.h"
+#include "content/fetchers.h"
+#include "content/fetchers/data.h"
+
struct fetch_data_context {
struct fetch *parent_fetch;
char *url;
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index d13b4d56a..2e3411ac1 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -24,33 +24,26 @@
#include "utils/config.h"
+#include <stdlib.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <assert.h>
#include <errno.h>
#include <stdbool.h>
-#include <inttypes.h>
#include <string.h>
-#include <strings.h>
#include <time.h>
#include <stdio.h>
-#include <limits.h>
#include <stdarg.h>
-
#ifdef HAVE_MMAP
#include <sys/mman.h>
#endif
-
#include <libwapcaplet/libwapcaplet.h>
+#include "utils/nsurl.h"
#include "utils/dirent.h"
#include "utils/corestrings.h"
-#include "utils/nsoption.h"
-#include "utils/errors.h"
-#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/ring.h"
@@ -61,7 +54,6 @@
#include "content/dirlist.h"
#include "content/fetch.h"
#include "content/fetchers.h"
-#include "content/urldb.h"
#include "content/fetchers/file.h"
/* Maximum size of read buffer */
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 2db414d68..4dfac5c6a 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -21,27 +21,15 @@
* resource scheme URL handling. Based on the data fetcher by Rob Kendrick
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
+#include <stdlib.h>
#include <stdbool.h>
-#include <inttypes.h>
#include <string.h>
-#include <strings.h>
-#include <time.h>
#include <stdio.h>
-#include <limits.h>
#include <stdarg.h>
-
#include <libwapcaplet/libwapcaplet.h>
-#include "utils/dirent.h"
-#include "utils/errors.h"
+#include "utils/nsurl.h"
#include "utils/corestrings.h"
-#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
@@ -52,7 +40,6 @@
#include "content/fetch.h"
#include "content/fetchers.h"
#include "content/fetchers/resource.h"
-#include "content/urldb.h"
#define DIRECT_ETAG_VALUE 123456