zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert e5dd32d8 that added the const qualifier for command callbacks

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-10-19 20:47:04 +02:00
parent c8d72f7c7a
commit d4b4a9128e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hiredis.c
View File

@ -839,7 +839,7 @@ void *redisCommand(redisContext *c, const char *format, ...) {
* Always returns NULL. In a non-blocking context this will never fail because * Always returns NULL. In a non-blocking context this will never fail because
* this function does not do any I/O. In a blocking context this function will * this function does not do any I/O. In a blocking context this function will
* have no effect (a callback in a blocking context makes no sense). */ * have no effect (a callback in a blocking context makes no sense). */
void *redisCommandWithCallback(redisContext *c, redisCallbackFn *fn, const void *privdata, const char *format, ...) { void *redisCommandWithCallback(redisContext *c, redisCallbackFn *fn, void *privdata, const char *format, ...) {
va_list ap; va_list ap;
sds cmd; sds cmd;
int status; int status;

6
hiredis.h
View File

@ -80,7 +80,7 @@ struct redisContext; /* need forward declaration of redisContext */
typedef void (redisContextCallbackFn)(struct redisContext*, void*); typedef void (redisContextCallbackFn)(struct redisContext*, void*);
/* Reply callback prototype and container */ /* Reply callback prototype and container */
typedef void (redisCallbackFn)(struct redisContext*, redisReply*, const void*); typedef void (redisCallbackFn)(struct redisContext*, redisReply*, void*);
/* Callback containers */ /* Callback containers */
typedef struct redisContextCallback { typedef struct redisContextCallback {
@ -90,7 +90,7 @@ typedef struct redisContextCallback {
typedef struct redisCallback { typedef struct redisCallback {
redisCallbackFn *fn; redisCallbackFn *fn;
const void *privdata; void *privdata;
} redisCallback; } redisCallback;
/* Context for a connection to Redis */ /* Context for a connection to Redis */
@ -163,6 +163,6 @@ void *redisCommand(redisContext *c, const char *format, ...);
* *
* Note: when called with a blocking context, this function will not do * Note: when called with a blocking context, this function will not do
* anything and immediately returns NULL. */ * anything and immediately returns NULL. */
void *redisCommandWithCallback(redisContext *c, redisCallbackFn *fn, const void *privdata, const char *format, ...); void *redisCommandWithCallback(redisContext *c, redisCallbackFn *fn, void *privdata, const char *format, ...);
#endif #endif

2
test.c
View File

@ -203,7 +203,7 @@ static void __test_callback(redisContext *c, void *privdata) {
} }
static long __test_reply_callback_flags = 0; static long __test_reply_callback_flags = 0;
static void __test_reply_callback(redisContext *c, redisReply *reply, const void *privdata) { static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
((void)c); ((void)c);
/* Shift to detect execution order */ /* Shift to detect execution order */
__test_reply_callback_flags <<= 8; __test_reply_callback_flags <<= 8;