diff options
| author | Vicent Martà <vicent@github.com> | 2012-06-07 09:44:08 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-06-07 09:44:08 -0700 |
| commit | 5bb545822d2cea1dd1d5fa8da18fe08e85724bc8 (patch) | |
| tree | a0d79e11cc4475b64e5edb2580b16ce2b8520dcd | |
| parent | 9bc57e567109560c57496bac613e33c140071085 (diff) | |
| parent | 6654dbe3207a16bae7b5f96034faf2075ff1942b (diff) | |
| download | libgit2-5bb545822d2cea1dd1d5fa8da18fe08e85724bc8.tar.gz | |
Merge pull request #752 from nulltoken/fix/warning
Fix compilation warning and failing test
| -rw-r--r-- | src/netops.c | 4 | ||||
| -rw-r--r-- | tests-clar/core/errors.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/netops.c b/src/netops.c index b12750bee..e6f3e5627 100644 --- a/src/netops.c +++ b/src/netops.c @@ -144,7 +144,9 @@ void gitno_consume_n(gitno_buffer *buf, size_t cons) int gitno_ssl_teardown(git_transport *t) { - int ret = ret; +#ifdef GIT_SSL + int ret; +#endif if (!t->encrypt) return 0; diff --git a/tests-clar/core/errors.c b/tests-clar/core/errors.c index 0be3e7aca..10c0cdd3f 100644 --- a/tests-clar/core/errors.c +++ b/tests-clar/core/errors.c @@ -31,7 +31,7 @@ void test_core_errors__new_school(void) do { struct stat st; memset(&st, 0, sizeof(st)); - assert(p_lstat("this_file_does_not_exist", &st) < 0); + cl_assert(p_lstat("this_file_does_not_exist", &st) < 0); GIT_UNUSED(st); } while (false); giterr_set(GITERR_OS, "stat failed"); /* internal fn */ |