October 2013 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch master updated. release/3.0-668-g26cecc9

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/26cecc9f95e55f33b4cb9... ...commit http://git.netsurf-browser.org/netsurf.git/commit/26cecc9f95e55f33b4cb95e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/26cecc9f95e55f33b4cb95e94... The branch, master has been updated via 26cecc9f95e55f33b4cb95e9439c718b9caf29d8 (commit) via 1ae1d06ca463e64fc49dae686ecdc4d8a0e5293a (commit) from 10bc47a709a569d249c06de59b7f37d5cf71b30e (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=26cecc9f95e55f33b4c... commit 26cecc9f95e55f33b4cb95e9439c718b9caf29d8 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Log thumbnail creation. diff --git a/desktop/local_history.c b/desktop/local_history.c index d4f9519..b6d96b0 100644 --- a/desktop/local_history.c +++ b/desktop/local_history.c @@ -273,6 +273,7 @@ void history_add(struct history *history, hlcache_handle *content, * loading */ bitmap = urldb_get_thumbnail(nsurl); if (!bitmap) { + LOG(("Creating thumbnail for %s", nsurl_access(nsurl))); bitmap = bitmap_create(WIDTH, HEIGHT, BITMAP_NEW | BITMAP_CLEAR_MEMORY | BITMAP_OPAQUE); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1ae1d06ca463e64fc49... commit 1ae1d06ca463e64fc49dae686ecdc4d8a0e5293a Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce leaking of thumbnails to only for URLs that urldb rejects. Previously leaked thumbnails for all urls not previously visited. diff --git a/desktop/browser.c b/desktop/browser.c index 55f576a..d159a55 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1243,7 +1243,6 @@ static nserror browser_window_callback(hlcache_handle *c, if (bw->history_add && bw->history) { nsurl *url = hlcache_handle_get_url(c); - history_add(bw->history, c, bw->frag_id); if (urldb_add_url(url)) { urldb_set_url_title(url, content_get_title(c)); urldb_update_url_visit_data(url); @@ -1253,6 +1252,27 @@ static nserror browser_window_callback(hlcache_handle *c, /* This is safe as we've just added the URL */ global_history_add(urldb_get_url(url)); } + /* TODO: Urldb / Thumbnails / Local history brokenness + * + * We add to local history after calling urldb_add_url + * rather than in the block above. If urldb_add_url + * fails (as it will for urls like "about:about", + * "about:config" etc), there would be no local history + * node, and later calls to history_update will either + * explode or overwrite the node for the previous URL. + * + * We call it after, rather than before urldb_add_url + * because history_add calls thumbnail_create, which + * tries to register the thumbnail with urldb. That + * thumbnail registration fails if the url doesn't + * exist in urldb already, and only urldb-registered + * thumbnails get freed. So if we called history_add + * before urldb_add_url we would leak thumbnails for + * all newly visited URLs. With the history_add call + * after, we only leak the thumbnails when urldb does + * not add the URL. + */ + history_add(bw->history, c, bw->frag_id); } /* frames */ ----------------------------------------------------------------------- Summary of changes: desktop/browser.c | 22 +++++++++++++++++++++- desktop/local_history.c | 1 + 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/desktop/browser.c b/desktop/browser.c index 55f576a..d159a55 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1243,7 +1243,6 @@ static nserror browser_window_callback(hlcache_handle *c, if (bw->history_add && bw->history) { nsurl *url = hlcache_handle_get_url(c); - history_add(bw->history, c, bw->frag_id); if (urldb_add_url(url)) { urldb_set_url_title(url, content_get_title(c)); urldb_update_url_visit_data(url); @@ -1253,6 +1252,27 @@ static nserror browser_window_callback(hlcache_handle *c, /* This is safe as we've just added the URL */ global_history_add(urldb_get_url(url)); } + /* TODO: Urldb / Thumbnails / Local history brokenness + * + * We add to local history after calling urldb_add_url + * rather than in the block above. If urldb_add_url + * fails (as it will for urls like "about:about", + * "about:config" etc), there would be no local history + * node, and later calls to history_update will either + * explode or overwrite the node for the previous URL. + * + * We call it after, rather than before urldb_add_url + * because history_add calls thumbnail_create, which + * tries to register the thumbnail with urldb. That + * thumbnail registration fails if the url doesn't + * exist in urldb already, and only urldb-registered + * thumbnails get freed. So if we called history_add + * before urldb_add_url we would leak thumbnails for + * all newly visited URLs. With the history_add call + * after, we only leak the thumbnails when urldb does + * not add the URL. + */ + history_add(bw->history, c, bw->frag_id); } /* frames */ diff --git a/desktop/local_history.c b/desktop/local_history.c index d4f9519..b6d96b0 100644 --- a/desktop/local_history.c +++ b/desktop/local_history.c @@ -273,6 +273,7 @@ void history_add(struct history *history, hlcache_handle *content, * loading */ bitmap = urldb_get_thumbnail(nsurl); if (!bitmap) { + LOG(("Creating thumbnail for %s", nsurl_access(nsurl))); bitmap = bitmap_create(WIDTH, HEIGHT, BITMAP_NEW | BITMAP_CLEAR_MEMORY | BITMAP_OPAQUE); -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

