From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 19 Aug 2021 18:13:57 +0000 (+0200)
Subject: mp4: Rename atom_read() to parse_leaf_atom().
X-Git-Tag: v0.7.1~7^2~44
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ed95e3b65098db5c3bbb8be160fb0ec9bc98a8c0;p=paraslash.git

mp4: Rename atom_read() to parse_leaf_atom().

For consistency and symmetry with parse_subatoms().
---

diff --git a/mp4.c b/mp4.c
index a110e914..1d04b2c4 100644
--- a/mp4.c
+++ b/mp4.c
@@ -825,7 +825,7 @@ static int32_t read_meta(struct mp4 *f, uint64_t size)
 	return 1;
 }
 
-static int atom_read(struct mp4 *f, uint64_t size, uint8_t atom_type)
+static int parse_leaf_atom(struct mp4 *f, uint64_t size, uint8_t atom_type)
 {
 	uint64_t dest_position = get_position(f) + size - 8;
 	int ret = 1; /* return success for atoms we don't care about */
@@ -898,10 +898,10 @@ static int parse_sub_atoms(struct mp4 *f, uint64_t total_size, bool meta_only)
 			set_position(f, get_position(f) + size - header_size);
 			continue;
 		}
-		if (atom_type < SUBATOMIC)
+		if (atom_type < SUBATOMIC) /* atom contains subatoms */
 			ret = parse_sub_atoms(f, size - header_size, meta_only);
 		else
-			ret = atom_read(f, size, atom_type);
+			ret = parse_leaf_atom(f, size, atom_type);
 		if (ret <= 0)
 			return ret;
 	}