diff options
| author | Anurag Gupta <anugupta@microsoft.com> | 2014-03-11 11:49:19 -0700 |
|---|---|---|
| committer | Anurag Gupta <anugupta@microsoft.com> | 2014-03-24 11:20:31 -0700 |
| commit | 7ca1584b4771703bd9f9c3ad4335f6155b05450a (patch) | |
| tree | 946dbe8319f78aedc0e61476b86a04a1b8742e78 | |
| parent | 46e4d82d6f3e1630cacbd89af39ef3d2e9f20d09 (diff) | |
| download | libgit2-7ca1584b4771703bd9f9c3ad4335f6155b05450a.tar.gz | |
Conforming to libgit2 coding style.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/revwalk.c | 5 | ||||
| -rw-r--r-- | tests/revwalk/hidecb.c | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index d4e0454fa..a28d73866 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ .lock-wafbuild .waf* build/ +buildx64/ build-amiga/ tests/tmp/ msvc/Debug/ diff --git a/CMakeLists.txt b/CMakeLists.txt index cca2a120c..be3b53a8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ IF (MSVC) # /GF - String pooling # /MP - Parallel build - SET(CMAKE_C_FLAGS "/GF /MP /nologo ${CMAKE_C_FLAGS}") + SET(CMAKE_C_FLAGS "/GF /MP /wd4244 /wd4267 /nologo ${CMAKE_C_FLAGS}") IF (STDCALL) # /Gz - stdcall calling convention diff --git a/src/revwalk.c b/src/revwalk.c index edde661e6..f0109360b 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -82,9 +82,7 @@ static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int h int error; if (!hide && walk->hide_cb) - { hide = walk->hide_cb(&commit->oid, walk->hide_cb_payload); - } if (hide && mark_uninteresting(commit) < 0) return -1; @@ -585,8 +583,7 @@ int git_revwalk_add_hide_cb( if (walk->walking) git_revwalk_reset(walk); - if (walk->hide_cb) - { + if (walk->hide_cb) { /* There is already a callback added */ giterr_set(GITERR_INVALID, "There is already a callback added to hide commits in revision walker."); return -1; diff --git a/tests/revwalk/hidecb.c b/tests/revwalk/hidecb.c index b6747588e..4c43f613b 100644 --- a/tests/revwalk/hidecb.c +++ b/tests/revwalk/hidecb.c @@ -35,9 +35,7 @@ void test_revwalk_hidecb__initialize(void) cl_git_pass(git_oid_fromstr(&_head_id, commit_head)); for (i = 0; i < commit_count; i++) - { cl_git_pass(git_oid_fromstr(&commit_ids[i], commit_strs[i])); - } } @@ -73,7 +71,7 @@ static int hide_commit_cb(const git_oid *commit_id, void *data) static int hide_commit_use_payload_cb(const git_oid *commit_id, void *data) { git_oid *hide_commit_id = data; - if (0 == git_oid_cmp(commit_id, hide_commit_id)) + if (git_oid_cmp(commit_id, hide_commit_id) == 0) return 1; else return 0; @@ -197,3 +195,4 @@ void test_revwalk_hidecb__test_payload(void) git_revwalk_free(walk); } + |