X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist_selector.c;h=6f171d753ca8659bbfa71a0b174beb8cf4c5beee;hp=f5241d694233c2f852846ba7e439a01727a48beb;hb=06fe0b6df77cf854d8f787a47b5c3d82d43dc111;hpb=bb406379164df28e66c0c320780095721ddc938a

diff --git a/playlist_selector.c b/playlist_selector.c
index f5241d69..6f171d75 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -65,7 +65,7 @@ static int com_ppl(int, int, char **);
 static int com_lpl(int, int, char **);
 extern struct misc_meta_data *mmd;
 
-/* array of commands that are supported by this database tool */
+/* array of supported commands */
 static struct server_command cmds[] = {
 {
 .name = "ppl",
@@ -105,7 +105,7 @@ static int send_playlist_to_server(const char *buf, size_t size)
 	int ret, shm_mutex = -1, shm_id = -1;
 	void *shm = NULL;
 
-	PARA_DEBUG_LOG("new playlist (%d bytes)\n", size);
+	PARA_DEBUG_LOG("new playlist (%zd bytes)\n", size);
 
 	ret = mutex_new();
 	if (ret < 0)
@@ -142,7 +142,7 @@ out:
 	return ret;
 }
 
-static int com_lpl(int fd, __unused int argc, __unused char *argv[])
+static int com_lpl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned loaded = 0;
 	size_t bufsize = 4096; /* guess that's enough */
@@ -173,7 +173,7 @@ out:
 	return ret;
 }
 
-static int com_ppl(int fd, __unused int argc, __unused char *argv[])
+static int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned i;
 
@@ -192,7 +192,7 @@ static char **pls_get_audio_file_list(unsigned int num)
 	char **file_list;
 	unsigned i;
 
-	num = MIN(num, playlist_len);
+	num = PARA_MIN(num, playlist_len);
 	if (!num)
 		return NULL;
 	file_list = para_malloc((num + 1) * sizeof(char *));
@@ -231,7 +231,7 @@ static void pls_shutdown(void)
 	playlist_size = 0;
 }
 
-static void pls_post_select(__unused fd_set *rfds, __unused fd_set *wfds)
+static void pls_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct private_pls_data *ppd = self->private_data;
 	struct pls_client_data *pcd = ppd->client_data;
@@ -247,7 +247,7 @@ static void pls_post_select(__unused fd_set *rfds, __unused fd_set *wfds)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 		goto out;
 	}
-	PARA_DEBUG_LOG("loading new playlist (%d bytes)\n", pcd->size);
+	PARA_DEBUG_LOG("loading new playlist (%zd bytes)\n", pcd->size);
 	ret = for_each_line((char *)shm, pcd->size, &playlist_add);
 	shm_detach(shm);
 	PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
@@ -275,7 +275,7 @@ void pls_update_audio_file(char *audio_file)
  *
  * Init all function pointers of \a db
  *
- * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c
+ * \sa struct audio_file_selector, misc_meta_data::selector_info, mysql.c
  * random_selector.c.
  */
 int playlist_selector_init(struct audio_file_selector *db)
@@ -318,7 +318,7 @@ int playlist_selector_init(struct audio_file_selector *db)
 		goto err_out;
 	ppd->client_data = shm;
 	ppd->client_data->size = 0;
-	sprintf(mmd->dbinfo, "playlist selector initialized");
+	sprintf(mmd->selector_info, "dbinfo1: playlist selector initialized\n");
 	return 1;
 err_out:
 	if (ppd->client_data_shm_id >= 0)