oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ls: don't pass "fd" to lsPlaylists(), printRemoteUrlHandlers()

Browse Source 
Pass the client struct instead of the raw file descriptor.
This commit is contained in:
Max Kellermann 2008-09-07 14:02:40 +02:00
parent 4665f2bf32
commit 438b56f0ba
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command.c
View File

@ -300,7 +300,7 @@ static void addCommand(const char *name,
static int handleUrlHandlers(struct client *client, mpd_unused int *permission, static int handleUrlHandlers(struct client *client, mpd_unused int *permission,
mpd_unused int argc, mpd_unused char *argv[]) mpd_unused int argc, mpd_unused char *argv[])
{ {
return printRemoteUrlHandlers(client_get_fd(client)); return printRemoteUrlHandlers(client);
} }
static int handleTagTypes(struct client *client, mpd_unused int *permission, static int handleTagTypes(struct client *client, mpd_unused int *permission,
@ -601,7 +601,7 @@ static int handleLsInfo(struct client *client, mpd_unused int *permission,
} }
if (isRootDirectory(path)) if (isRootDirectory(path))
return lsPlaylists(client_get_fd(client), path); return lsPlaylists(client, path);
return 0; return 0;
} }

12
src/ls.c
View File

@ -19,7 +19,7 @@
#include "ls.h" #include "ls.h"
#include "playlist.h" #include "playlist.h"
#include "path.h" #include "path.h"
#include "myfprintf.h" #include "client.h"
#include "log.h" #include "log.h"
#include "utf8.h" #include "utf8.h"
#include "utils.h" #include "utils.h"
@ -30,12 +30,12 @@ static const char *remoteUrlPrefixes[] = {
NULL NULL
}; };
int printRemoteUrlHandlers(int fd) int printRemoteUrlHandlers(struct client *client)
{ {
const char **prefixes = remoteUrlPrefixes; const char **prefixes = remoteUrlPrefixes;
while (*prefixes) { while (*prefixes) {
fdprintf(fd, "handler: %s\n", *prefixes); client_printf(client, "handler: %s\n", *prefixes);
prefixes++; prefixes++;
} }
@ -98,7 +98,7 @@ int isRemoteUrl(const char *url)
return 0; return 0;
} }
int lsPlaylists(int fd, const char *utf8path) int lsPlaylists(struct client *client, const char *utf8path)
{ {
DIR *dir; DIR *dir;
struct stat st; struct stat st;
@ -168,8 +168,8 @@ int lsPlaylists(int fd, const char *utf8path)
node = list->firstNode; node = list->firstNode;
while (node != NULL) { while (node != NULL) {
if (!strchr(node->key, '\n')) { if (!strchr(node->key, '\n')) {
fdprintf(fd, "playlist: %s%s\n", duplicated, client_printf(client, "playlist: %s%s\n",
node->key); duplicated, node->key);
} }
node = node->nextNode; node = node->nextNode;
} }

6
src/ls.h
View File

@ -21,7 +21,9 @@
#include "decoder_list.h" #include "decoder_list.h"
int lsPlaylists(int fd, const char *utf8path); struct client;
int lsPlaylists(struct client *client, const char *utf8path);
const char *getSuffix(const char *utf8file); const char *getSuffix(const char *utf8file);
@ -40,7 +42,7 @@ struct decoder_plugin *hasMusicSuffix(const char *utf8file, unsigned int next);
struct decoder_plugin *isMusic(const char *utf8file, time_t * mtime, struct decoder_plugin *isMusic(const char *utf8file, time_t * mtime,
unsigned int next); unsigned int next);
int printRemoteUrlHandlers(int fd); int printRemoteUrlHandlers(struct client *client);
int isFile(const char *utf8file, time_t * mtime); int isFile(const char *utf8file, time_t * mtime);