httpd_output: assert that tag!=NULL

In the tag() method, MPD guarantees that it does not pass tag==NULL. Converted the runtime check to an assertion.

httpd_output: assert that tag!=NULL
79556920 · Max Kellermann · 7dcdb2ce · 79556920
Commit 79556920 authored May 05, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

httpd_output_plugin.c src/output/httpd_output_plugin.c +7 -8

No files found.
--- a/src/output/httpd_output_plugin.c
+++ b/src/output/httpd_output_plugin.c
@@ -378,16 +378,15 @@ httpd_output_tag(void *data, const struct tag *tag)
 {
 	struct httpd_output *httpd = data;

-	if (httpd->metadata) {
+	assert(tag != NULL);
+
+	if (httpd->metadata != NULL)
 		page_unref (httpd->metadata);
-		httpd->metadata = NULL;
-	}

-	if (tag)
-		httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
-							   TAG_ITEM_ARTIST,
-							   TAG_ITEM_TITLE,
-							   TAG_NUM_OF_ITEM_TYPES);
+	httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
+						   TAG_ITEM_ARTIST,
+						   TAG_ITEM_TITLE,
+						   TAG_NUM_OF_ITEM_TYPES);

 	if (httpd->metadata) {
 		g_mutex_lock(httpd->mutex);