From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 9 Aug 2021 22:23:52 +0000 (+0200)
Subject: mp4: Whitespace and indentation cleanups for create_ilst().
X-Git-Tag: v0.7.1~7^2~108
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=fd11b7738de8b2961774737731de6b1b084120c8;p=paraslash.git

mp4: Whitespace and indentation cleanups for create_ilst().

The only non-trivial cleanup is the reversed logic to reduce the
indentation of the code in the body of the for loop.
---

diff --git a/mp4.c b/mp4.c
index ae248899..0956dff1 100644
--- a/mp4.c
+++ b/mp4.c
@@ -1796,9 +1796,11 @@ static uint32_t create_ilst(const struct mp4ff_metadata *data, void **out_buffer
 	const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
 	const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
 	const char *genre_ptr = 0, *tempo_ptr = 0;
+
 	for (metaptr = 0; metaptr < data->count; metaptr++) {
 		struct mp4ff_tag *tag = &data->tags[metaptr];
-		if (!strcasecmp(tag->item, "tracknumber") || !strcasecmp(tag->item, "track")) {
+		if (!strcasecmp(tag->item, "tracknumber")
+				|| !strcasecmp(tag->item, "track")) {
 			if (tracknumber_ptr == 0)
 				tracknumber_ptr = tag->value;
 			mask[metaptr] = 1;
@@ -1827,38 +1829,34 @@ static uint32_t create_ilst(const struct mp4ff_metadata *data, void **out_buffer
 	}
 
 	if (tracknumber_ptr)
-		membuffer_write_track_tag(buf, "trkn",
-					  myatoi(tracknumber_ptr),
-					  myatoi(totaltracks_ptr));
+		membuffer_write_track_tag(buf, "trkn", myatoi(tracknumber_ptr),
+			 myatoi(totaltracks_ptr));
 	if (discnumber_ptr)
-		membuffer_write_track_tag(buf, "disk",
-					  myatoi(discnumber_ptr),
-					  myatoi(totaldiscs_ptr));
+		membuffer_write_track_tag(buf, "disk", myatoi(discnumber_ptr),
+			 myatoi(totaldiscs_ptr));
 	if (tempo_ptr)
 		membuffer_write_int16_tag(buf, "tmpo", myatoi(tempo_ptr));
 
 	if (genre_ptr) {
 		uint32_t index = meta_genre_to_index(genre_ptr);
 		if (index == 0)
-			membuffer_write_std_tag(buf, "©gen",
-						genre_ptr);
+			membuffer_write_std_tag(buf, "©gen", genre_ptr);
 		else
 			membuffer_write_int16_tag(buf, "gnre", index);
 	}
 	for (metaptr = 0; metaptr < data->count; metaptr++) {
-		if (!mask[metaptr]) {
-			struct mp4ff_tag *tag = &data->tags[metaptr];
-			const char *std_meta_atom = find_standard_meta(tag->item);
-			if (std_meta_atom) {
-				membuffer_write_std_tag(buf, std_meta_atom,
-							tag->value);
-			} else {
-				membuffer_write_custom_tag(buf, tag->item,
-					tag->value);
-			}
-		}
-	}
+		struct mp4ff_tag *tag;
+		const char *std_meta_atom;
 
+		if (mask[metaptr])
+			continue;
+		tag = &data->tags[metaptr];
+		std_meta_atom = find_standard_meta(tag->item);
+		if (std_meta_atom)
+			membuffer_write_std_tag(buf, std_meta_atom, tag->value);
+		else
+			membuffer_write_custom_tag(buf, tag->item, tag->value);
+	}
 	free(mask);
 
 	if (membuffer_error(buf)) {