From d4032c6101b744df8982c2d2fa496cd1d5f67a4d Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 14 Oct 2013 01:04:02 +0000 Subject: [PATCH] fix compile warnings in ed25519 code --- ed25519/src/sha512.c | 8 ++++---- test/main.cpp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ed25519/src/sha512.c b/ed25519/src/sha512.c index 635d8ae09..cb8ae7175 100644 --- a/ed25519/src/sha512.c +++ b/ed25519/src/sha512.c @@ -268,8 +268,8 @@ int sha512(const unsigned char *message, size_t message_len, unsigned char *out) { sha512_context ctx; int ret; - if (ret = sha512_init(&ctx)) return ret; - if (ret = sha512_update(&ctx, message, message_len)) return ret; - if (ret = sha512_final(&ctx, out)) return ret; + if ((ret = sha512_init(&ctx))) return ret; + if ((ret = sha512_update(&ctx, message, message_len))) return ret; + if ((ret = sha512_final(&ctx, out))) return ret; return 0; -} \ No newline at end of file +} diff --git a/test/main.cpp b/test/main.cpp index aba387178..ea3552cb7 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -160,12 +160,14 @@ int main() fflush(stderr); int ret = print_failures(); +#if !defined TORRENT_LOGGING && !defined TORRENT_VERBOSE_LOGGING if (ret == 0) { remove_all(test_dir, ec); if (ec) fprintf(stderr, "failed to remove test dir: %s\n", ec.message().c_str()); } +#endif return ret; }