diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-10-12 05:28:25 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-12 05:29:27 -0700 |
| commit | 7278e3b2ee49a853b01dc6532bd7067a264f235d (patch) | |
| tree | 28e83de310f0c58df226e253a82b0d43ff784497 /src/directory_save.c | |
| parent | c87ce02575e0a9d5ac3e50938688187ea28ad400 (diff) | |
| parent | c7579ca2d8422f0172537e1ca7d1bd46edfc4f9d (diff) | |
| download | mpd-7278e3b2ee49a853b01dc6532bd7067a264f235d.tar.gz mpd-7278e3b2ee49a853b01dc6532bd7067a264f235d.tar.xz mpd-7278e3b2ee49a853b01dc6532bd7067a264f235d.zip | |
Merge branch 'ew/directory'
* ew/directory: (21 commits)
update: fix multiple deletes from *vec iterators
directory: children leave parents before being free()ed
directory: always maintain sorted properties vectors
update: simplify the serialized_delete usage a bit
update: remove delete_each_song and clear_directory
directory: directory_free kills all that it contains
update: serialize directory deletions
update: serialize song_free in main thread
dirvec: introduce locking for all iterators
dirvec: use dirvec_for_each where it makes sense
dirvec: add dirvec_for_each iterator
songvec: avoid holding nr_lock during free(3)
update: allow music_root updates to be queued
update: validate in command.c and fix small memory leak
directory: rename isRootDirectory => path_is_music_root
Avoid calling isRootDirectory when we have a directory object
directory: make music_root global and avoid runtime initialization
directory: use mpd_sizeof_str_flex_array for path, too
tag_item: avoid wasting space when struct is unpackable
song: use mpd_sizeof_str_flex_array for song.url
...
[ew: fixed up merge errors with myself when isRootDirectory
went away]
Diffstat (limited to 'src/directory_save.c')
| -rw-r--r-- | src/directory_save.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/directory_save.c b/src/directory_save.c index c39ece58a..e12de0019 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -45,7 +45,7 @@ int directory_save(int fd, struct directory *dir) struct dirvec *children = &dir->children; size_t i; - if (!isRootDirectory(dir->path) && + if ((dir != &music_root) && fdprintf(fd, DIRECTORY_BEGIN "%s\n", directory_get_path(dir)) < 0) return -1; @@ -70,7 +70,7 @@ int directory_save(int fd, struct directory *dir) if (fdprintf(fd, SONG_END "\n") < 0) return -1; - if (!isRootDirectory(dir->path) && + if ((dir != &music_root) && fdprintf(fd, DIRECTORY_END "%s\n", directory_get_path(dir)) < 0) return -1; |