summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Rogers <alan@github.com>2014-05-20 17:40:28 +1000
committerAlan Rogers <alan@github.com>2014-05-20 17:40:28 +1000
commit9055347944ff13fd5e91de0b29caeecb41c8bff4 (patch)
tree9a2eb5844fe910261a6c7d1b148843b26d144e35
parentdc4906f12aedd608b01d04415fdca838eba045f6 (diff)
downloadlibgit2-9055347944ff13fd5e91de0b29caeecb41c8bff4.tar.gz
Rename GIT_ENOACCESS -> GIT_EUNREADABLE
-rw-r--r--include/git2/errors.h2
-rw-r--r--src/path.c11
2 files changed, 5 insertions, 8 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h
index f09e72566..3fb3f5635 100644
--- a/include/git2/errors.h
+++ b/include/git2/errors.h
@@ -41,7 +41,7 @@ typedef enum {
GIT_EMERGECONFLICT = -13, /*< Merge conflicts prevented operation */
GIT_ELOCKED = -14, /*< Lock file prevented operation */
GIT_EMODIFIED = -15, /*< Reference value does not match expected */
- GIT_ENOACCESS = -16, /*< Access denied attempting operation */
+ GIT_EUNREADABLE = -16, /*< File or folder is unreadable */
GIT_PASSTHROUGH = -30, /*< Internal only */
GIT_ITEROVER = -31, /*< Signals end of iteration with iterator */
diff --git a/src/path.c b/src/path.c
index a056f6983..c3487daf2 100644
--- a/src/path.c
+++ b/src/path.c
@@ -560,14 +560,10 @@ int git_path_set_error(int errno_value, const char *path, const char *action)
case EEXIST:
giterr_set(GITERR_OS, "Failed %s - '%s' already exists", action, path);
return GIT_EEXISTS;
-
- case EACCES:
- giterr_set(GITERR_OS, "Failed %s - '%s' permission denied", action, path);
- return GIT_ENOACCESS;
-
+
default:
giterr_set(GITERR_OS, "Could not %s '%s'", action, path);
- return -1;
+ return GIT_EUNREADABLE;
}
}
@@ -1108,12 +1104,13 @@ int git_path_dirload_with_stat(
if ((error = git_buf_joinpath(&full, full.ptr, ps->path)) < 0 ||
(error = git_path_lstat(full.ptr, &ps->st)) < 0) {
- if (error == GIT_ENOTFOUND || error == GIT_ENOACCESS) {
+ if (error == GIT_ENOTFOUND) {
giterr_clear();
error = 0;
git_vector_remove(contents, i--);
continue;
}
+
break;
}