Merge commit 'meins/master'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 4f84334c8486d48aee712f6099fd72e847b78af5..f57ca89fb4b4afc8d7387269d97c0dd1630fddd5 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -143,7 +143,11 @@ int guess_audio_format(const char *name)
 int compute_afhi(const char *path, char *data, size_t size,
                struct afh_info *afhi)
 {
-       int ret, i, format = guess_audio_format(path);
+       int ret, i, format;
+
+       afhi->header_offset = 0;
+       afhi->header_len = 0;
+       format = guess_audio_format(path);
 
        if (format >= 0) {
                ret = afl[format].get_file_info(data, size, afhi);
@@ -178,7 +182,7 @@ const char *audio_format_name(int i)
 
 
 void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
-               void *map, char **buf, size_t *len)
+               void *map, const char **buf, size_t *len)
 {
        size_t pos = afhi->chunk_table[chunk_num];
        *buf = map + pos;
@@ -197,7 +201,7 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
  * afhi is \p NULL, or if the current audio format does not need special
  * header treamtment.
  */
-void afh_get_header(struct afh_info *afhi, void *map, char **buf, size_t *len)
+void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len)
 {
        if (!map || !afhi || ! afhi->header_len) {
                *buf = NULL;