From 6a3e96ad2149584e441b0e8a5827dc6c2624035b Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Thu, 25 Aug 2022 12:08:20 -0700 Subject: Maintain backward compatibiliy withour onConnect callback. In f69fac7690fb22a7fc19dba61ef70e5f79ccb2e9, our async onConnect callback was improved to take a non-const redisAsyncContext allowing it to be reentrant. Unfortunately, this is a breaking change we can't make until hiredis v2.0.0. This commit creates a separate callback member and corresponding function that allows us to use the new functionality, while maintaining our existing API for legacy code. Fixes #1086 --- test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test.c') diff --git a/test.c b/test.c index fccaca4..b901752 100644 --- a/test.c +++ b/test.c @@ -2008,7 +2008,7 @@ static redisAsyncContext *do_aconnect(struct config config, astest_no testno) { redisOptions options = {0}; memset(&astest, 0, sizeof(astest)); - + astest.testno = testno; astest.connect_status = astest.disconnect_status = -2; @@ -2039,7 +2039,7 @@ static redisAsyncContext *do_aconnect(struct config config, astest_no testno) c->data = &astest; c->dataCleanup = asCleanup; redisPollAttach(c); - redisAsyncSetConnectCallback(c, connectCallback); + redisAsyncSetConnectCallbackNC(c, connectCallback); redisAsyncSetDisconnectCallback(c, disconnectCallback); return c; } @@ -2058,7 +2058,7 @@ static void test_async_polling(struct config config) { int status; redisAsyncContext *c; struct config defaultconfig = config; - + test("Async connect: "); c = do_aconnect(config, ASTEST_CONNECT); assert(c); @@ -2095,7 +2095,7 @@ static void test_async_polling(struct config config) { test_cond(astest.connect_status == REDIS_ERR); config = defaultconfig; } - + /* Test a ping/pong after connection */ test("Async PING/PONG: "); c = do_aconnect(config, ASTEST_PINGPONG); -- cgit v1.2.3