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",
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)
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 */
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;
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 *));
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;
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);
*
* 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)
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)