From: Jani Nikula <jani@nikula.org>
Date: Mon, 22 Sep 2014 09:54:56 +0000 (+0200)
Subject: cli/insert: clean up sync_dir
X-Git-Tag: 0.19_rc1~68
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=eab18a61a9831d73f22b058d9003a683ef6c6462

cli/insert: clean up sync_dir

Clarify the code slightly, improve error messages. Apart from the
error message changes, no functional changes.
---

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 5d478064..7375c548 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -67,20 +67,21 @@ safe_gethostname (char *hostname, size_t len)
 static notmuch_bool_t
 sync_dir (const char *dir)
 {
-    notmuch_bool_t ret;
-    int fd;
+    int fd, r;
 
     fd = open (dir, O_RDONLY);
     if (fd == -1) {
-	fprintf (stderr, "Error: open() dir failed: %s\n", strerror (errno));
+	fprintf (stderr, "Error: open %s: %s\n", dir, strerror (errno));
 	return FALSE;
     }
-    ret = (fsync (fd) == 0);
-    if (! ret) {
-	fprintf (stderr, "Error: fsync() dir failed: %s\n", strerror (errno));
-    }
+
+    r = fsync (fd);
+    if (r)
+	fprintf (stderr, "Error: fsync %s: %s\n", dir, strerror (errno));
+
     close (fd);
-    return ret;
+
+    return r == 0;
 }
 
 /*