X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=f9dd7583df42a3b5d8bf48fe36ccdea88020c3d4;hb=5564863bb040e340f593b023c873457b8a5d6428;hp=f29080290424d95506ec643df567e24c2d095a74;hpb=5967ac5353739c3ff571dd12d4c6814fa8493ad8;p=paraslash.git

diff --git a/afs.c b/afs.c
index f2908029..f9dd7583 100644
--- a/afs.c
+++ b/afs.c
@@ -34,42 +34,17 @@
 #include "sideband.h"
 #include "command.h"
 
-/** The osl tables used by afs. \sa \ref blob.c. */
-enum afs_table_num {
-	/** Contains audio file information. See \ref aft.c. */
-	TBLNUM_AUDIO_FILES,
-	/** The table for the paraslash attributes. See \ref attribute.c. */
-	TBLNUM_ATTRIBUTES,
-	/*
-	 * Moods and playlists organize the current set of admissible files in
-	 * an osl table which contains only volatile columns. Each row consists
-	 * of a pointer to an audio file and the score value of this file.
-	 */
-	TBLNUM_SCORES,
-	/**
-	 * A standard blob table containing the mood definitions. For details
-	 * see \ref mood.c.
-	 */
-	TBLNUM_MOODS,
-	/** A blob table containing lyrics on a per-song basis. */
-	TBLNUM_LYRICS,
-	/** Another blob table for images (for example album cover art). */
-	TBLNUM_IMAGES,
-	/** Yet another blob table for storing standard playlists. */
-	TBLNUM_PLAYLIST,
-	/** How many tables are in use? */
-	NUM_AFS_TABLES
+static struct afs_table afs_tables[] = {
+	{.init = aft_init, .name = "audio_files"},
+	{.init = attribute_init, .name = "attributes"},
+	{.init = score_init, .name = "scores"},
+	{.init = moods_init, .name = "moods"},
+	{.init = lyrics_init, .name = "lyrics"},
+	{.init = images_init, .name = "images"},
+	{.init = playlists_init, .name = "playlists"},
 };
 
-static struct afs_table afs_tables[NUM_AFS_TABLES] = {
-	[TBLNUM_AUDIO_FILES] = {.init = aft_init, .name = "audio_files"},
-	[TBLNUM_ATTRIBUTES] = {.init = attribute_init, .name = "attributes"},
-	[TBLNUM_SCORES] = {.init = score_init, .name = "scores"},
-	[TBLNUM_MOODS] = {.init = moods_init, .name = "moods"},
-	[TBLNUM_LYRICS] = {.init = lyrics_init, .name = "lyrics"},
-	[TBLNUM_IMAGES] = {.init = images_init, .name = "images"},
-	[TBLNUM_PLAYLIST] = {.init = playlists_init, .name = "playlists"},
-};
+#define NUM_AFS_TABLES ARRAY_SIZE(afs_tables)
 
 struct command_task {
 	/** The file descriptor for the local socket. */
@@ -692,7 +667,7 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
-	PARA_NOTICE_LOG("opening %d osl tables in %s\n", NUM_AFS_TABLES,
+	PARA_NOTICE_LOG("opening %zu osl tables in %s\n", NUM_AFS_TABLES,
 		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
@@ -960,7 +935,7 @@ static int command_post_monitor(struct sched *s, void *context)
 		close(fd);
 		return 0;
 	}
-	client = para_malloc(sizeof(*client));
+	client = alloc(sizeof(*client));
 	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);