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

5 files changed, 10 insertions, 45 deletions

diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index aa2f4b2d2..478aa149b 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -116,7 +116,8 @@ nserror amiga_dt_anim_init(void)
 
 			if(node)
 			{
-				error = content_factory_register_handler(type, 
+				error = content_factory_register_handler(
+					lwc_string_data(type), 
 					&amiga_dt_anim_content_handler);
 
 				if (error != NSERROR_OK)
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index f373fcdbf..304506b06 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -103,7 +103,8 @@ nserror amiga_dt_picture_init(void)
 
 			if(node)
 			{
-				error = content_factory_register_handler(type, 
+				error = content_factory_register_handler(
+					lwc_string_data(type), 
 					&amiga_dt_picture_content_handler);
 
 				if (error != NSERROR_OK)
diff --git a/amiga/dt_sound.c b/amiga/dt_sound.c
index 2f661a688..c4c8e99a1 100644
--- a/amiga/dt_sound.c
+++ b/amiga/dt_sound.c
@@ -100,7 +100,8 @@ nserror amiga_dt_sound_init(void)
 
 			if(node)
 			{
-				error = content_factory_register_handler(type, 
+				error = content_factory_register_handler(
+					lwc_string_data(type), 
 					&amiga_dt_sound_content_handler);
 
 				if (error != NSERROR_OK)
diff --git a/amiga/icon.c b/amiga/icon.c
index c05950e92..4fd1b2fc8 100644
--- a/amiga/icon.c
+++ b/amiga/icon.c
@@ -97,47 +97,8 @@ static const char *amiga_icon_types[] = {
 	"image/x-amiga-icon"
 };
 
-static lwc_string *amiga_icon_mime_types[NOF_ELEMENTS(amiga_icon_types)];
-
-nserror amiga_icon_init(void)
-{
-	uint32_t i;
-	lwc_error lerror;
-	nserror error;
-
-	for (i = 0; i < NOF_ELEMENTS(amiga_icon_mime_types); i++) {
-		lerror = lwc_intern_string(amiga_icon_types[i],
-				strlen(amiga_icon_types[i]),
-				&amiga_icon_mime_types[i]);
-		if (lerror != lwc_error_ok) {
-			error = NSERROR_NOMEM;
-			goto error;
-		}
-
-		error = content_factory_register_handler(
-				amiga_icon_mime_types[i],
-				&amiga_icon_content_handler);
-		if (error != NSERROR_OK)
-			goto error;
-	}
-
-	return NSERROR_OK;
-
-error:
-	amiga_icon_fini();
-
-	return error;
-}
-
-void amiga_icon_fini(void)
-{
-	uint32_t i;
-
-	for (i = 0; i < NOF_ELEMENTS(amiga_icon_mime_types); i++) {
-		if (amiga_icon_mime_types[i] != NULL)
-			lwc_string_unref(amiga_icon_mime_types[i]);
-	}
-}
+CONTENT_FACTORY_REGISTER_TYPES(amiga_icon, amiga_icon_types, 
+		amiga_icon_content_handler)
 
 nserror amiga_icon_create(const content_handler *handler,
 		lwc_string *imime_type, const http_parameter *params,
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index 7e6cbcb4e..9159cddb0 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -81,7 +81,8 @@ nserror amiga_plugin_hack_init(void)
 		{
 			LOG(("plugin_hack registered %s\n",lwc_string_data(type)));
 
-			error = content_factory_register_handler(type, 
+			error = content_factory_register_handler(
+				lwc_string_data(type), 
 				&amiga_plugin_hack_content_handler);
 
 			if (error != NSERROR_OK)