From 8963cd1fabbe9cb54a5f246844b3fd5b1ac332cf Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 24 Feb 2014 23:14:14 +0100
Subject: [PATCH] DirectorySave: move code to ParseLine()

---
 src/db/DirectorySave.cxx | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/db/DirectorySave.cxx b/src/db/DirectorySave.cxx
index 614473d34..30b96aa5a 100644
--- a/src/db/DirectorySave.cxx
+++ b/src/db/DirectorySave.cxx
@@ -70,6 +70,18 @@ directory_save(FILE *fp, const Directory &directory)
 		fprintf(fp, DIRECTORY_END "%s\n", directory.GetPath());
 }
 
+static bool
+ParseLine(Directory &directory, const char *line)
+{
+	if (StringStartsWith(line, DIRECTORY_MTIME)) {
+		directory.mtime =
+			ParseUint64(line + sizeof(DIRECTORY_MTIME) - 1);
+	} else
+		return false;
+
+	return true;
+}
+
 static Directory *
 directory_load_subdir(TextFile &file, Directory &parent, const char *name,
 		      Error &error)
@@ -84,29 +96,23 @@ directory_load_subdir(TextFile &file, Directory &parent, const char *name,
 
 	Directory *directory = parent.CreateChild(name);
 
-	const char *line = file.ReadLine();
-	if (line == nullptr) {
-		error.Set(directory_domain, "Unexpected end of file");
-		directory->Delete();
-		return nullptr;
-	}
-
-	if (StringStartsWith(line, DIRECTORY_MTIME)) {
-		directory->mtime =
-			ParseUint64(line + sizeof(DIRECTORY_MTIME) - 1);
-
-		line = file.ReadLine();
+	while (true) {
+		const char *line = file.ReadLine();
 		if (line == nullptr) {
 			error.Set(directory_domain, "Unexpected end of file");
 			directory->Delete();
 			return nullptr;
 		}
-	}
 
-	if (!StringStartsWith(line, DIRECTORY_BEGIN)) {
-		error.Format(directory_domain, "Malformed line: %s", line);
-		directory->Delete();
-		return nullptr;
+		if (StringStartsWith(line, DIRECTORY_BEGIN))
+			break;
+
+		if (!ParseLine(*directory, line)) {
+			error.Format(directory_domain,
+				     "Malformed line: %s", line);
+			directory->Delete();
+			return nullptr;
+		}
 	}
 
 	success = directory_load(file, *directory, error);