Make mp3_seek_next_header() more readable.

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index 5a8c956d219bf1b11e6a757f7555a6ba1c605b5b..8b8a83d82eefb160bc7ceee6ee3f11ede22b78a3 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -138,7 +138,7 @@ static void write_info_str(struct afh_info *afhi)
 {
        int v = mp3.id3_isvalid;
 
-       snprintf(afhi->info_string, MMD_INFO_SIZE,
+       afhi->info_string = make_message(
                "%s: %cbr, %s\n" /* audio file info*/
                "%s: %s, by %s\n" /* taginfo1 */
                "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
@@ -231,7 +231,8 @@ out:
  * Return the length of the next frame header or zero if the end of the file is
  * reached.
  */
-static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos)
+static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos,
+       struct mp3header *result)
 {
        int k, l = 0, first_len;
        struct mp3header h, h2;
@@ -254,7 +255,7 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos
                }
                if (k == MIN_CONSEC_GOOD_FRAMES) {
                        *fpos = valid_start;
-                       memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
+                       *result = h2;
                        return first_len;
                }
        }
@@ -309,7 +310,7 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos)
        if (frame_len < 0)
                return frame_len;
        if (!frame_len) {
-               frame_len = mp3_seek_next_header(map, numbytes, fpos);
+               frame_len = mp3_seek_next_header(map, numbytes, fpos, &mp3.header);
                if (frame_len <= 0)
                        return frame_len;
        } else