dir-iterator: use warning_errno when possible

Change warning(..., strerror(errno)) by warning_errno(...). This helps
to unify warning display besides simplifying a bit the code. Also,
improve warning messages by surrounding paths with quotation marks and
using more meaningful statements.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir-iterator.c b/dir-iterator.c
index f2dcd82fde9723be1e53770ad25af42ec547869a..0c8880868a0b08a3a3548886e8a2ed28605d09fe 100644 (file)
--- a/dir-iterator.c
+++ b/dir-iterator.c
@@ -71,8 +71,8 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator)
 
                        level->dir = opendir(iter->base.path.buf);
                        if (!level->dir && errno != ENOENT) {
 
                        level->dir = opendir(iter->base.path.buf);
                        if (!level->dir && errno != ENOENT) {

-                               warning("error opening directory %s: %s",
-                                       iter->base.path.buf, strerror(errno));
+                               warning_errno("error opening directory '%s'",
+                                             iter->base.path.buf);

                                /* Popping the level is handled below */
                        }
 
                                /* Popping the level is handled below */
                        }
 


@@ -122,11 +122,11 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator)
                        if (!de) {
                                /* This level is exhausted; pop up a level. */
                                if (errno) {
                        if (!de) {
                                /* This level is exhausted; pop up a level. */
                                if (errno) {

-                                       warning("error reading directory %s: %s",
-                                               iter->base.path.buf, strerror(errno));
+                                       warning_errno("error reading directory '%s'",
+                                                     iter->base.path.buf);

                                } else if (closedir(level->dir))
                                } else if (closedir(level->dir))

-                                       warning("error closing directory %s: %s",
-                                               iter->base.path.buf, strerror(errno));
+                                       warning_errno("error closing directory '%s'",
+                                                     iter->base.path.buf);

 
                                level->dir = NULL;
                                if (--iter->levels_nr == 0)
 
                                level->dir = NULL;
                                if (--iter->levels_nr == 0)


@@ -140,9 +140,8 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator)
                        strbuf_addstr(&iter->base.path, de->d_name);
                        if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
                                if (errno != ENOENT)
                        strbuf_addstr(&iter->base.path, de->d_name);
                        if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
                                if (errno != ENOENT)

-                                       warning("error reading path '%s': %s",
-                                               iter->base.path.buf,
-                                               strerror(errno));
+                                       warning_errno("failed to stat '%s'",
+                                                     iter->base.path.buf);

                                continue;
                        }
 
                                continue;
                        }
 


@@ -170,9 +169,11 @@ int dir_iterator_abort(struct dir_iterator *dir_iterator)
                        &iter->levels[iter->levels_nr - 1];
 
                if (level->dir && closedir(level->dir)) {
                        &iter->levels[iter->levels_nr - 1];
 
                if (level->dir && closedir(level->dir)) {

+                       int saved_errno = errno;

                        strbuf_setlen(&iter->base.path, level->prefix_len);
                        strbuf_setlen(&iter->base.path, level->prefix_len);

-                       warning("error closing directory %s: %s",
-                               iter->base.path.buf, strerror(errno));
+                       errno = saved_errno;
+                       warning_errno("error closing directory '%s'",
+                                     iter->base.path.buf);

                }
        }
 
                }
        }