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

directory_save: partially revert the g_str_has_prefix() patch

Browse Source
This commit is contained in:
Max Kellermann 2009-11-01 17:49:49 +01:00
parent 53a749780a
commit 7f9ee00980
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/directory_save.c
View File

@ -123,7 +123,7 @@ directory_load_subdir(FILE *fp, struct directory *parent, const char *name,
} }
} }
if (strcmp(line, DIRECTORY_BEGIN) != 0) { if (!g_str_has_prefix(line, DIRECTORY_BEGIN)) {
g_set_error(error_r, directory_quark(), 0, g_set_error(error_r, directory_quark(), 0,
"Malformed line: %s", line); "Malformed line: %s", line);
directory_free(directory); directory_free(directory);
@ -147,7 +147,7 @@ directory_load(FILE *fp, struct directory *directory,
bool success; bool success;
while ((line = read_text_line(fp, buffer)) != NULL && while ((line = read_text_line(fp, buffer)) != NULL &&
strcmp(line, DIRECTORY_END) != 0) { !g_str_has_prefix(line, DIRECTORY_END)) {
if (g_str_has_prefix(line, DIRECTORY_DIR)) { if (g_str_has_prefix(line, DIRECTORY_DIR)) {
struct directory *subdir = struct directory *subdir =
directory_load_subdir(fp, directory, directory_load_subdir(fp, directory,