X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=99b972c9d19a6dfb729bdd0ed56b09f73762ac59;hp=b09745541438d37bfb2a2082256a154334be69a1;hb=a551870e3ac31ff77e1757f226d3e307e4ef83fc;hpb=af6f663e6aca0e57017db693cf3dda95fc2cfb48

diff --git a/aft.c b/aft.c
index b0974554..99b972c9 100644
--- a/aft.c
+++ b/aft.c
@@ -595,30 +595,6 @@ int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 	return 1;
 }
 
-#if 0
-/**
- * Get the chunk table of an audio file, given a row of the audio file table.
- *
- * \param row Pointer to a row of the audio file table.
- * \param afhi Result pointer.
- *
- * \return The return value of the underlying call to osl_open_disk_object().
- *
- * \sa get_afhi_of_row().
- */
-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,
-		&obj);
-	if (ret < 0)
-		return ret;
-	ret = load_chunk_info(&obj, afhi);
-	osl_close_disk_object(&obj);
-	return ret;
-}
-#endif
-
 /* returns shmid on success */
 static int save_afd(struct audio_file_data *afd)
 {
@@ -1232,7 +1208,7 @@ out:
  * full list: list everything, including afsi, afhi, atts as clear text
  *
  * */
-int com_afs_ls(int fd, int argc, char * const * const argv)
+int com_ls(int fd, int argc, char * const * const argv)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -2012,7 +1988,7 @@ static int com_rm_callback(const struct osl_object *query,
 }
 
 /* TODO options: -r (recursive) */
-int com_afs_rm(int fd, int argc,  char * const * const argv)
+int com_rm(int fd, int argc,  char * const * const argv)
 {
 	uint32_t flags = 0;
 	struct osl_object query = {.data = &flags, .size = sizeof(flags)},