diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 14:29:53 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 14:30:30 +0100 |
| commit | 6ba199c7d7bee1909107ee0b8cbaf749c575b310 (patch) | |
| tree | 9932d32f3fd90c341022257d6c22061fe990725c /content/hlcache.c | |
| parent | 2171f13ab334716250ca2bc53946806f7a88c8a3 (diff) | |
| download | netsurf-6ba199c7d7bee1909107ee0b8cbaf749c575b310.tar.gz netsurf-6ba199c7d7bee1909107ee0b8cbaf749c575b310.tar.bz2 | |
Content messages: Remove ERRORCODE, rework ERROR
This reworks CONTENT_MSG_ERROR to be structured data and
removes the CONTENT_MSG_ERRORCODE message kind.
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'content/hlcache.c')
| -rw-r--r-- | content/hlcache.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/content/hlcache.c b/content/hlcache.c index 92bf690ed..ca0e47907 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -361,7 +361,8 @@ static nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx, hlcache_event hlevent; hlevent.type = CONTENT_MSG_ERROR; - hlevent.data.error = messages_get("MiscError"); + hlevent.data.errordata.errorcode = NSERROR_UNKNOWN; + hlevent.data.errordata.errormsg = messages_get("MiscError"); ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); @@ -393,7 +394,8 @@ static nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx, hlcache_event hlevent; hlevent.type = CONTENT_MSG_ERROR; - hlevent.data.error = messages_get("UnacceptableType"); + hlevent.data.errordata.errorcode = NSERROR_UNKNOWN; + hlevent.data.errordata.errormsg = messages_get("UnacceptableType"); ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); @@ -489,8 +491,9 @@ static nserror hlcache_llcache_callback(llcache_handle *handle, if (ctx->handle->cb != NULL) { hlcache_event hlevent; - hlevent.type = CONTENT_MSG_ERRORCODE; - hlevent.data.errorcode = error; + hlevent.type = CONTENT_MSG_ERROR; + hlevent.data.errordata.errorcode = error; + hlevent.data.errordata.errormsg = NULL; ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); } @@ -500,7 +503,8 @@ static nserror hlcache_llcache_callback(llcache_handle *handle, hlcache_event hlevent; hlevent.type = CONTENT_MSG_ERROR; - hlevent.data.error = event->data.msg; + hlevent.data.errordata.errorcode = NSERROR_UNKNOWN; + hlevent.data.errordata.errormsg = event->data.msg; ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw); } |