From 47ccd9855db44881339e68093655247a78fd8598 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 27 Jun 2016 21:09:39 +0100 Subject: Move fetcher_fdset to fetch.h (and rename to fetch_fdset). Maybe not ideal but better --- frontends/amiga/gui.c | 4 ++-- frontends/beos/gui.cpp | 4 ++-- frontends/gtk/gui.c | 4 ++-- frontends/monkey/main.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 8d7c69ddb..ba7f979ef 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -108,7 +108,7 @@ #include "netsurf/cookie_db.h" #include "netsurf/url_db.h" #include "content/backing_store.h" -#include "content/fetchers.h" +#include "content/fetch.h" #include "desktop/browser_history.h" #include "desktop/hotlist.h" #include "desktop/version.h" @@ -2788,7 +2788,7 @@ void ami_get_msg(void) uint32 signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig | helpsignal; - if ((fetcher_fdset(&read_fd_set, &write_fd_set, &except_fd_set, &max_fd) == NSERROR_OK) && + if ((fetch_fdset(&read_fd_set, &write_fd_set, &except_fd_set, &max_fd) == NSERROR_OK) && (max_fd != -1)) { /* max_fd is the highest fd in use, but waitselect() needs to know how many * are in use, so we add 1. */ diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp index 0dcbd6b6e..93b304a5c 100644 --- a/frontends/beos/gui.cpp +++ b/frontends/beos/gui.cpp @@ -64,7 +64,7 @@ extern "C" { #include "netsurf/browser_window.h" #include "netsurf/cookie_db.h" #include "netsurf/url_db.h" -#include "content/fetchers.h" +#include "content/fetch.h" } @@ -739,7 +739,7 @@ void nsbeos_gui_poll(void) bigtime_t next_schedule = 0; /* get any active fetcher fd */ - fetcher_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); + fetch_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); /* run the scheduler */ schedule_run(); diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index 16d919967..d358b43db 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c @@ -38,7 +38,7 @@ #include "utils/utils.h" #include "utils/file.h" #include "utils/nsoption.h" -#include "content/fetchers.h" +#include "content/fetch.h" #include "netsurf/url_db.h" #include "netsurf/cookie_db.h" #include "content/backing_store.h" @@ -401,7 +401,7 @@ static void nsgtk_main(void) FD_ZERO(&write_fd_set); FD_ZERO(&exc_fd_set); - fetcher_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); + fetch_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); for (int i = 0; i <= max_fd; i++) { if (FD_ISSET(i, &read_fd_set)) { GPollFD *fd = malloc(sizeof *fd); diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c index 0ddfd9a80..0059ff047 100644 --- a/frontends/monkey/main.c +++ b/frontends/monkey/main.c @@ -35,7 +35,7 @@ #include "netsurf/netsurf.h" #include "netsurf/url_db.h" #include "netsurf/cookie_db.h" -#include "content/fetchers.h" +#include "content/fetch.h" #include "monkey/dispatch.h" #include "monkey/browser.h" @@ -258,7 +258,7 @@ static void monkey_run(void) while (!monkey_done) { /* clears fdset */ - fetcher_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); + fetch_fdset(&read_fd_set, &write_fd_set, &exc_fd_set, &max_fd); /* add stdin to the set */ if (max_fd < 0) { -- cgit v1.2.3