Merge pull request libgit2#602 from arrbee/more-error-handling

More error handling conversions
carlosmn · Mar 21, 2012 · a227451 · a227451
2 parents 0d0fa7c + a4c291e
commit a227451
Show file tree

Hide file tree

Showing 16 changed files with 520 additions and 559 deletions.
diff --git a/include/git2/errors.h b/include/git2/errors.h
@@ -123,12 +123,14 @@ typedef struct {
 typedef enum {
 	GITERR_NOMEMORY,
 	GITERR_OS,
+	GITERR_INVALID,
 	GITERR_REFERENCE,
 	GITERR_ZLIB,
 	GITERR_REPOSITORY,
 	GITERR_CONFIG,
 	GITERR_REGEX,
-	GITERR_ODB
+	GITERR_ODB,
+	GITERR_INDEX
 } git_error_class;
 
 /**

diff --git a/src/fileops.c b/src/fileops.c
@@ -108,10 +108,10 @@ mode_t git_futils_canonical_mode(mode_t raw_mode)
 		return S_IFREG | GIT_CANONICAL_PERMS(raw_mode);
 	else if (S_ISLNK(raw_mode))
 		return S_IFLNK;
-	else if (S_ISDIR(raw_mode))
-		return S_IFDIR;
 	else if (S_ISGITLINK(raw_mode))
 		return S_IFGITLINK;
+	else if (S_ISDIR(raw_mode))
+		return S_IFDIR;
 	else
 		return 0;
 }