diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-04-08 16:19:00 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-04-10 01:50:32 +0200 |
| commit | 50eadf2a242468a9552fc770cb7e5ebfd89c6bb1 (patch) | |
| tree | 4a814a20f6170742eb17102adf9a65d0c1eeeabf | |
| parent | Adjust --strict-warnings builds in Travis (diff) | |
| download | openssl-50eadf2a242468a9552fc770cb7e5ebfd89c6bb1.tar.xz openssl-50eadf2a242468a9552fc770cb7e5ebfd89c6bb1.zip | |
Fix warnings exposed by clang-3.8
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | apps/s_cb.c | 4 | ||||
| -rw-r--r-- | test/ct_test.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 49f3acd65f..abcbad4738 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -507,12 +507,12 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) { BIO_printf(out, "read from %p [%p] (%lu bytes => %ld (0x%lX))\n", - (void *)bio, argp, (unsigned long)argi, ret, ret); + (void *)bio, (void *)argp, (unsigned long)argi, ret, ret); BIO_dump(out, argp, (int)ret); return (ret); } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) { BIO_printf(out, "write to %p [%p] (%lu bytes => %ld (0x%lX))\n", - (void *)bio, argp, (unsigned long)argi, ret, ret); + (void *)bio, (void *)argp, (unsigned long)argi, ret, ret); BIO_dump(out, argp, (int)ret); } return (ret); diff --git a/test/ct_test.c b/test/ct_test.c index bdd5b84806..8175d16c92 100644 --- a/test/ct_test.c +++ b/test/ct_test.c @@ -101,7 +101,11 @@ static CT_TEST_FIXTURE set_up(const char *const test_case_name) { CT_TEST_FIXTURE fixture; int setup_ok = 1; - CTLOG_STORE *ctlog_store = CTLOG_STORE_new(); + CTLOG_STORE *ctlog_store; + + memset(&fixture, 0, sizeof(fixture)); + + ctlog_store = CTLOG_STORE_new(); if (ctlog_store == NULL) { setup_ok = 0; @@ -115,7 +119,6 @@ static CT_TEST_FIXTURE set_up(const char *const test_case_name) goto end; } - memset(&fixture, 0, sizeof(fixture)); fixture.test_case_name = test_case_name; fixture.ctlog_store = ctlog_store; |