Makefile.in: Remove special treatment of ortp_send/ortp_recv

[paraslash.git] / playlist_selector.c

diff --git a/playlist_selector.c b/playlist_selector.c
index f3f556cd6460bbe0af8b941b856fa1b325fc95be..ee619b316201a3e4bbff4a325525aefbfa711eab 100644 (file)
--- 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);
@@ -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, "playlist selector initialized");
        return 1;
 err_out:
        if (ppd->client_data_shm_id >= 0)