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

Merge branch 'v0.17.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/client_file.h
This commit is contained in:
Max Kellermann 2012-08-13 07:59:19 +02:00
commit 3047bdf653
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -1,7 +1,12 @@
ver 0.18 (2012/??/??) ver 0.18 (2012/??/??)
* improved decoder/output error reporting * improved decoder/output error reporting
ver 0.17.1 (2012/??/??) ver 0.17.2 (2012/??/??)
* protocol:
- fix crash in local file check
ver 0.17.1 (2012/07/31)
* protocol: * protocol:
- require appropriate permissions for searchadd{,pl} - require appropriate permissions for searchadd{,pl}
* tags: * tags:

2
src/client_file.h
View File

@ -20,7 +20,6 @@
#ifndef MPD_CLIENT_FILE_H #ifndef MPD_CLIENT_FILE_H
#define MPD_CLIENT_FILE_H #define MPD_CLIENT_FILE_H
#include "gcc.h"
#include "gerror.h" #include "gerror.h"
#include <stdbool.h> #include <stdbool.h>
@ -37,7 +36,6 @@ struct client;
* @param path_fs the absolute path name in filesystem encoding * @param path_fs the absolute path name in filesystem encoding
* @return true if access is allowed * @return true if access is allowed
*/ */
gcc_pure
bool bool
client_allow_file(const struct client *client, const char *path_fs, client_allow_file(const struct client *client, const char *path_fs,
GError **error_r); GError **error_r);