X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist_selector.c;h=ee619b316201a3e4bbff4a325525aefbfa711eab;hp=346f1ce12a0e0b83eff76ddc51dead55475ca08d;hb=446f934790d9d60b4aaa63faa41217fa8134a4be;hpb=9f10e6742ffc2ac5e4bf6224e1ff882074c7ca45

diff --git a/playlist_selector.c b/playlist_selector.c
index 346f1ce1..ee619b31 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -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);