toolchains: branch master updated. 1894883ba6970d8990f31c99ab846e58100683c9

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/1894883ba6970d8990... ...commit http://git.netsurf-browser.org/toolchains.git/commit/1894883ba6970d8990f3... ...tree http://git.netsurf-browser.org/toolchains.git/tree/1894883ba6970d8990f31c... The branch, master has been updated via 1894883ba6970d8990f31c99ab846e58100683c9 (commit) from b8c0b0ba0378b2b765f07facf394a9470119757c (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/toolchains.git/commit/?id=1894883ba6970d89... commit 1894883ba6970d8990f31c99ab846e58100683c9 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Update SDK filename. diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile index 47d9514..a1d7527 100644 --- a/ppc-amigaos/Makefile +++ b/ppc-amigaos/Makefile @@ -19,7 +19,7 @@ UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) -UPSTREAM_NDK_TARBALL := SDK_53.20.lha +UPSTREAM_NDK_TARBALL := SDK_53.24.lha UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..." UPSTREAM_OPENURL_VERSION := 7.8 ----------------------------------------------------------------------- Summary of changes: ppc-amigaos/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile index 47d9514..a1d7527 100644 --- a/ppc-amigaos/Makefile +++ b/ppc-amigaos/Makefile @@ -19,7 +19,7 @@ UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) -UPSTREAM_NDK_TARBALL := SDK_53.20.lha +UPSTREAM_NDK_TARBALL := SDK_53.24.lha UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..." UPSTREAM_OPENURL_VERSION := 7.8 -- Cross-compilation toolchains and environments

9 years, 5 months

1
0
0 / 0

libnsfb: branch master updated. release/0.1.0-5-g8e26218

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsfb.git/shortlog/8e262181e6f85bc89dfed... ...commit http://git.netsurf-browser.org/libnsfb.git/commit/8e262181e6f85bc89dfed65... ...tree http://git.netsurf-browser.org/libnsfb.git/tree/8e262181e6f85bc89dfed652d... The branch, master has been updated via 8e262181e6f85bc89dfed652d971a876c7e6e153 (commit) via 730e6ce9eeb9393243a4e0fe4eed229bf5414bc2 (commit) from be27acac0bf1f792be992b7913133a633a8c0b98 (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/libnsfb.git/commit/?id=8e262181e6f85bc89df... commit 8e262181e6f85bc89dfed652d971a876c7e6e153 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> When destroying framebuffer, ensure any cursor is destroyed. diff --git a/include/cursor.h b/include/cursor.h index 076e6c9..15751bd 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -38,4 +38,7 @@ bool nsfb_cursor_plot(nsfb_t *nsfb, struct nsfb_cursor_s *cursor); /** Clear the cursor restoring the image underneath */ bool nsfb_cursor_clear(nsfb_t *nsfb, struct nsfb_cursor_s *cursor); +/** Destroy the cursor */ +bool nsfb_cursor_destroy(struct nsfb_cursor_s *cursor); + #endif /* CURSOR_H */ diff --git a/src/cursor.c b/src/cursor.c index 5e3f41e..87633dc 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -150,3 +150,13 @@ bool nsfb_cursor_clear(nsfb_t *nsfb, struct nsfb_cursor_s *cursor) return true; } + +bool nsfb_cursor_destroy(struct nsfb_cursor_s *cursor) +{ + /* Note: cursor->pixel isn't owned by us */ + + free(cursor->sav); + free(cursor); + + return true; +} diff --git a/src/libnsfb.c b/src/libnsfb.c index 250df00..4d652c1 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -15,6 +15,7 @@ #include "libnsfb_plot.h" #include "libnsfb_event.h" #include "nsfb.h" +#include "cursor.h" #include "palette.h" #include "surface.h" @@ -58,9 +59,14 @@ nsfb_free(nsfb_t *nsfb) if (nsfb->plotter_fns != NULL) free(nsfb->plotter_fns); + if (nsfb->cursor != NULL) + nsfb_cursor_destroy(nsfb->cursor); + ret = nsfb->surface_rtns->finalise(nsfb); + free(nsfb->surface_rtns); free(nsfb); + return ret; } commitdiff http://git.netsurf-browser.org/libnsfb.git/commit/?id=730e6ce9eeb9393243a... commit 730e6ce9eeb9393243a4e0fe4eed229bf5414bc2 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Free plotter function table. diff --git a/src/libnsfb.c b/src/libnsfb.c index 67fc15c..250df00 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -55,6 +55,9 @@ nsfb_free(nsfb_t *nsfb) if (nsfb->palette != NULL) nsfb_palette_free(nsfb->palette); + if (nsfb->plotter_fns != NULL) + free(nsfb->plotter_fns); + ret = nsfb->surface_rtns->finalise(nsfb); free(nsfb->surface_rtns); free(nsfb); ----------------------------------------------------------------------- Summary of changes: include/cursor.h | 3 +++ src/cursor.c | 10 ++++++++++ src/libnsfb.c | 9 +++++++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/cursor.h b/include/cursor.h index 076e6c9..15751bd 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -38,4 +38,7 @@ bool nsfb_cursor_plot(nsfb_t *nsfb, struct nsfb_cursor_s *cursor); /** Clear the cursor restoring the image underneath */ bool nsfb_cursor_clear(nsfb_t *nsfb, struct nsfb_cursor_s *cursor); +/** Destroy the cursor */ +bool nsfb_cursor_destroy(struct nsfb_cursor_s *cursor); + #endif /* CURSOR_H */ diff --git a/src/cursor.c b/src/cursor.c index 5e3f41e..87633dc 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -150,3 +150,13 @@ bool nsfb_cursor_clear(nsfb_t *nsfb, struct nsfb_cursor_s *cursor) return true; } + +bool nsfb_cursor_destroy(struct nsfb_cursor_s *cursor) +{ + /* Note: cursor->pixel isn't owned by us */ + + free(cursor->sav); + free(cursor); + + return true; +} diff --git a/src/libnsfb.c b/src/libnsfb.c index 67fc15c..4d652c1 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -15,6 +15,7 @@ #include "libnsfb_plot.h" #include "libnsfb_event.h" #include "nsfb.h" +#include "cursor.h" #include "palette.h" #include "surface.h" @@ -55,9 +56,17 @@ nsfb_free(nsfb_t *nsfb) if (nsfb->palette != NULL) nsfb_palette_free(nsfb->palette); + if (nsfb->plotter_fns != NULL) + free(nsfb->plotter_fns); + + if (nsfb->cursor != NULL) + nsfb_cursor_destroy(nsfb->cursor); + ret = nsfb->surface_rtns->finalise(nsfb); + free(nsfb->surface_rtns); free(nsfb); + return ret; } -- NetSurf Framebuffer library

