X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=39f95ad2517b15979a31545e79fae13c7ec33c7e;hp=377740d132b831d126e0015f241ed65095c2e661;hb=093dda1824631372587d107d64601389027c6187;hpb=f137bcaf03efb0bdb127465f76ee2a9e76a06185

diff --git a/aft.c b/aft.c
index 377740d1..39f95ad2 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -163,7 +163,7 @@ enum afsi_offsets {
 	AFSI_SIZE = 32
 };
 
-/**
+/*
  * 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().
  */
-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;
 
@@ -186,17 +186,17 @@ void save_afsi(struct afs_info *afsi, struct osl_object *obj)
 	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.
  *
- * \return Positive on success, negative on errors. Possible errors: \p E_BAD_AFS.
+ * \return Standard.
  *
  * \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)
@@ -493,15 +493,16 @@ static int aft_get_row_of_hash(unsigned char *hash, struct osl_row **row)
 	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
 }
 
-/**
- * Get the osl object holding the audio file selector info of a row.
+/*
+ * Get the audio file selector info object of a row.
  *
  * \param row Pointer to a row in the audio file table.
  * \param obj Result pointer.
  *
  * \return Standard.
  */
-int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
+static int get_afsi_object_of_row(const struct osl_row *row,
+		struct osl_object *obj)
 {
 	return osl(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
 }
@@ -541,15 +542,15 @@ int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi)
 	return load_afsi(afsi, &obj);
 }
 
-/**
+/*
  * Get the audio file selector info, given the path of an audio table.
  *
  * \param path The full path of the audio file.
  * \param afsi Result pointer.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
-int get_afsi_of_path(const char *path, struct afs_info *afsi)
+static int get_afsi_of_path(const char *path, struct afs_info *afsi)
 {
 	struct osl_object obj;
 	int ret = get_afsi_object_of_path(path, &obj);
@@ -2408,13 +2409,12 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 out:
 	if (ret < 0)
 		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
-	else if (cad.flags & CPSI_FLAG_VERBOSE) {
-		if (pmd.num_matches > 0)
+	else if (pmd.num_matches > 0) {
+		if (cad.flags & CPSI_FLAG_VERBOSE)
 			para_printf(&cad.pb, "copied requested afsi from %s "
 				"to %u files\n", source_path, pmd.num_matches);
-		else
-			para_printf(&cad.pb, "nothing copied\n");
-	}
+	} else
+		para_printf(&cad.pb, "no matches - nothing copied\n");
 	if (cad.pb.offset)
 		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
 	free(cad.pb.buf);