Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/cae1c44f8fe61a4df20f0... ...commit http://git.netsurf-browser.org/netsurf.git/commit/cae1c44f8fe61a4df20f000... ...tree http://git.netsurf-browser.org/netsurf.git/tree/cae1c44f8fe61a4df20f000d0... The branch, master has been updated via cae1c44f8fe61a4df20f000d0b57ac78e5527170 (commit) via 36c01fc03b0231ca61714c2610da233948a79bba (commit) from cde300133e95a8db0a925879f2c9d940f2bbebdc (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=cae1c44f8fe61a4df20... commit cae1c44f8fe61a4df20f000d0b57ac78e5527170 Author: Michael Drake <michael.drake(a)codethink.co.uk&gt; Commit: Michael Drake <michael.drake(a)codethink.co.uk&gt; PNG content handler: Convert to using content_broadcast_errorcode(). diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c index 136fd8f..288f6c3 100644 --- a/content/handlers/image/png.c +++ b/content/handlers/image/png.c @@ -240,14 +240,11 @@ static void end_callback(png_structp png_s, png_infop info) static nserror nspng_create_png_data(nspng_content *png_c) { - union content_msg_data msg_data; - png_c->bitmap = NULL; png_c->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); if (png_c->png == NULL) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM); return NSERROR_NOMEM; } @@ -257,8 +254,7 @@ static nserror nspng_create_png_data(nspng_content *png_c) if (png_c->info == NULL) { png_destroy_read_struct(&png_c->png, &png_c->info, 0); - msg_data.error = messages_get("NoMemory"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM); return NSERROR_NOMEM; } @@ -268,8 +264,7 @@ static nserror nspng_create_png_data(nspng_content *png_c) png_c->png = NULL; png_c->info = NULL; - msg_data.error = messages_get("PNGError"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_PNG_ERROR); return NSERROR_NOMEM; } @@ -323,7 +318,6 @@ static bool nspng_process_data(struct content *c, const char *data, unsigned int size) { nspng_content *png_c = (nspng_content *)c; - union content_msg_data msg_data; volatile bool ret = true; if (png_c->no_process_data) { @@ -362,8 +356,7 @@ static bool nspng_process_data(struct content *c, const char *data, png_c->png = NULL; png_c->info = NULL; - msg_data.error = messages_get("PNGError"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_PNG_ERROR); ret = false; diff --git a/utils/errors.h b/utils/errors.h index e602b02..3ab40b2 100644 --- a/utils/errors.h +++ b/utils/errors.h @@ -53,6 +53,8 @@ typedef enum { NSERROR_ICO_ERROR, /**< A ICO error occurred */ + NSERROR_PNG_ERROR, /**< A PNG error occurred */ + NSERROR_BAD_ENCODING, /**< The character set is unknown */ NSERROR_NEED_DATA, /**< More data needed */ commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=36c01fc03b0231ca617... commit 36c01fc03b0231ca61714c2610da233948a79bba Author: Michael Drake <michael.drake(a)codethink.co.uk&gt; Commit: Michael Drake <michael.drake(a)codethink.co.uk&gt; Sprite content handler: Convert to using content_broadcast_errorcode(). diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c index ab48978..530c953 100644 --- a/content/handlers/image/nssprite.c +++ b/content/handlers/image/nssprite.c @@ -95,7 +95,6 @@ static nserror nssprite_create(const content_handler *handler, static bool nssprite_convert(struct content *c) { nssprite_content *nssprite = (nssprite_content *) c; - union content_msg_data msg_data; struct rosprite_mem_context* ctx; @@ -118,14 +117,12 @@ static bool nssprite_convert(struct content *c) nssprite->bitmap = guit->bitmap->create(sprite->width, sprite->height, BITMAP_NEW); if (!nssprite->bitmap) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_NOMEM); return false; } uint32_t* imagebuf = (uint32_t *)guit->bitmap->get_buffer(nssprite->bitmap); if (!imagebuf) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_NOMEM); return false; } unsigned char *spritebuf = (unsigned char *)sprite->image; ----------------------------------------------------------------------- Summary of changes: content/handlers/image/nssprite.c | 7 ++----- content/handlers/image/png.c | 15 ++++----------- utils/errors.h | 2 ++ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c index ab48978..530c953 100644 --- a/content/handlers/image/nssprite.c +++ b/content/handlers/image/nssprite.c @@ -95,7 +95,6 @@ static nserror nssprite_create(const content_handler *handler, static bool nssprite_convert(struct content *c) { nssprite_content *nssprite = (nssprite_content *) c; - union content_msg_data msg_data; struct rosprite_mem_context* ctx; @@ -118,14 +117,12 @@ static bool nssprite_convert(struct content *c) nssprite->bitmap = guit->bitmap->create(sprite->width, sprite->height, BITMAP_NEW); if (!nssprite->bitmap) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_NOMEM); return false; } uint32_t* imagebuf = (uint32_t *)guit->bitmap->get_buffer(nssprite->bitmap); if (!imagebuf) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_NOMEM); return false; } unsigned char *spritebuf = (unsigned char *)sprite->image; diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c index 136fd8f..288f6c3 100644 --- a/content/handlers/image/png.c +++ b/content/handlers/image/png.c @@ -240,14 +240,11 @@ static void end_callback(png_structp png_s, png_infop info) static nserror nspng_create_png_data(nspng_content *png_c) { - union content_msg_data msg_data; - png_c->bitmap = NULL; png_c->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); if (png_c->png == NULL) { - msg_data.error = messages_get("NoMemory"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM); return NSERROR_NOMEM; } @@ -257,8 +254,7 @@ static nserror nspng_create_png_data(nspng_content *png_c) if (png_c->info == NULL) { png_destroy_read_struct(&png_c->png, &png_c->info, 0); - msg_data.error = messages_get("NoMemory"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM); return NSERROR_NOMEM; } @@ -268,8 +264,7 @@ static nserror nspng_create_png_data(nspng_content *png_c) png_c->png = NULL; png_c->info = NULL; - msg_data.error = messages_get("PNGError"); - content_broadcast(&png_c->base, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(&png_c->base, NSERROR_PNG_ERROR); return NSERROR_NOMEM; } @@ -323,7 +318,6 @@ static bool nspng_process_data(struct content *c, const char *data, unsigned int size) { nspng_content *png_c = (nspng_content *)c; - union content_msg_data msg_data; volatile bool ret = true; if (png_c->no_process_data) { @@ -362,8 +356,7 @@ static bool nspng_process_data(struct content *c, const char *data, png_c->png = NULL; png_c->info = NULL; - msg_data.error = messages_get("PNGError"); - content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); + content_broadcast_errorcode(c, NSERROR_PNG_ERROR); ret = false; diff --git a/utils/errors.h b/utils/errors.h index e602b02..3ab40b2 100644 --- a/utils/errors.h +++ b/utils/errors.h @@ -53,6 +53,8 @@ typedef enum { NSERROR_ICO_ERROR, /**< A ICO error occurred */ + NSERROR_PNG_ERROR, /**< A PNG error occurred */ + NSERROR_BAD_ENCODING, /**< The character set is unknown */ NSERROR_NEED_DATA, /**< More data needed */ -- NetSurf Browser