Commit 5bb545822d2cea1dd1d5fa8da18fe08e85724bc8

Vicent Martí 2012-06-07T09:44:08

Merge pull request #752 from nulltoken/fix/warning Fix compilation warning and failing test

diff --git a/src/netops.c b/src/netops.c
index b12750b..e6f3e56 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 0be3e7a..10c0cdd 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 */