From e4b7a113fded192d2ad31b68a87cf444f206a04e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 25 Jul 2010 11:09:13 +0200 Subject: database, ...: remove EINTR checks after stdio calls MPD doesn't have child processes anymore, and thus we're not expecting to receive SIGCHLD very often. Since hard disk access isn't interrupted by signals anyway, we don't need those excessive checks. --- src/database.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/database.c') diff --git a/src/database.c b/src/database.c index 57158911..f255d6ca 100644 --- a/src/database.c +++ b/src/database.c @@ -255,11 +255,11 @@ db_save(void) if (ferror(fp)) { g_warning("Failed to write to database file: %s", strerror(errno)); - while (fclose(fp) && errno == EINTR); + fclose(fp); return false; } - while (fclose(fp) && errno == EINTR); + fclose(fp); if (stat(database_path, &st) == 0) database_mtime = st.st_mtime; @@ -282,7 +282,7 @@ db_load(GError **error) assert(database_path != NULL); assert(music_root != NULL); - while (!(fp = fopen(database_path, "r")) && errno == EINTR) ; + fp = fopen(database_path, "r"); if (fp == NULL) { g_set_error(error, db_quark(), errno, "Failed to open database file \"%s\": %s", @@ -383,7 +383,7 @@ db_load(GError **error) success = directory_load(fp, music_root, buffer, error); g_string_free(buffer, true); - while (fclose(fp) && errno == EINTR) ; + fclose(fp); if (!success) return false; -- cgit v1.2.3