summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2015-02-26 15:58:40 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2015-02-26 16:14:23 +0000
commit30909f8ed53848e450b7e362ef05b1eb06e09ddb (patch)
treeb36250b9f4b1c2b3da8e2f96d3e6adb9232b2802
parentb051c037d35ff87e215d4bafa056732a5072aa55 (diff)
downloadnetsurf-30909f8ed53848e450b7e362ef05b1eb06e09ddb.tar.gz
netsurf-30909f8ed53848e450b7e362ef05b1eb06e09ddb.tar.bz2
Move FILE_SCHEME_PREFIX to corestrings.
-rwxr-xr-xatari/findfile.c2
-rw-r--r--beos/gui.cpp1
-rw-r--r--gtk/scaffolding.c2
-rw-r--r--test/llcache.c1
-rw-r--r--utils/corestrings.h6
-rw-r--r--utils/url.h9
6 files changed, 12 insertions, 9 deletions
diff --git a/atari/findfile.c b/atari/findfile.c
index c8ac7cc10..60b3ed510 100755
--- a/atari/findfile.c
+++ b/atari/findfile.c
@@ -26,7 +26,7 @@
#include <curl/curl.h>
#include "utils/log.h"
-#include "utils/url.h"
+#include "utils/corestrings.h"
#include "atari/gemtk/gemtk.h"
#include "atari/findfile.h"
#include "atari/misc.h"
diff --git a/beos/gui.cpp b/beos/gui.cpp
index 6447fd9e9..948638217 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -49,6 +49,7 @@ extern "C" {
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
+#include "utils/corestrings.h"
#include "utils/utf8.h"
#include "utils/utils.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index b204dbe28..85d61495c 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -27,7 +27,7 @@
#include "utils/filepath.h"
#include "utils/messages.h"
-#include "utils/url.h"
+#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/nsoption.h"
#include "utils/file.h"
diff --git a/test/llcache.c b/test/llcache.c
index 606516dd6..ca9da91ae 100644
--- a/test/llcache.c
+++ b/test/llcache.c
@@ -28,6 +28,7 @@
#include "utils/nsurl.h"
#include "utils/schedule.h"
#include "utils/url.h"
+#include "utils/corestrings.h"
#include "utils/utils.h"
/******************************************************************************
diff --git a/utils/corestrings.h b/utils/corestrings.h
index 9fcc224ee..b55852900 100644
--- a/utils/corestrings.h
+++ b/utils/corestrings.h
@@ -27,6 +27,12 @@
#include "utils/nsurl.h"
#include "utils/errors.h"
+/** File url prefix. */
+#define FILE_SCHEME_PREFIX "file:///"
+
+/** File url prefix length. */
+#define FILE_SCHEME_PREFIX_LEN 8
+
nserror corestrings_init(void);
void corestrings_fini(void);
diff --git a/utils/url.h b/utils/url.h
index 143a0a0fe..aafdf1e15 100644
--- a/utils/url.h
+++ b/utils/url.h
@@ -27,12 +27,6 @@
#include "utils/errors.h"
-/** File url prefix. */
-#define FILE_SCHEME_PREFIX "file:///"
-
-/** File url prefix length. */
-#define FILE_SCHEME_PREFIX_LEN 8
-
/**
* Escape a string suitable for inclusion in an URL.
@@ -44,7 +38,8 @@
* \param result pointer to pointer to buffer to hold escaped string
* \return NSERROR_OK on success
*/
-nserror url_escape(const char *unescaped, size_t toskip, bool sptoplus, const char *escexceptions, char **result);
+nserror url_escape(const char *unescaped, size_t toskip, bool sptoplus,
+ const char *escexceptions, char **result);
/**