diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-02 13:59:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-02 13:59:07 +0100 |
| commit | a8e52ad89f60741adc474d460724e25bc783dfe5 (patch) | |
| tree | 68c774f929939ea1e8e3ece394b0bf0c10c30f2e /src/command | |
| parent | 8cf4fb53aa102380a8e734590aa6e82920e9632c (diff) | |
| download | mpd-a8e52ad89f60741adc474d460724e25bc783dfe5.tar.gz mpd-a8e52ad89f60741adc474d460724e25bc783dfe5.tar.xz mpd-a8e52ad89f60741adc474d460724e25bc783dfe5.zip | |
ClientFile: move client_allow_file() into the Client class
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/FileCommands.cxx | 3 | ||||
| -rw-r--r-- | src/command/OtherCommands.cxx | 3 | ||||
| -rw-r--r-- | src/command/QueueCommands.cxx | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx index 345e9b85b..0b0421c3e 100644 --- a/src/command/FileCommands.cxx +++ b/src/command/FileCommands.cxx @@ -22,7 +22,6 @@ #include "CommandError.hxx" #include "protocol/Ack.hxx" #include "protocol/Result.hxx" -#include "client/ClientFile.hxx" #include "client/Client.hxx" #include "util/CharUtil.hxx" #include "util/UriUtil.hxx" @@ -122,7 +121,7 @@ handle_read_comments(Client &client, gcc_unused int argc, char *argv[]) } Error error; - if (!client_allow_file(client, path_fs, error)) + if (!client.AllowFile(path_fs, error)) return print_error(client, error); } else if (uri_has_scheme(uri)) { return read_stream_comments(client, uri); diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index 76f97f389..9455971e8 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -41,7 +41,6 @@ #include "Permission.hxx" #include "PlaylistFile.hxx" #include "db/PlaylistVector.hxx" -#include "client/ClientFile.hxx" #include "client/Client.hxx" #include "Partition.hxx" #include "Instance.hxx" @@ -143,7 +142,7 @@ handle_lsinfo(Client &client, int argc, char *argv[]) } Error error; - if (!client_allow_file(client, path_fs, error)) + if (!client.AllowFile(path_fs, error)) return print_error(client, error); DetachedSong song(path_utf8); diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx index 0f326698b..5bef1b461 100644 --- a/src/command/QueueCommands.cxx +++ b/src/command/QueueCommands.cxx @@ -25,7 +25,6 @@ #include "db/Selection.hxx" #include "Playlist.hxx" #include "PlaylistPrint.hxx" -#include "client/ClientFile.hxx" #include "client/Client.hxx" #include "Partition.hxx" #include "protocol/ArgParser.hxx" @@ -56,7 +55,7 @@ handle_add(Client &client, gcc_unused int argc, char *argv[]) } Error error; - if (!client_allow_file(client, path_fs, error)) + if (!client.AllowFile(path_fs, error)) return print_error(client, error); result = client.partition.AppendFile(path_utf8); @@ -104,7 +103,7 @@ handle_addid(Client &client, int argc, char *argv[]) } Error error; - if (!client_allow_file(client, path_fs, error)) + if (!client.AllowFile(path_fs, error)) return print_error(client, error); result = client.partition.AppendFile(path_utf8, &added_id); |