From 4cbc8f16b65571364828bf12a54c9094b25513f6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 21 Sep 2020 08:25:56 +0100 Subject: split out blank handler for about scheme --- content/fetchers/about/Makefile | 2 +- content/fetchers/about/about.c | 35 +----------------------- content/fetchers/about/blank.c | 59 +++++++++++++++++++++++++++++++++++++++++ content/fetchers/about/blank.h | 35 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 35 deletions(-) create mode 100644 content/fetchers/about/blank.c create mode 100644 content/fetchers/about/blank.h (limited to 'content/fetchers') diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile index 3a96d03bd..5b45022bf 100644 --- a/content/fetchers/about/Makefile +++ b/content/fetchers/about/Makefile @@ -1,6 +1,6 @@ # about fetcher sources -S_FETCHER_ABOUT := about.c imagecache.c +S_FETCHER_ABOUT := about.c imagecache.c blank.c # The following files depend on the testament content/fetchers/about/about.c: testament $(OBJROOT)/testament.h diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c index 3e645cd30..0448a0efc 100644 --- a/content/fetchers/about/about.c +++ b/content/fetchers/about/about.c @@ -49,6 +49,7 @@ #include "desktop/system_colour.h" #include "private.h" +#include "blank.h" #include "imagecache.h" #include "about.h" @@ -235,40 +236,6 @@ static bool fetch_about_srverror(struct fetch_about_context *ctx) } -/** - * Handler to generate about scheme cache page. - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_blank_handler(struct fetch_about_context *ctx) -{ - fetch_msg msg; - const char buffer[2] = { ' ', '\0' }; - - /* content is going to return ok */ - fetch_set_http_code(ctx->fetchh, 200); - - /* content type */ - if (fetch_about_send_header(ctx, "Content-Type: text/html")) - goto fetch_about_blank_handler_aborted; - - msg.type = FETCH_DATA; - msg.data.header_or_data.buf = (const uint8_t *) buffer; - msg.data.header_or_data.len = strlen(buffer); - - if (fetch_about_send_callback(&msg, ctx)) - goto fetch_about_blank_handler_aborted; - - msg.type = FETCH_FINISHED; - - fetch_about_send_callback(&msg, ctx); - - return true; - -fetch_about_blank_handler_aborted: - return false; -} /** diff --git a/content/fetchers/about/blank.c b/content/fetchers/about/blank.c new file mode 100644 index 000000000..b7ba52eaf --- /dev/null +++ b/content/fetchers/about/blank.c @@ -0,0 +1,59 @@ +/* + * Copyright 2020 Vincent Sanders + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file + * content generator for the about scheme blank page + */ + +#include +#include +#include + +#include "netsurf/types.h" +#include "utils/errors.h" + +#include "private.h" +#include "blank.h" + +/** + * Handler to generate about scheme cache page. + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_blank_handler(struct fetch_about_context *ctx) +{ + const char buffer[2] = { ' ', '\0' }; + + /* content is going to return ok */ + fetch_about_set_http_code(ctx, 200); + + /* content type */ + if (fetch_about_send_header(ctx, "Content-Type: text/html")) + goto fetch_about_blank_handler_aborted; + + fetch_about_senddata(ctx, (const uint8_t *) buffer, strlen(buffer)); + + fetch_about_send_finished(ctx); + + return true; + +fetch_about_blank_handler_aborted: + return false; +} diff --git a/content/fetchers/about/blank.h b/content/fetchers/about/blank.h new file mode 100644 index 000000000..09dcc1f6a --- /dev/null +++ b/content/fetchers/about/blank.h @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Vincent Sanders + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file + * about scheme blank handler interface + */ + +#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_BLANK_H +#define NETSURF_CONTENT_FETCHERS_ABOUT_BLANK_H + +/** + * Handler to generate about scheme blank page. + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_blank_handler(struct fetch_about_context *ctx); + +#endif -- cgit v1.2.3