From 30909f8ed53848e450b7e362ef05b1eb06e09ddb Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 26 Feb 2015 15:58:40 +0000 Subject: Move FILE_SCHEME_PREFIX to corestrings. --- atari/findfile.c | 2 +- beos/gui.cpp | 1 + gtk/scaffolding.c | 2 +- test/llcache.c | 1 + utils/corestrings.h | 6 ++++++ utils/url.h | 9 ++------- 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 #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); /** -- cgit v1.2.3