Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/47ccd9855db44881339e68093655247a78fd8598
...commit
http://git.netsurf-browser.org/netsurf.git/commit/47ccd9855db44881339e68093655247a78fd8598
...tree
http://git.netsurf-browser.org/netsurf.git/tree/47ccd9855db44881339e68093655247a78fd8598
The branch, master has been updated
via 47ccd9855db44881339e68093655247a78fd8598 (commit)
via 767b73f5c703e447a3041423ff220a88a7c0c569 (commit)
from a468b409901236ecf77f0cbd81dfeda96cebc758 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=47ccd9855db44881339e68093655247a78fd8598
commit 47ccd9855db44881339e68093655247a78fd8598
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Move fetcher_fdset to fetch.h (and rename to fetch_fdset). Maybe not ideal
but better
diff --git a/content/fetch.c b/content/fetch.c
index decb261..11adf9c 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -379,8 +379,9 @@ fetcher_add(lwc_string *scheme, const struct
fetcher_operation_table *ops)
return NSERROR_OK;
}
-/* exported interface documented in content/fetchers.h */
-nserror fetcher_fdset(fd_set *read_fd_set,
+/* exported interface documented in content/fetch.h */
+nserror
+fetch_fdset(fd_set *read_fd_set,
fd_set *write_fd_set,
fd_set *except_fd_set,
int *maxfd_out)
diff --git a/content/fetch.h b/content/fetch.h
index 3c1f1cc..6694ffd 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -210,5 +210,30 @@ const char *fetch_get_referer_to_send(struct fetch *fetch);
*/
void fetch_set_cookie(struct fetch *fetch, const char *data);
+/**
+ * Get the set of file descriptors the fetchers are currently using.
+ *
+ * This obtains the file descriptors the fetch system is using to
+ * obtain data. It will cause the fetchers to make progress, if
+ * possible, potentially completing fetches before requiring activity
+ * on file descriptors.
+ *
+ * If a set of descriptors is returned (maxfd is not -1) The caller is
+ * expected to wait on them (with select etc.) and continue to obtain
+ * the fdset with this call. This will switch the fetchers from polled
+ * mode to waiting for network activity which is much more efficient.
+ *
+ * \note If the caller does not subsequently obtain the fdset again
+ * the fetchers will fall back to the less efficient polled
+ * operation. The fallback to polled operation will only occour after
+ * a timeout which introduces additional delay.
+ *
+ * \param[out] read_fd_set The fd set for read.
+ * \param[out] write_fd_set The fd set for write.
+ * \param[out] except_fd_set The fd set for exceptions.
+ * \param[out] maxfd The highest fd number in the set or -1 if no fd available.
+ * \return NSERROR_OK on success or appropriate error code.
+ */
+nserror fetch_fdset(fd_set *read_fd_set, fd_set *write_fd_set, fd_set
*except_fd_set, int *maxfd);
#endif
diff --git a/content/fetchers.h b/content/fetchers.h
index cd09e92..6392e24 100644
--- a/content/fetchers.h
+++ b/content/fetchers.h
@@ -129,30 +129,4 @@ nserror fetcher_init(void);
void fetcher_quit(void);
-/**
- * Get the set of file descriptors the fetchers are currently using.
- *
- * This obtains the file descriptors the fetch system is using to
- * obtain data. It will cause the fetchers to make progress, if
- * possible, potentially completing fetches before requiring activity
- * on file descriptors.
- *
- * If a set of descriptors is returned (maxfd is not -1) The caller is
- * expected to wait on them (with select etc.) and continue to obtain
- * the fdset with this call. This will switch the fetchers from polled
- * mode to waiting for network activity which is much more efficient.
- *
- * \note If the caller does not subsequently obtain the fdset again
- * the fetchers will fall back to the less efficient polled
- * operation. The fallback to polled operation will only occour after
- * a timeout which introduces additional delay.
- *
- * \param[out] read_fd_set The fd set for read.
- * \param[out] write_fd_set The fd set for write.
- * \param[out] except_fd_set The fd set for exceptions.
- * \param[out] maxfd The highest fd number in the set or -1 if no fd available.
- * \return NSERROR_OK on success or appropriate error code.
- */
-nserror fetcher_fdset(fd_set *read_fd_set, fd_set *write_fd_set, fd_set
*except_fd_set, int *maxfd);
-
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 8d7c69d..ba7f979 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 0dcbd6b..93b304a 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 16d9199..d358b43 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 0ddfd9a..0059ff0 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) {
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=767b73f5c703e447a3041423ff220a88a7c0c569
commit 767b73f5c703e447a3041423ff220a88a7c0c569
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Add NULL for silly frontend which can't use a useful compiler
diff --git a/frontends/beos/fetch_rsrc.cpp b/frontends/beos/fetch_rsrc.cpp
index 0218055..4df246f 100644
--- a/frontends/beos/fetch_rsrc.cpp
+++ b/frontends/beos/fetch_rsrc.cpp
@@ -369,6 +369,7 @@ void fetch_rsrc_register(void)
fetch_rsrc_abort,
fetch_rsrc_free,
fetch_rsrc_poll,
+ NULL,
fetch_rsrc_finalise
};
-----------------------------------------------------------------------
Summary of changes:
content/fetch.c | 5 +++--
content/fetch.h | 25 +++++++++++++++++++++++++
content/fetchers.h | 26 --------------------------
frontends/amiga/gui.c | 4 ++--
frontends/beos/fetch_rsrc.cpp | 1 +
frontends/beos/gui.cpp | 4 ++--
frontends/gtk/gui.c | 4 ++--
frontends/monkey/main.c | 4 ++--
8 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/content/fetch.c b/content/fetch.c
index decb261..11adf9c 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -379,8 +379,9 @@ fetcher_add(lwc_string *scheme, const struct
fetcher_operation_table *ops)
return NSERROR_OK;
}
-/* exported interface documented in content/fetchers.h */
-nserror fetcher_fdset(fd_set *read_fd_set,
+/* exported interface documented in content/fetch.h */
+nserror
+fetch_fdset(fd_set *read_fd_set,
fd_set *write_fd_set,
fd_set *except_fd_set,
int *maxfd_out)
diff --git a/content/fetch.h b/content/fetch.h
index 3c1f1cc..6694ffd 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -210,5 +210,30 @@ const char *fetch_get_referer_to_send(struct fetch *fetch);
*/
void fetch_set_cookie(struct fetch *fetch, const char *data);
+/**
+ * Get the set of file descriptors the fetchers are currently using.
+ *
+ * This obtains the file descriptors the fetch system is using to
+ * obtain data. It will cause the fetchers to make progress, if
+ * possible, potentially completing fetches before requiring activity
+ * on file descriptors.
+ *
+ * If a set of descriptors is returned (maxfd is not -1) The caller is
+ * expected to wait on them (with select etc.) and continue to obtain
+ * the fdset with this call. This will switch the fetchers from polled
+ * mode to waiting for network activity which is much more efficient.
+ *
+ * \note If the caller does not subsequently obtain the fdset again
+ * the fetchers will fall back to the less efficient polled
+ * operation. The fallback to polled operation will only occour after
+ * a timeout which introduces additional delay.
+ *
+ * \param[out] read_fd_set The fd set for read.
+ * \param[out] write_fd_set The fd set for write.
+ * \param[out] except_fd_set The fd set for exceptions.
+ * \param[out] maxfd The highest fd number in the set or -1 if no fd available.
+ * \return NSERROR_OK on success or appropriate error code.
+ */
+nserror fetch_fdset(fd_set *read_fd_set, fd_set *write_fd_set, fd_set
*except_fd_set, int *maxfd);
#endif
diff --git a/content/fetchers.h b/content/fetchers.h
index cd09e92..6392e24 100644
--- a/content/fetchers.h
+++ b/content/fetchers.h
@@ -129,30 +129,4 @@ nserror fetcher_init(void);
void fetcher_quit(void);
-/**
- * Get the set of file descriptors the fetchers are currently using.
- *
- * This obtains the file descriptors the fetch system is using to
- * obtain data. It will cause the fetchers to make progress, if
- * possible, potentially completing fetches before requiring activity
- * on file descriptors.
- *
- * If a set of descriptors is returned (maxfd is not -1) The caller is
- * expected to wait on them (with select etc.) and continue to obtain
- * the fdset with this call. This will switch the fetchers from polled
- * mode to waiting for network activity which is much more efficient.
- *
- * \note If the caller does not subsequently obtain the fdset again
- * the fetchers will fall back to the less efficient polled
- * operation. The fallback to polled operation will only occour after
- * a timeout which introduces additional delay.
- *
- * \param[out] read_fd_set The fd set for read.
- * \param[out] write_fd_set The fd set for write.
- * \param[out] except_fd_set The fd set for exceptions.
- * \param[out] maxfd The highest fd number in the set or -1 if no fd available.
- * \return NSERROR_OK on success or appropriate error code.
- */
-nserror fetcher_fdset(fd_set *read_fd_set, fd_set *write_fd_set, fd_set
*except_fd_set, int *maxfd);
-
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 8d7c69d..ba7f979 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/fetch_rsrc.cpp b/frontends/beos/fetch_rsrc.cpp
index 0218055..4df246f 100644
--- a/frontends/beos/fetch_rsrc.cpp
+++ b/frontends/beos/fetch_rsrc.cpp
@@ -369,6 +369,7 @@ void fetch_rsrc_register(void)
fetch_rsrc_abort,
fetch_rsrc_free,
fetch_rsrc_poll,
+ NULL,
fetch_rsrc_finalise
};
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 0dcbd6b..93b304a 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 16d9199..d358b43 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 0ddfd9a..0059ff0 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) {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
