From 04c3b35f9c90fb93390c0198bc1a8123ca13e081 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 23 Feb 2016 13:02:07 -0500 Subject: [PATCH 1/2] map: use `giterr_set` internally Use the `giterr_set` function, which actually supports `GITERR_OS`. The `giterr_set_str` function is exposed for external users and will not append the operating system's error message. --- src/unix/map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unix/map.c b/src/unix/map.c index 87ee6594b..72abb3418 100644 --- a/src/unix/map.c +++ b/src/unix/map.c @@ -17,7 +17,7 @@ int git__page_size(size_t *page_size) { long sc_page_size = sysconf(_SC_PAGE_SIZE); if (sc_page_size < 0) { - giterr_set_str(GITERR_OS, "Can't determine system page size"); + giterr_set(GITERR_OS, "can't determine system page size"); return -1; } *page_size = (size_t) sc_page_size; From cd59e0c0c757a5bcc4ed2324b207846b411368cb Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 23 Feb 2016 13:05:49 -0500 Subject: [PATCH 2/2] giterr_set_str: remove `GITERR_OS` documentation The `giterr_set_str` does not actually honor `GITERR_OS`. Remove the documentation that claims that we do. --- include/git2/errors.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/git2/errors.h b/include/git2/errors.h index 1b528cf25..3ecea34bf 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -126,11 +126,6 @@ GIT_EXTERN(void) giterr_clear(void); * This error message is stored in thread-local storage and only applies * to the particular thread that this libgit2 call is made from. * - * NOTE: Passing the `error_class` as GITERR_OS has a special behavior: we - * attempt to append the system default error message for the last OS error - * that occurred and then clear the last error. The specific implementation - * of looking up and clearing this last OS error will vary by platform. - * * @param error_class One of the `git_error_t` enum above describing the * general subsystem that is responsible for the error. * @param string The formatted error message to keep