Skip to content

M
mpd
Commit 7f9ee009 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

directory_save: partially revert the g_str_has_prefix() patch

parent 53a74978
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/directory_save.c
View file @ 7f9ee009
...@@ -123,7 +123,7 @@ directory_load_subdir(FILE *fp, struct directory *parent, const char *name, ...@@ -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, ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment