Clean up content_factory_register_handler API -- content handlers no longer use the mime type, so don't require it to be interned up front

svn path=/trunk/netsurf/; revision=12796

3 files changed, 4 insertions, 120 deletions

diff --git a/riscos/content-handlers/artworks.c b/riscos/content-handlers/artworks.c
index a669dce14..b9c5f3378 100644
--- a/riscos/content-handlers/artworks.c
+++ b/riscos/content-handlers/artworks.c
@@ -129,46 +129,8 @@ static const char *artworks_types[] = {
 	"image/x-artworks"
 };
 
-static lwc_string *artworks_mime_types[NOF_ELEMENTS(artworks_types)];
-
-nserror artworks_init(void)
-{
-	uint32_t i;
-	lwc_error lerror;
-	nserror error;
-
-	for (i = 0; i < NOF_ELEMENTS(artworks_mime_types); i++) {
-		lerror = lwc_intern_string(artworks_types[i],
-				strlen(artworks_types[i]),
-				&artworks_mime_types[i]);
-		if (lerror != lwc_error_ok) {
-			error = NSERROR_NOMEM;
-			goto error;
-		}
-
-		error = content_factory_register_handler(artworks_mime_types[i],
-				&artworks_content_handler);
-		if (error != NSERROR_OK)
-			goto error;
-	}
-
-	return NSERROR_OK;
-
-error:
-	artworks_fini();
-
-	return error;
-}
-
-void artworks_fini(void)
-{
-	uint32_t i;
-
-	for (i = 0; i < NOF_ELEMENTS(artworks_mime_types); i++) {
-		if (artworks_mime_types[i] != NULL)
-			lwc_string_unref(artworks_mime_types[i]);
-	}
-}
+CONTENT_FACTORY_REGISTER_TYPES(artworks, artworks_types, 
+		artworks_content_handler)
 
 nserror artworks_create(const content_handler *handler,
 		lwc_string *imime_type, const http_parameter *params,
diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c
index 536ee0516..0d8c86914 100644
--- a/riscos/content-handlers/draw.c
+++ b/riscos/content-handlers/draw.c
@@ -72,46 +72,7 @@ static const char *draw_types[] = {
 	"image/x-drawfile"
 };
 
-static lwc_string *draw_mime_types[NOF_ELEMENTS(draw_types)];
-
-nserror draw_init(void)
-{
-	uint32_t i;
-	lwc_error lerror;
-	nserror error;
-
-	for (i = 0; i < NOF_ELEMENTS(draw_mime_types); i++) {
-		lerror = lwc_intern_string(draw_types[i],
-				strlen(draw_types[i]),
-				&draw_mime_types[i]);
-		if (lerror != lwc_error_ok) {
-			error = NSERROR_NOMEM;
-			goto error;
-		}
-
-		error = content_factory_register_handler(draw_mime_types[i],
-				&draw_content_handler);
-		if (error != NSERROR_OK)
-			goto error;
-	}
-
-	return NSERROR_OK;
-
-error:
-	draw_fini();
-
-	return error;
-}
-
-void draw_fini(void)
-{
-	uint32_t i;
-
-	for (i = 0; i < NOF_ELEMENTS(draw_mime_types); i++) {
-		if (draw_mime_types[i] != NULL)
-			lwc_string_unref(draw_mime_types[i]);
-	}
-}
+CONTENT_FACTORY_REGISTER_TYPES(draw, draw_types, draw_content_handler)
 
 nserror draw_create(const content_handler *handler,
 		lwc_string *imime_type, const http_parameter *params,
diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c
index f93deaa60..7b6045cb9 100644
--- a/riscos/content-handlers/sprite.c
+++ b/riscos/content-handlers/sprite.c
@@ -71,46 +71,7 @@ static const char *sprite_types[] = {
 	"image/x-riscos-sprite"
 };
 
-static lwc_string *sprite_mime_types[NOF_ELEMENTS(sprite_types)];
-
-nserror sprite_init(void)
-{
-	uint32_t i;
-	lwc_error lerror;
-	nserror error;
-
-	for (i = 0; i < NOF_ELEMENTS(sprite_mime_types); i++) {
-		lerror = lwc_intern_string(sprite_types[i],
-				strlen(sprite_types[i]),
-				&sprite_mime_types[i]);
-		if (lerror != lwc_error_ok) {
-			error = NSERROR_NOMEM;
-			goto error;
-		}
-
-		error = content_factory_register_handler(sprite_mime_types[i],
-				&sprite_content_handler);
-		if (error != NSERROR_OK)
-			goto error;
-	}
-
-	return NSERROR_OK;
-
-error:
-	sprite_fini();
-
-	return error;
-}
-
-void sprite_fini(void)
-{
-	uint32_t i;
-
-	for (i = 0; i < NOF_ELEMENTS(sprite_mime_types); i++) {
-		if (sprite_mime_types[i] != NULL)
-			lwc_string_unref(sprite_mime_types[i]);
-	}
-}
+CONTENT_FACTORY_REGISTER_TYPES(sprite, sprite_types, sprite_content_handler)
 
 nserror sprite_create(const content_handler *handler,
 		lwc_string *imime_type, const http_parameter *params,