9 years, 5 months

1
0
0 / 0

libnsfb: branch master updated. release/0.1.0-3-gbe27aca

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsfb.git/shortlog/be27acac0bf1f792be992... ...commit http://git.netsurf-browser.org/libnsfb.git/commit/be27acac0bf1f792be992b7... ...tree http://git.netsurf-browser.org/libnsfb.git/tree/be27acac0bf1f792be992b791... The branch, master has been updated via be27acac0bf1f792be992b7913133a633a8c0b98 (commit) from 5df6e339ac1a86dca684cfbcfa86631abfa00d03 (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/libnsfb.git/commit/?id=be27acac0bf1f792be9... commit be27acac0bf1f792be992b7913133a633a8c0b98 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Free surface vtable. diff --git a/src/libnsfb.c b/src/libnsfb.c index a341088..67fc15c 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -56,6 +56,7 @@ nsfb_free(nsfb_t *nsfb) nsfb_palette_free(nsfb->palette); ret = nsfb->surface_rtns->finalise(nsfb); + free(nsfb->surface_rtns); free(nsfb); return ret; } ----------------------------------------------------------------------- Summary of changes: src/libnsfb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libnsfb.c b/src/libnsfb.c index a341088..67fc15c 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -56,6 +56,7 @@ nsfb_free(nsfb_t *nsfb) nsfb_palette_free(nsfb->palette); ret = nsfb->surface_rtns->finalise(nsfb); + free(nsfb->surface_rtns); free(nsfb); return ret; } -- NetSurf Framebuffer library

