From 69778e29457cc0fbe65361e0db460908b89a8459 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 24 Jan 2014 08:39:01 +0000 Subject: move framebuffer fetch operations to their own module --- framebuffer/findfile.c | 68 -------------------------------------------------- 1 file changed, 68 deletions(-) (limited to 'framebuffer/findfile.c') diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c index 821a66305..67312f452 100644 --- a/framebuffer/findfile.c +++ b/framebuffer/findfile.c @@ -16,19 +16,9 @@ * along with this program. If not, see . */ -#include -#include -#include #include -#include -#include - -#include #include "utils/filepath.h" -#include "utils/log.h" -#include "utils/url.h" -#include "desktop/gui.h" #include "framebuffer/findfile.h" @@ -57,64 +47,6 @@ fb_init_resource(const char *resource_path) } -char *path_to_url(const char *path) -{ - int urllen; - char *url; - - if (path == NULL) - return NULL; - - urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 1; - url = malloc(urllen); - - if (*path == '/') { - path++; /* file: paths are already absolute */ - } - - snprintf(url, urllen, "%s%s", FILE_SCHEME_PREFIX, path); - - return url; -} - - -char *url_to_path(const char *url) -{ - char *path; - char *respath; - url_func_result res; /* result from url routines */ - - res = url_path(url, &path); - if (res != URL_FUNC_OK) { - return NULL; - } - - res = url_unescape(path, &respath); - free(path); - if (res != URL_FUNC_OK) { - return NULL; - } - - return respath; -} - -nsurl *gui_get_resource_url(const char *path) -{ - char buf[PATH_MAX]; - char *raw; - nsurl *url = NULL; - - if (strcmp(path, "favicon.ico") == 0) - path = "favicon.png"; - - raw = path_to_url(filepath_sfind(respaths, buf, path)); - if (raw != NULL) { - nsurl_create(raw, &url); - free(raw); - } - - return url; -} /* * Local Variables: -- cgit v1.2.3