kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Matheus Tavares 2019-07-10 20:58:58 -03:00 committed by Junio C Hamano
parent 150791adbf
commit c9bba372ed
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dir-iterator.c
View File

@ -71,8 +71,8 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator)


level->dir = opendir(iter->base.path.buf); level->dir = opendir(iter->base.path.buf);
if (!level->dir && errno != ENOENT) { if (!level->dir && errno != ENOENT) {
warning("error opening directory %s: %s", warning_errno("error opening directory '%s'",
iter->base.path.buf, strerror(errno)); 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) { if (!de) {
/* This level is exhausted; pop up a level. */ /* This level is exhausted; pop up a level. */
if (errno) { if (errno) {
warning("error reading directory %s: %s", warning_errno("error reading directory '%s'",
iter->base.path.buf, strerror(errno)); iter->base.path.buf);
} else if (closedir(level->dir)) } else if (closedir(level->dir))
warning("error closing directory %s: %s", warning_errno("error closing directory '%s'",
iter->base.path.buf, strerror(errno)); iter->base.path.buf);


level->dir = NULL; level->dir = NULL;
if (--iter->levels_nr == 0) 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); strbuf_addstr(&iter->base.path, de->d_name);
if (lstat(iter->base.path.buf, &iter->base.st) < 0) { if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
if (errno != ENOENT) if (errno != ENOENT)
warning("error reading path '%s': %s", warning_errno("failed to stat '%s'",
iter->base.path.buf, iter->base.path.buf);
strerror(errno));
continue; continue;
} }


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


if (level->dir && closedir(level->dir)) { 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", errno = saved_errno;
iter->base.path.buf, strerror(errno)); warning_errno("error closing directory '%s'",
iter->base.path.buf);
} }
} }