aft: Make load_afsi() and safe_afsi() static.

Fix a whitespace issue and simplify the documentation of the return
code as we are at it.

diff --git a/afs.h b/afs.h
index f4620cfeb266ca5e0a42b19e2418e5b7c0eacf53..827b6aa69fd56fdcccc9ec2e723c50a4b231c59e 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -279,8 +279,6 @@ int aft_get_row_of_path(const char *path, struct osl_row **row);
 int open_and_update_audio_file(struct osl_row *aft_row, long score,
        struct audio_file_data *afd);
 int load_afd(int shmid, struct audio_file_data *afd);
 int open_and_update_audio_file(struct osl_row *aft_row, long score,
        struct audio_file_data *afd);
 int load_afd(int shmid, struct audio_file_data *afd);

-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_afhi_of_row(const struct osl_row *row, struct afh_info *afhi);
 int get_afsi_of_path(const char *path, struct afs_info *afsi);
 int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi);
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi);
 int get_afsi_of_path(const char *path, struct afs_info *afsi);

diff --git a/aft.c b/aft.c
index ae2cbe2a1e8f756004f7fa69ef1f84d53e375c10..af2c6889f555fdea3dd6f8d2a67688d622751542 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -163,7 +163,7 @@ enum afsi_offsets {
        AFSI_SIZE = 32
 };
 
        AFSI_SIZE = 32
 };
 

-/**
+/*

  * Convert a struct afs_info to an osl object.
  *
  * \param afsi Pointer to the audio file info to be converted.
  * Convert a struct afs_info to an osl object.
  *
  * \param afsi Pointer to the audio file info to be converted.


@@ -171,7 +171,7 @@ enum afsi_offsets {
  *
  * \sa load_afsi().
  */
  *
  * \sa load_afsi().
  */

-void save_afsi(struct afs_info *afsi, struct osl_object *obj)
+static void save_afsi(struct afs_info *afsi, struct osl_object *obj)

 {
        char *buf = obj->data;
 
 {
        char *buf = obj->data;
 


@@ -186,17 +186,17 @@ void save_afsi(struct afs_info *afsi, struct osl_object *obj)
        memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 2);
 }
 
        memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 2);
 }
 

-/**
- *  Get the audio file selector info struct stored in an osl object.
+/*
+ * Get the audio file selector info struct stored in an osl object.

  *
  * \param afsi Points to the audio_file info structure to be filled in.
  * \param obj The osl object holding the data.
  *
  *
  * \param afsi Points to the audio_file info structure to be filled in.
  * \param obj The osl object holding the data.
  *

- * \return Positive on success, negative on errors. Possible errors: \p E_BAD_AFS.
+ * \return Standard.

  *
  * \sa save_afsi().
  */
  *
  * \sa save_afsi().
  */

-int load_afsi(struct afs_info *afsi, struct osl_object *obj)
+static int load_afsi(struct afs_info *afsi, struct osl_object *obj)

 {
        char *buf = obj->data;
        if (obj->size < AFSI_SIZE)
 {
        char *buf = obj->data;
        if (obj->size < AFSI_SIZE)