Replace void *row by struct osl_row *row.

Also, make some functions in aft.c static.

diff --git a/afs.h b/afs.h
index 801347208136b7089744921310fee6d11e81a829..0b35f3c7f2c9b5b028d0e4973efca0a580bb10fc 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -122,7 +122,7 @@ int row_belongs_to_score_table(const struct osl_row *aft_row);
 /* attribute */
 int attribute_init(struct table_info *ti, const char *db);
 void attribute_shutdown(enum osl_close_flags flags);
-void get_attribute_bitmap(uint64_t *atts, char *buf);
+void get_attribute_bitmap(const uint64_t *atts, char *buf); /* needed by com_ls() */
 int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum);
 int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 
@@ -135,7 +135,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj);
 void save_afsi(struct afs_info *afsi, struct osl_object *obj);
 int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi);
 int get_audio_file_path_of_row(const struct osl_row *row, char **path);
-int get_afsi_object_of_row(const void *row, struct osl_object *obj);
+int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
 
 /* mood */

diff --git a/aft.c b/aft.c
index 0b07fa17145bcabfb48a0dc2ac3d277b62ece897..98c5f9027a1c723b9d55ce5340559790f6b27f8a 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -376,7 +376,7 @@ int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
  *
  * \return The return value of the underlying call to osl_get_object().
  */
-int get_afsi_object_of_row(const void *row, struct osl_object *obj)
+int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
 {
        return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj);
 }
@@ -445,7 +445,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \sa get_hash_of_row().
  */
-int get_hash_object_of_aft_row(const void *row, struct osl_object *obj)
+static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_object *obj)
 {
        return osl_get_object(audio_file_table, row, AFTCOL_HASH, obj);
 }
@@ -461,7 +461,7 @@ int get_hash_object_of_aft_row(const void *row, struct osl_object *obj)
  * \return The return value of the underlying call to
  * get_hash_object_of_aft_row().
  */
-static int get_hash_of_row(const void *row, HASH_TYPE **hash)
+static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
 {
        struct osl_object obj;
        int ret = get_hash_object_of_aft_row(row, &obj);
@@ -482,7 +482,7 @@ static int get_hash_of_row(const void *row, HASH_TYPE **hash)
  *
  * \sa get_chunk_table_of_row().
  */
-int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
+static int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 {
        struct osl_object obj;
        int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
@@ -503,7 +503,7 @@ int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
  *
  * \sa get_afhi_of_row().
  */
-int get_chunk_table_of_row(const void *row, struct audio_format_info *afhi)
+static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 {
        struct osl_object obj;
        int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
@@ -1326,7 +1326,7 @@ static int com_add_callback(const struct osl_object *query,
                        return ret;
        }
        if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */
-               const void *row = pb? pb : hs;
+               const struct osl_row *row = pb? pb : hs;
                /* update afhi and chunk_table */
                if (flags & ADD_FLAG_VERBOSE)
                        PARA_DEBUG_LOG("updating audio format handler info (%zd bytes)\n",