database: simplify db_load()

src/database.c

@@ -238,6 +238,10 @@ db_load(void)
 	FILE *fp = NULL;
 	char *dbFile = db_get_file();
 	struct stat st;
+	char buffer[100];
+	int bufferSize = 100;
+	int foundFsCharset = 0;
+	int foundVersion = 0;
 
 	if (!music_root)
 		music_root = directory_new("", NULL);
@@ -249,24 +253,23 @@ db_load(void)
 	}
 
 	/* get initial info */
-	{
-		char buffer[100];
-		int bufferSize = 100;
-		int foundFsCharset = 0;
-		int foundVersion = 0;
-
 	if (!myFgets(buffer, bufferSize, fp))
 		FATAL("Error reading db, fgets\n");
-		if (0 == strcmp(DIRECTORY_INFO_BEGIN, buffer)) {
+
+	if (0 != strcmp(DIRECTORY_INFO_BEGIN, buffer)) {
+		ERROR("db info not found in db file\n");
+		ERROR("you should recreate the db using --create-db\n");
+		while (fclose(fp) && errno == EINTR) ;
+		return -1;
+	}
+
 	while (myFgets(buffer, bufferSize, fp) &&
 	       0 != strcmp(DIRECTORY_INFO_END, buffer)) {
-				if (!prefixcmp(buffer, DIRECTORY_MPD_VERSION))
-				{
+		if (!prefixcmp(buffer, DIRECTORY_MPD_VERSION)) {
 			if (foundVersion)
 				FATAL("already found version in db\n");
 			foundVersion = 1;
-				} else if (!prefixcmp(buffer,
-				                      DIRECTORY_FS_CHARSET)) {
+		} else if (!prefixcmp(buffer, DIRECTORY_FS_CHARSET)) {
 			char *fsCharset;
 			char *tempCharset;
 
@@ -286,18 +289,10 @@ db_load(void)
 					"recreate the db?\n");
 				setFsCharset(fsCharset);
 			}
-				} else {
+		} else
 			FATAL("directory: unknown line in db info: %s\n",
 			      buffer);
 	}
-			}
-		} else {
-			ERROR("db info not found in db file\n");
-			ERROR("you should recreate the db using --create-db\n");
-			while (fclose(fp) && errno == EINTR) ;
-			return -1;
-		}
-	}
 
 	DEBUG("reading DB\n");