9 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.0-666-g10bc47a

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/10bc47a709a569d249c06... ...commit http://git.netsurf-browser.org/netsurf.git/commit/10bc47a709a569d249c06de... ...tree http://git.netsurf-browser.org/netsurf.git/tree/10bc47a709a569d249c06de59... The branch, master has been updated via 10bc47a709a569d249c06de59b7f37d5cf71b30e (commit) via 4fa77f968671f75038676ee0a76348c6a969c88f (commit) via 897cbb7df14ad3b63ea55ed4eed48572203bacc7 (commit) via 555924a73d921a3651d1399389d9d26adb0e179e (commit) via e1a96ecfe1735e916156bfe9e9c06196116caadd (commit) from 182b97ed3354fcdd4dfb3de54bf7afdf32c6365d (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=10bc47a709a569d249c... commit 10bc47a709a569d249c06de59b7f37d5cf71b30e Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Register destruction function for browser widget. diff --git a/framebuffer/gui.c b/framebuffer/gui.c index a941832..b4bb3ef 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -410,6 +410,22 @@ fb_browser_window_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi) return 0; } +static int fb_browser_window_destroy(fbtk_widget_t *widget, + fbtk_callback_info *cbi) +{ + struct browser_widget_s *browser_widget; + + if (widget == NULL) { + return 0; + } + + /* Free private data */ + browser_widget = fbtk_get_userpw(widget); + free(browser_widget); + + return 0; +} + static const char *fename; static int febpp; @@ -1473,6 +1489,7 @@ create_browser_widget(struct gui_window *gw, int toolbar_height, int furniture_w browser_widget); fbtk_set_handler(gw->browser, FBTK_CBT_REDRAW, fb_browser_window_redraw, gw); + fbtk_set_handler(gw->browser, FBTK_CBT_DESTROY, fb_browser_window_destroy, gw); fbtk_set_handler(gw->browser, FBTK_CBT_INPUT, fb_browser_window_input, gw); fbtk_set_handler(gw->browser, FBTK_CBT_CLICK, fb_browser_window_click, gw); fbtk_set_handler(gw->browser, FBTK_CBT_STRIP_FOCUS, fb_browser_window_strip_focus, gw); @@ -1612,8 +1629,6 @@ gui_window_destroy(struct gui_window *gw) fbtk_destroy_widget(gw->window); free(gw); - - } void commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4fa77f968671f750386... commit 4fa77f968671f75038676ee0a76348c6a969c88f Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Add font_finalise. diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index 60f1b8e..dc1b358 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -31,7 +31,12 @@ bool fb_font_init(void) { - return true; + return true; +} + +bool fb_font_finalise(void) +{ + return true; } const struct fb_font_desc* commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=897cbb7df14ad3b63ea... commit 897cbb7df14ad3b63ea55ed4eed48572203bacc7 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Free font face id descriptors. diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index 150d203..521a5bc 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -57,20 +57,20 @@ typedef struct fb_faceid_s { enum fb_face_e { FB_FACE_SANS_SERIF = 0, - FB_FACE_SANS_SERIF_BOLD = 1, - FB_FACE_SANS_SERIF_ITALIC = 2, - FB_FACE_SANS_SERIF_ITALIC_BOLD = 3, - FB_FACE_SERIF = 4, - FB_FACE_SERIF_BOLD = 5, - FB_FACE_MONOSPACE = 6, - FB_FACE_MONOSPACE_BOLD = 7, - FB_FACE_CURSIVE = 8, - FB_FACE_FANTASY = 9, + FB_FACE_SANS_SERIF_BOLD, + FB_FACE_SANS_SERIF_ITALIC, + FB_FACE_SANS_SERIF_ITALIC_BOLD, + FB_FACE_SERIF, + FB_FACE_SERIF_BOLD, + FB_FACE_MONOSPACE, + FB_FACE_MONOSPACE_BOLD, + FB_FACE_CURSIVE, + FB_FACE_FANTASY, + FB_FACE_COUNT }; /* defines for accesing the faces */ #define FB_FACE_DEFAULT 0 -#define FB_FACE_COUNT 10 static fb_faceid_t *fb_faces[FB_FACE_COUNT]; @@ -148,6 +148,7 @@ fb_new_face(const char *option, const char *resname, const char *fontname) error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface); if (error) { LOG(("Could not find font face %s (code %d)", fontname, error)); + free(newf->fontfile); free(newf); newf = NULL; } @@ -323,8 +324,27 @@ bool fb_font_init(void) bool fb_font_finalise(void) { - FTC_Manager_Done(ft_cmanager ); + int i, j; + + FTC_Manager_Done(ft_cmanager); FT_Done_FreeType(library); + + for (i = 0; i < FB_FACE_COUNT; i++) { + if (fb_faces[i] == NULL) + continue; + + /* Unset any faces that duplicate this one */ + for (j = i + 1; j < FB_FACE_COUNT; j++) { + if (fb_faces[i] == fb_faces[j]) + fb_faces[j] = NULL; + } + + free(fb_faces[i]->fontfile); + free(fb_faces[i]); + + fb_faces[i] = NULL; + } + return true; } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=555924a73d921a3651d... commit 555924a73d921a3651d1399389d9d26adb0e179e Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Call font finaliser on quit. diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 6530c38..a941832 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -625,6 +625,9 @@ main(int argc, char** argv) netsurf_exit(); + if (fb_font_finalise() == false) + LOG(("Font finalisation failed.")); + /* finalise options */ nsoption_finalise(nsoptions, nsoptions_default); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e1a96ecfe1735e91615... commit e1a96ecfe1735e916156bfe9e9c06196116caadd Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Register destruction callback to free text widget text. diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c index f3c88ba..a456228 100644 --- a/framebuffer/fbtk/text.c +++ b/framebuffer/fbtk/text.c @@ -169,6 +169,27 @@ fb_redraw_text(fbtk_widget_t *widget, fbtk_callback_info *cbi ) return 0; } +/** Text destroy callback. + * + * Called when a text widget is destroyed. + * + * @param widget The widget being destroyed. + * @param cbi The callback parameters. + * @return The callback result. + */ +static int fb_destroy_text(fbtk_widget_t *widget, fbtk_callback_info *cbi) +{ + if ((widget == NULL) || (widget->type != FB_WIDGET_TYPE_TEXT)) { + return 0; + } + + if (widget->u.text.text != NULL) { + free(widget->u.text.text); + } + + return 0; +} + /** Text button redraw callback. * * Called when a text widget requires redrawing. @@ -545,6 +566,7 @@ fbtk_create_text(fbtk_widget_t *parent, neww->u.text.outline = outline; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); return neww; } @@ -574,6 +596,7 @@ fbtk_create_writable_text(fbtk_widget_t *parent, neww->u.text.pw = pw; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); fbtk_set_handler(neww, FBTK_CBT_CLICK, text_input_click, pw); fbtk_set_handler(neww, FBTK_CBT_STRIP_FOCUS, text_input_strip_focus, NULL); fbtk_set_handler(neww, FBTK_CBT_INPUT, text_input, neww); @@ -603,6 +626,7 @@ fbtk_create_text_button(fbtk_widget_t *parent, neww->u.text.outline = true; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text_button, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); fbtk_set_handler(neww, FBTK_CBT_CLICK, click, pw); fbtk_set_handler(neww, FBTK_CBT_POINTERENTER, fbtk_set_ptr, &hand_image); ----------------------------------------------------------------------- Summary of changes: framebuffer/fbtk/text.c | 24 ++++++++++++++++++++++++ framebuffer/font_freetype.c | 42 +++++++++++++++++++++++++++++++----------- framebuffer/font_internal.c | 7 ++++++- framebuffer/gui.c | 22 ++++++++++++++++++++-- 4 files changed, 81 insertions(+), 14 deletions(-) diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c index f3c88ba..a456228 100644 --- a/framebuffer/fbtk/text.c +++ b/framebuffer/fbtk/text.c @@ -169,6 +169,27 @@ fb_redraw_text(fbtk_widget_t *widget, fbtk_callback_info *cbi ) return 0; } +/** Text destroy callback. + * + * Called when a text widget is destroyed. + * + * @param widget The widget being destroyed. + * @param cbi The callback parameters. + * @return The callback result. + */ +static int fb_destroy_text(fbtk_widget_t *widget, fbtk_callback_info *cbi) +{ + if ((widget == NULL) || (widget->type != FB_WIDGET_TYPE_TEXT)) { + return 0; + } + + if (widget->u.text.text != NULL) { + free(widget->u.text.text); + } + + return 0; +} + /** Text button redraw callback. * * Called when a text widget requires redrawing. @@ -545,6 +566,7 @@ fbtk_create_text(fbtk_widget_t *parent, neww->u.text.outline = outline; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); return neww; } @@ -574,6 +596,7 @@ fbtk_create_writable_text(fbtk_widget_t *parent, neww->u.text.pw = pw; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); fbtk_set_handler(neww, FBTK_CBT_CLICK, text_input_click, pw); fbtk_set_handler(neww, FBTK_CBT_STRIP_FOCUS, text_input_strip_focus, NULL); fbtk_set_handler(neww, FBTK_CBT_INPUT, text_input, neww); @@ -603,6 +626,7 @@ fbtk_create_text_button(fbtk_widget_t *parent, neww->u.text.outline = true; fbtk_set_handler(neww, FBTK_CBT_REDRAW, fb_redraw_text_button, NULL); + fbtk_set_handler(neww, FBTK_CBT_DESTROY, fb_destroy_text, NULL); fbtk_set_handler(neww, FBTK_CBT_CLICK, click, pw); fbtk_set_handler(neww, FBTK_CBT_POINTERENTER, fbtk_set_ptr, &hand_image); diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index 150d203..521a5bc 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -57,20 +57,20 @@ typedef struct fb_faceid_s { enum fb_face_e { FB_FACE_SANS_SERIF = 0, - FB_FACE_SANS_SERIF_BOLD = 1, - FB_FACE_SANS_SERIF_ITALIC = 2, - FB_FACE_SANS_SERIF_ITALIC_BOLD = 3, - FB_FACE_SERIF = 4, - FB_FACE_SERIF_BOLD = 5, - FB_FACE_MONOSPACE = 6, - FB_FACE_MONOSPACE_BOLD = 7, - FB_FACE_CURSIVE = 8, - FB_FACE_FANTASY = 9, + FB_FACE_SANS_SERIF_BOLD, + FB_FACE_SANS_SERIF_ITALIC, + FB_FACE_SANS_SERIF_ITALIC_BOLD, + FB_FACE_SERIF, + FB_FACE_SERIF_BOLD, + FB_FACE_MONOSPACE, + FB_FACE_MONOSPACE_BOLD, + FB_FACE_CURSIVE, + FB_FACE_FANTASY, + FB_FACE_COUNT }; /* defines for accesing the faces */ #define FB_FACE_DEFAULT 0 -#define FB_FACE_COUNT 10 static fb_faceid_t *fb_faces[FB_FACE_COUNT]; @@ -148,6 +148,7 @@ fb_new_face(const char *option, const char *resname, const char *fontname) error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface); if (error) { LOG(("Could not find font face %s (code %d)", fontname, error)); + free(newf->fontfile); free(newf); newf = NULL; } @@ -323,8 +324,27 @@ bool fb_font_init(void) bool fb_font_finalise(void) { - FTC_Manager_Done(ft_cmanager ); + int i, j; + + FTC_Manager_Done(ft_cmanager); FT_Done_FreeType(library); + + for (i = 0; i < FB_FACE_COUNT; i++) { + if (fb_faces[i] == NULL) + continue; + + /* Unset any faces that duplicate this one */ + for (j = i + 1; j < FB_FACE_COUNT; j++) { + if (fb_faces[i] == fb_faces[j]) + fb_faces[j] = NULL; + } + + free(fb_faces[i]->fontfile); + free(fb_faces[i]); + + fb_faces[i] = NULL; + } + return true; } diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index 60f1b8e..dc1b358 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -31,7 +31,12 @@ bool fb_font_init(void) { - return true; + return true; +} + +bool fb_font_finalise(void) +{ + return true; } const struct fb_font_desc* diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 6530c38..b4bb3ef 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -410,6 +410,22 @@ fb_browser_window_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi) return 0; } +static int fb_browser_window_destroy(fbtk_widget_t *widget, + fbtk_callback_info *cbi) +{ + struct browser_widget_s *browser_widget; + + if (widget == NULL) { + return 0; + } + + /* Free private data */ + browser_widget = fbtk_get_userpw(widget); + free(browser_widget); + + return 0; +} + static const char *fename; static int febpp; @@ -625,6 +641,9 @@ main(int argc, char** argv) netsurf_exit(); + if (fb_font_finalise() == false) + LOG(("Font finalisation failed.")); + /* finalise options */ nsoption_finalise(nsoptions, nsoptions_default); @@ -1470,6 +1489,7 @@ create_browser_widget(struct gui_window *gw, int toolbar_height, int furniture_w browser_widget); fbtk_set_handler(gw->browser, FBTK_CBT_REDRAW, fb_browser_window_redraw, gw); + fbtk_set_handler(gw->browser, FBTK_CBT_DESTROY, fb_browser_window_destroy, gw); fbtk_set_handler(gw->browser, FBTK_CBT_INPUT, fb_browser_window_input, gw); fbtk_set_handler(gw->browser, FBTK_CBT_CLICK, fb_browser_window_click, gw); fbtk_set_handler(gw->browser, FBTK_CBT_STRIP_FOCUS, fb_browser_window_strip_focus, gw); @@ -1609,8 +1629,6 @@ gui_window_destroy(struct gui_window *gw) fbtk_destroy_widget(gw->window); free(gw); - - } void -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.0-661-g182b97e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/182b97ed3354fcdd4dfb3... ...commit http://git.netsurf-browser.org/netsurf.git/commit/182b97ed3354fcdd4dfb3de... ...tree http://git.netsurf-browser.org/netsurf.git/tree/182b97ed3354fcdd4dfb3de54... The branch, master has been updated via 182b97ed3354fcdd4dfb3de54bf7afdf32c6365d (commit) via 2754918e250aa553fe090ec7423c1fac57b007cc (commit) from f2aa7202ba0c96f18f07d7183639a85e37f878f4 (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=182b97ed3354fcdd4df... commit 182b97ed3354fcdd4dfb3de54bf7afdf32c6365d Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix leak of html encoding. diff --git a/render/html.c b/render/html.c index 8fb35f8..1e7350c 100644 --- a/render/html.c +++ b/render/html.c @@ -863,6 +863,7 @@ html_process_encoding_change(struct content *c, if (html->encoding != NULL) { free(html->encoding); + html->encoding = NULL; } html->encoding = strdup(encoding); @@ -1367,6 +1368,12 @@ static void html_destroy(struct content *c) html->title = NULL; } + /* Free encoding */ + if (html->encoding != NULL) { + free(html->encoding); + html->encoding = NULL; + } + /* Free base target */ if (html->base_target != NULL) { free(html->base_target); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2754918e250aa553fe0... commit 2754918e250aa553fe090ec7423c1fac57b007cc Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix leak of path_query, when there is no host and scheme isn't file. diff --git a/content/urldb.c b/content/urldb.c index 3cf6549..e462451 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -796,7 +796,7 @@ bool urldb_add_url(nsurl *url) lwc_string *host; lwc_string *fragment; const char *host_str; - char *path_query; + char *path_query = NULL; size_t len; bool match; unsigned int port_int; @@ -816,10 +816,13 @@ bool urldb_add_url(nsurl *url) NSERROR_OK) { return false; } + assert(path_query != NULL); scheme = nsurl_get_component(url, NSURL_SCHEME); - if (scheme == NULL) + if (scheme == NULL) { + free(path_query); return false; + } host = nsurl_get_component(url, NSURL_HOST); if (host != NULL) { @@ -832,6 +835,7 @@ bool urldb_add_url(nsurl *url) } else { lwc_string_unref(scheme); + free(path_query); return false; } ----------------------------------------------------------------------- Summary of changes: content/urldb.c | 8 ++++++-- render/html.c | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/content/urldb.c b/content/urldb.c index 3cf6549..e462451 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -796,7 +796,7 @@ bool urldb_add_url(nsurl *url) lwc_string *host; lwc_string *fragment; const char *host_str; - char *path_query; + char *path_query = NULL; size_t len; bool match; unsigned int port_int; @@ -816,10 +816,13 @@ bool urldb_add_url(nsurl *url) NSERROR_OK) { return false; } + assert(path_query != NULL); scheme = nsurl_get_component(url, NSURL_SCHEME); - if (scheme == NULL) + if (scheme == NULL) { + free(path_query); return false; + } host = nsurl_get_component(url, NSURL_HOST); if (host != NULL) { @@ -832,6 +835,7 @@ bool urldb_add_url(nsurl *url) } else { lwc_string_unref(scheme); + free(path_query); return false; } diff --git a/render/html.c b/render/html.c index 8fb35f8..1e7350c 100644 --- a/render/html.c +++ b/render/html.c @@ -863,6 +863,7 @@ html_process_encoding_change(struct content *c, if (html->encoding != NULL) { free(html->encoding); + html->encoding = NULL; } html->encoding = strdup(encoding); @@ -1367,6 +1368,12 @@ static void html_destroy(struct content *c) html->title = NULL; } + /* Free encoding */ + if (html->encoding != NULL) { + free(html->encoding); + html->encoding = NULL; + } + /* Free base target */ if (html->base_target != NULL) { free(html->base_target); -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

