diff options
| author | Gilad Arnold <garnold@google.com> | 2015-08-27 22:06:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 22:06:28 +0000 |
| commit | dc6e41753adf3c958e24e29b100df727738ffdf4 (patch) | |
| tree | 85295236d456239e6fa83adfc2177013ee43f0a2 | |
| parent | 31b8f34d25d371b715399e999fb66edcd04f2c84 (diff) | |
| parent | 4def35436a9e7d8531fb29b1e6e8c511cf556822 (diff) | |
| download | tlsdate-dc6e41753adf3c958e24e29b100df727738ffdf4.tar.gz | |
am 4def3543: More signed/unsigned comparison and function pointer fixes.
* commit '4def35436a9e7d8531fb29b1e6e8c511cf556822':
More signed/unsigned comparison and function pointer fixes.
| -rw-r--r-- | src/proxy-bio-unittest.c | 14 | ||||
| -rw-r--r-- | src/test-bio.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/proxy-bio-unittest.c b/src/proxy-bio-unittest.c index 8b9ae8b..40b47e3 100644 --- a/src/proxy-bio-unittest.c +++ b/src/proxy-bio-unittest.c @@ -128,7 +128,7 @@ TEST_F (test_bio, socks4a_success) sizeof (kSocks4ARequest))); EXPECT_EQ (0, need_out_bytes (self->test, kTestInput, sizeof (kTestInput))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_F (test_bio, socks4a_fail) @@ -148,7 +148,7 @@ TEST_F (test_bio, socks4a_fail) EXPECT_EQ (0, need_out_bytes (self->test, kSocks4ARequest, sizeof (kSocks4ARequest))); /* We shouldn't have written any payload */ - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } unsigned const char kSocks5AuthRequest[] = @@ -201,7 +201,7 @@ TEST_F (test_bio, socks5_success) sizeof (kSocks5ConnectRequest))); EXPECT_EQ (0, need_out_bytes (self->test, kTestInput, sizeof (kTestInput))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_F (test_bio, socks5_auth_fail) @@ -217,7 +217,7 @@ TEST_F (test_bio, socks5_auth_fail) EXPECT_EQ (0, BIO_write (proxy, kTestInput, sizeof (kTestInput))); EXPECT_EQ (0, need_out_bytes (self->test, kSocks5AuthRequest, sizeof (kSocks5AuthRequest))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_F (test_bio, socks5_connect_fail) @@ -242,7 +242,7 @@ TEST_F (test_bio, socks5_connect_fail) sizeof (kSocks5AuthRequest))); EXPECT_EQ (0, need_out_bytes (self->test, kSocks5ConnectRequest, sizeof (kSocks5ConnectRequest))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_F (test_bio, http_success) @@ -265,7 +265,7 @@ TEST_F (test_bio, http_success) strlen (kConnectRequest))); EXPECT_EQ (0, need_out_bytes (self->test, kTestInput, sizeof (kTestInput))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_F (test_bio, http_error) @@ -286,7 +286,7 @@ TEST_F (test_bio, http_error) EXPECT_EQ (0, need_out_bytes (self->test, (unsigned char *) kConnectRequest, strlen (kConnectRequest))); - EXPECT_EQ (0, BIO_test_output_left (self->test)); + EXPECT_EQ (0U, BIO_test_output_left (self->test)); } TEST_HARNESS_MAIN diff --git a/src/test-bio.c b/src/test-bio.c index de8dd37..5c54b2d 100644 --- a/src/test-bio.c +++ b/src/test-bio.c @@ -109,7 +109,7 @@ long test_ctrl (BIO *b, int cmd, long num, void *ptr) return 0; } -long test_callback_ctrl (BIO *b, int cmd, bio_info_cb *fp) +long test_callback_ctrl (BIO *b, int cmd, bio_info_cb fp) { return 0; } |