From eab18a61a9831d73f22b058d9003a683ef6c6462 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 22 Sep 2014 11:54:56 +0200 Subject: [PATCH] cli/insert: clean up sync_dir Clarify the code slightly, improve error messages. Apart from the error message changes, no functional changes. --- notmuch-insert.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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; } /* -- 2.26.2