call_callback(): Fix a shm leak in afs.c.

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index feee4c8d3dc14b492a65271daa5cffd9a90e93a5..47104500e23417850ef2d164e1c98a68eac74632 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -97,9 +97,9 @@ void afh_init(void)
  *
  * \param name The filename.
  *
- * \return This function returns -1 if it has no idea what kind of audio
- * file this might be. Otherwise the (non-negative) number of the audio format
- * is returned.
+ * \return This function returns \p -E_AUDIO_FORMAT if it has no idea what kind
+ * of audio file this might be. Otherwise the (non-negative) number of the
+ * audio format is returned.
  */
 int guess_audio_format(const char *name)
 {
@@ -119,7 +119,22 @@ int guess_audio_format(const char *name)
                        return i;
                }
        }
-       return -1;
+       return -E_AUDIO_FORMAT;
+}
+
+char *make_taginfo(char *title, char *artist, char *album, char *year,
+               char *comment)
+{
+       return make_message("%s: %s, by %s\n" /* taginfo1 */
+               "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
+               status_item_list[SI_TAGINFO1],
+               (title && *title)? title : "(title tag not set)",
+               (artist && *artist)? artist : "(artist tag not set)",
+               status_item_list[SI_TAGINFO2],
+               (album && *album)?  album : "(album tag not set)",
+               (year && *year)? year : "????",
+               (comment && *comment)? comment : "(comment tag not set)"
+       );
 }
 
 /**
@@ -128,6 +143,7 @@ int guess_audio_format(const char *name)
  * \param path The full path of the audio file.
  * \param data Pointer to the contents of the (mapped) file.
  * \param size The file size in bytes.
+ * \param fd The open file descriptor.
  * \param afhi Result pointer.
  *
  * \return The number of the audio format on success, \p -E_AUDIO_FORMAT if no
@@ -140,7 +156,7 @@ int guess_audio_format(const char *name)
  * path. If this doesn't work, all other audio format handlers are tried until
  * one is found that can handle the file.
  */
-int compute_afhi(const char *path, char *data, size_t size,
+int compute_afhi(const char *path, char *data, size_t size, int fd,
                struct afh_info *afhi)
 {
        int ret, i, format;
@@ -150,14 +166,14 @@ int compute_afhi(const char *path, char *data, size_t size,
        format = guess_audio_format(path);
 
        if (format >= 0) {
-               ret = afl[format].get_file_info(data, size, afhi);
+               ret = afl[format].get_file_info(data, size, fd, afhi);
                if (ret >= 0)
                        return format;
        }
        FOR_EACH_AUDIO_FORMAT(i) {
                if (i == format) /* we already tried this one to no avail */
                        continue;
-               ret = afl[i].get_file_info(data, size, afhi);
+               ret = afl[i].get_file_info(data, size, fd, afhi);
                if (ret >= 0)
                        return i;
                PARA_WARNING_LOG("%s\n", para_strerror(-ret));
@@ -182,7 +198,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;
@@ -201,7 +217,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;