toolchains: branch master updated. b8c0b0ba0378b2b765f07facf394a9470119757c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/b8c0b0ba0378b2b765... ...commit http://git.netsurf-browser.org/toolchains.git/commit/b8c0b0ba0378b2b765f0... ...tree http://git.netsurf-browser.org/toolchains.git/tree/b8c0b0ba0378b2b765f07f... The branch, master has been updated via b8c0b0ba0378b2b765f07facf394a9470119757c (commit) via 39f4157a9c7dcb9ab514f70d45cee7e40d8745bc (commit) from a6739b5d0c7cd91b87ae56b213e4ce91d0be2846 (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/toolchains.git/commit/?id=b8c0b0ba0378b2b7... commit b8c0b0ba0378b2b765f07facf394a9470119757c Merge: a6739b5 39f4157 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge branch 'chris/sdk-53-24' ----------------------------------------------------------------------- Summary of changes: ppc-amigaos/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile index 04ccbbd..47d9514 100644 --- a/ppc-amigaos/Makefile +++ b/ppc-amigaos/Makefile @@ -20,7 +20,7 @@ UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) UPSTREAM_NDK_TARBALL := SDK_53.20.lha -UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..." +UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..." UPSTREAM_OPENURL_VERSION := 7.8 UPSTREAM_OPENURL_TARBALL := openurl @@ -80,8 +80,8 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR mkdir -p $(BUILDDIR)/ndk/tmp/ lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.9.lha - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.204.lha + lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.28.lha + lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.205.lha mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK cp -r $(BUILDDIR)/ndk/tmp/Include $(PREFIX)/$(TARGET_NAME)/SDK/include cp -r $(BUILDDIR)/ndk/tmp/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib -- Cross-compilation toolchains and environments

