From 6371cda6965da1f42b1b634dd930fbec233916ad Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 9 Aug 2021 19:50:25 +0200 Subject: [PATCH] mp4: Reduce indentation of mp4ff_parse_tag(). Reverse the condition and continue with the next iteration if "done" is true. The patch is large, but it's trivial because the only change is that one code block has been shifted to the left. --- mp4.c | 124 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/mp4.c b/mp4.c index 84206e87..576f1574 100644 --- a/mp4.c +++ b/mp4.c @@ -982,76 +982,76 @@ static int32_t mp4ff_parse_tag(mp4ff_t * f, const uint8_t parent_atom_type, uint64_t destpos; subsize = mp4ff_atom_read_header(f, &atom_type, &header_size); destpos = mp4ff_position(f) + subsize - header_size; - if (!done) { - if (atom_type == ATOM_DATA) { - mp4ff_read_char(f); /* version */ - mp4ff_read_int24(f); /* flags */ - mp4ff_read_int32(f); /* reserved */ - - /* some need special attention */ - if (parent_atom_type == ATOM_GENRE2 || parent_atom_type == ATOM_TEMPO) { - if (subsize - header_size >= 8 + 2) { - uint16_t val = mp4ff_read_int16(f); - - if (parent_atom_type == ATOM_TEMPO) { - char temp[16]; - sprintf(temp, - "%.5u BPM", - val); - mp4ff_tag_add_field(&(f-> tags), "tempo", temp, -1); - } else { - const char *temp = mp4ff_meta_index_to_genre(val); - if (temp) { - mp4ff_tag_add_field (&(f->tags), "genre", temp, -1); - } + if (done) + continue; + if (atom_type == ATOM_DATA) { + mp4ff_read_char(f); /* version */ + mp4ff_read_int24(f); /* flags */ + mp4ff_read_int32(f); /* reserved */ + + /* some need special attention */ + if (parent_atom_type == ATOM_GENRE2 || parent_atom_type == ATOM_TEMPO) { + if (subsize - header_size >= 8 + 2) { + uint16_t val = mp4ff_read_int16(f); + + if (parent_atom_type == ATOM_TEMPO) { + char temp[16]; + sprintf(temp, + "%.5u BPM", + val); + mp4ff_tag_add_field(&(f-> tags), "tempo", temp, -1); + } else { + const char *temp = mp4ff_meta_index_to_genre(val); + if (temp) { + mp4ff_tag_add_field (&(f->tags), "genre", temp, -1); } - done = 1; } - } else if (parent_atom_type == ATOM_TRACK || parent_atom_type == ATOM_DISC) { - if (!done && (subsize - header_size) >= (sizeof (char) + sizeof (uint8_t) * 3 + sizeof (uint32_t) + /* version + flags + reserved */ - +(parent_atom_type == ATOM_TRACK ? sizeof (uint16_t) : 0) /* leading uint16_t if ATOM_TRACK */ - +sizeof (uint16_t) /* track / disc */ - +sizeof (uint16_t)) /* totaltracks / totaldiscs */) { - uint16_t index, total; - char temp[32]; + done = 1; + } + } else if (parent_atom_type == ATOM_TRACK || parent_atom_type == ATOM_DISC) { + if (!done && (subsize - header_size) >= (sizeof (char) + sizeof (uint8_t) * 3 + sizeof (uint32_t) + /* version + flags + reserved */ + +(parent_atom_type == ATOM_TRACK ? sizeof (uint16_t) : 0) /* leading uint16_t if ATOM_TRACK */ + +sizeof (uint16_t) /* track / disc */ + +sizeof (uint16_t)) /* totaltracks / totaldiscs */) { + uint16_t index, total; + char temp[32]; + mp4ff_read_int16(f); + index = mp4ff_read_int16(f); + total = mp4ff_read_int16(f); + if (parent_atom_type == ATOM_TRACK) mp4ff_read_int16(f); - index = mp4ff_read_int16(f); - total = mp4ff_read_int16(f); - if (parent_atom_type == ATOM_TRACK) - mp4ff_read_int16(f); - - sprintf(temp, "%d", index); - mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? - "track" : "disc", temp, -1); - if (total > 0) { - sprintf(temp, "%d", - total); - mp4ff_tag_add_field(& (f-> tags), - parent_atom_type == ATOM_TRACK? - "totaltracks" : "totaldiscs", temp, -1); - } - done = 1; - } - } else { - if (data) { - free(data); - data = NULL; + + sprintf(temp, "%d", index); + mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? + "track" : "disc", temp, -1); + if (total > 0) { + sprintf(temp, "%d", + total); + mp4ff_tag_add_field(& (f-> tags), + parent_atom_type == ATOM_TRACK? + "totaltracks" : "totaldiscs", temp, -1); } - data = mp4ff_read_string(f, (uint32_t) (subsize - (header_size + 8))); - len = (uint32_t) (subsize - (header_size + 8)); + done = 1; } - } else if (atom_type == ATOM_NAME) { - if (!done) { - mp4ff_read_char(f); /* version */ - mp4ff_read_int24(f); /* flags */ - if (name) - free(name); - name = mp4ff_read_string(f, (uint32_t) (subsize - (header_size + 4))); + } else { + if (data) { + free(data); + data = NULL; } + data = mp4ff_read_string(f, (uint32_t) (subsize - (header_size + 8))); + len = (uint32_t) (subsize - (header_size + 8)); + } + } else if (atom_type == ATOM_NAME) { + if (!done) { + mp4ff_read_char(f); /* version */ + mp4ff_read_int24(f); /* flags */ + if (name) + free(name); + name = mp4ff_read_string(f, (uint32_t) (subsize - (header_size + 4))); } - mp4ff_set_position(f, destpos); - sumsize += subsize; } + mp4ff_set_position(f, destpos); + sumsize += subsize; } if (data) { -- 2.39.2