From 95e4a737de53dc2f02a2db95b26151d9d494bc0c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 31 Mar 2010 13:59:57 +0000 Subject: rationalise the usage of the file scheme svn path=/trunk/netsurf/; revision=10221 --- framebuffer/findfile.c | 5 +++-- framebuffer/findfile.h | 2 -- framebuffer/gui.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'framebuffer') 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 #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" -- cgit v1.2.3