9 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.0-659-gf2aa720

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f2aa7202ba0c96f18f07d... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f2aa7202ba0c96f18f07d71... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f2aa7202ba0c96f18f07d7183... The branch, master has been updated via f2aa7202ba0c96f18f07d7183639a85e37f878f4 (commit) from 5122559d73e2c698f06520baa243d739a5386258 (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=f2aa7202ba0c96f18f0... commit f2aa7202ba0c96f18f07d7183639a85e37f878f4 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix Coverity #1109872. diff --git a/content/content.c b/content/content.c index 47fda92..1c667f1 100644 --- a/content/content.c +++ b/content/content.c @@ -222,7 +222,8 @@ static void content_update_status(struct content *c) /* Not done yet */ snprintf(c->status_message, sizeof (c->status_message), "%s%s%s", messages_get("Fetching"), - c->sub_status ? ", " : " ", c->sub_status); + c->sub_status[0] != '\0' ? ", " : " ", + c->sub_status); } else { unsigned int time = c->time; snprintf(c->status_message, sizeof (c->status_message), ----------------------------------------------------------------------- Summary of changes: content/content.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/content/content.c b/content/content.c index 47fda92..1c667f1 100644 --- a/content/content.c +++ b/content/content.c @@ -222,7 +222,8 @@ static void content_update_status(struct content *c) /* Not done yet */ snprintf(c->status_message, sizeof (c->status_message), "%s%s%s", messages_get("Fetching"), - c->sub_status ? ", " : " ", c->sub_status); + c->sub_status[0] != '\0' ? ", " : " ", + c->sub_status); } else { unsigned int time = c->time; snprintf(c->status_message, sizeof (c->status_message), -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.0-658-g5122559

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/5122559d73e2c698f0652... ...commit http://git.netsurf-browser.org/netsurf.git/commit/5122559d73e2c698f06520b... ...tree http://git.netsurf-browser.org/netsurf.git/tree/5122559d73e2c698f06520baa... The branch, master has been updated via 5122559d73e2c698f06520baa243d739a5386258 (commit) via f45bc88b3d267d2aa92c5bc0233f727948ac5409 (commit) from 21d63c3542cb288d432bf6f491b623c3b7840487 (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=5122559d73e2c698f06... commit 5122559d73e2c698f06520baa243d739a5386258 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Pedantic wrap fix. diff --git a/content/hlcache.c b/content/hlcache.c index 6c84d16..e8b2836 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -178,7 +178,9 @@ void hlcache_finalise(void) if (entry->content != NULL) { LOG((" %p : %s (%d users)", entry, - nsurl_access(hlcache_handle_get_url(&entry_handle)), content_count_users(entry->content))); + nsurl_access( + hlcache_handle_get_url(&entry_handle)), + content_count_users(entry->content))); } else { LOG((" %p", entry)); } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f45bc88b3d267d2aa92... commit f45bc88b3d267d2aa92c5bc0233f727948ac5409 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix Coverity #1109867. diff --git a/content/content.c b/content/content.c index 186c5be..47fda92 100644 --- a/content/content.c +++ b/content/content.c @@ -657,7 +657,9 @@ uint32_t content_count_users(struct content *c) for (user = c->user_list; user != NULL; user = user->next) counter += 1; - + + assert(counter > 0); + return counter - 1; /* Subtract 1 for the sentinel */ } ----------------------------------------------------------------------- Summary of changes: content/content.c | 4 +++- content/hlcache.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/content.c b/content/content.c index 186c5be..47fda92 100644 --- a/content/content.c +++ b/content/content.c @@ -657,7 +657,9 @@ uint32_t content_count_users(struct content *c) for (user = c->user_list; user != NULL; user = user->next) counter += 1; - + + assert(counter > 0); + return counter - 1; /* Subtract 1 for the sentinel */ } diff --git a/content/hlcache.c b/content/hlcache.c index 6c84d16..e8b2836 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -178,7 +178,9 @@ void hlcache_finalise(void) if (entry->content != NULL) { LOG((" %p : %s (%d users)", entry, - nsurl_access(hlcache_handle_get_url(&entry_handle)), content_count_users(entry->content))); + nsurl_access( + hlcache_handle_get_url(&entry_handle)), + content_count_users(entry->content))); } else { LOG((" %p", entry)); } -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.0-656-g21d63c3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/21d63c3542cb288d432bf... ...commit http://git.netsurf-browser.org/netsurf.git/commit/21d63c3542cb288d432bf6f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/21d63c3542cb288d432bf6f49... The branch, master has been updated via 21d63c3542cb288d432bf6f491b623c3b7840487 (commit) from 9ea65f652a4526d4dfa69f79fbe14f1c196d3cd4 (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=21d63c3542cb288d432... commit 21d63c3542cb288d432bf6f491b623c3b7840487 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Pedantic wrap fix. diff --git a/content/fetch.c b/content/fetch.c index 6f829bb..1ff925a 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -291,13 +291,16 @@ struct fetch * fetch_start(nsurl *url, nsurl *referer, */ bool match1; bool match2; - if (lwc_string_isequal(scheme, ref_scheme, &match) != lwc_error_ok) { + if (lwc_string_isequal(scheme, ref_scheme, + &match) != lwc_error_ok) { match = false; } - if (lwc_string_isequal(scheme, fetch_https_lwc, &match1) != lwc_error_ok) { + if (lwc_string_isequal(scheme, fetch_https_lwc, + &match1) != lwc_error_ok) { match1 = false; } - if (lwc_string_isequal(ref_scheme, fetch_http_lwc, &match2) != lwc_error_ok) { + if (lwc_string_isequal(ref_scheme, fetch_http_lwc, + &match2) != lwc_error_ok) { match2= false; } if (match == true || (match1 == true && match2 == true)) ----------------------------------------------------------------------- Summary of changes: content/fetch.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/content/fetch.c b/content/fetch.c index 6f829bb..1ff925a 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -291,13 +291,16 @@ struct fetch * fetch_start(nsurl *url, nsurl *referer, */ bool match1; bool match2; - if (lwc_string_isequal(scheme, ref_scheme, &match) != lwc_error_ok) { + if (lwc_string_isequal(scheme, ref_scheme, + &match) != lwc_error_ok) { match = false; } - if (lwc_string_isequal(scheme, fetch_https_lwc, &match1) != lwc_error_ok) { + if (lwc_string_isequal(scheme, fetch_https_lwc, + &match1) != lwc_error_ok) { match1 = false; } - if (lwc_string_isequal(ref_scheme, fetch_http_lwc, &match2) != lwc_error_ok) { + if (lwc_string_isequal(ref_scheme, fetch_http_lwc, + &match2) != lwc_error_ok) { match2= false; } if (match == true || (match1 == true && match2 == true)) -- NetSurf Browser

9 years, 5 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2013