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

directory: use gcc.h macros, not GLib

Browse Source
This commit is contained in:
Max Kellermann 2012-08-08 20:06:20 +02:00
parent ca9795c30a
commit 6a83721c55
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/directory.h
View File

@ -22,6 +22,7 @@
#include "check.h"
#include "util/list.h"
#include "gcc.h"
#ifdef __cplusplus
#include "DatabaseVisitor.hxx"
@ -114,14 +115,14 @@ isRootDirectory(const char *name)
/**
* Generic constructor for #directory object.
*/
G_GNUC_MALLOC
gcc_malloc
struct directory *
directory_new(const char *dirname, struct directory *parent);
/**
* Create a new root #directory object.
*/
G_GNUC_MALLOC
gcc_malloc
static inline struct directory *
directory_new_root(void)
{
@ -170,14 +171,14 @@ directory_is_root(const struct directory *directory)
/**
* Returns the base name of the directory.
*/
G_GNUC_PURE
gcc_pure
const char *
directory_get_name(const struct directory *directory);
/**
* Caller must lock the #db_mutex.
*/
G_GNUC_PURE
gcc_pure
struct directory *
directory_get_child(const struct directory *directory, const char *name);
@ -189,7 +190,7 @@ directory_get_child(const struct directory *directory, const char *name);
* @param parent the parent directory the new one will be added to
* @param name_utf8 the UTF-8 encoded name of the new sub directory
*/
G_GNUC_MALLOC
gcc_malloc
struct directory *
directory_new_child(struct directory *parent, const char *name_utf8);
@ -244,7 +245,7 @@ directory_remove_song(struct directory *directory, struct song *song);
*
* Caller must lock the #db_mutex.
*/
G_GNUC_PURE
gcc_pure
struct song *
directory_get_song(const struct directory *directory, const char *name_utf8);