summaryrefslogtreecommitdiff
path: root/framebuffer
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2010-03-31 13:59:57 +0000
committerVincent Sanders <vince@netsurf-browser.org>2010-03-31 13:59:57 +0000
commit95e4a737de53dc2f02a2db95b26151d9d494bc0c (patch)
treea9dcb06c696a463f824d61865fb46d6a7bfa755b /framebuffer
parent9f575c590b3c304ab02707ee3378bd2e4f4c9094 (diff)
downloadnetsurf-95e4a737de53dc2f02a2db95b26151d9d494bc0c.tar.gz
netsurf-95e4a737de53dc2f02a2db95b26151d9d494bc0c.tar.bz2
rationalise the usage of the file scheme
svn path=/trunk/netsurf/; revision=10221
Diffstat (limited to 'framebuffer')
-rw-r--r--framebuffer/findfile.c5
-rw-r--r--framebuffer/findfile.h2
-rw-r--r--framebuffer/gui.c1
3 files changed, 4 insertions, 4 deletions
diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c
index 29b82588d..64d96fcb4 100644
--- a/framebuffer/findfile.c
+++ b/framebuffer/findfile.c
@@ -24,14 +24,15 @@
#include <string.h>
#include "utils/log.h"
+#include "utils/url.h"
#include "framebuffer/findfile.h"
char *path_to_url(const char *path)
{
- char *r = malloc(strlen(path) + 7 + 1);
+ char *r = malloc(strlen(path) + FILE_SCHEME_PREFIX_LEN + 1);
- strcpy(r, "file://");
+ strcpy(r, FILE_SCHEME_PREFIX);
strcat(r, path);
return r;
diff --git a/framebuffer/findfile.h b/framebuffer/findfile.h
index 87b9a95e4..85a2f7074 100644
--- a/framebuffer/findfile.h
+++ b/framebuffer/findfile.h
@@ -19,8 +19,6 @@
#ifndef NETSURF_FB_FINDFILE_H
#define NETSURF_FB_FINDFILE_H
-char *path_to_url(const char *path);
-
extern char *fb_find_resource(char *buf, const char *filename, const char *def);
#endif /* NETSURF_FB_FINDFILE_H */
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index c537c705b..62ca77131 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -38,6 +38,7 @@
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "utils/log.h"
+#include "utils/url.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "desktop/textinput.h"