Small refactoring.

README.markdown

@@ -26,7 +26,7 @@ curl -d "GET/hello" http://127.0.0.1:7379/
 	* Restrict commands by IP range
 * Send your ideas using the github tracker or on twitter [@yowgi](http://twitter.com/yowgi).
 
-# HTTP error codes
+# HTTP error codes that could be used (although that's not the case at the moment)
 * Missing key: 404 Not Found
 * Timeout on the redis side: 503 Service Unavailable
 * Unknown verb: 405 Method Not Allowed

cmd.c

@@ -1,12 +1,10 @@
 #include "cmd.h"
+#include "json.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <hiredis/hiredis.h>
 
-extern void
-cmdCallback(redisAsyncContext *c, void *r, void *privdata);
-
 struct cmd *
 cmd_new(struct evhttp_request *rq, int count) {
 
@@ -60,7 +58,7 @@ cmd_run(redisAsyncContext *c, struct evhttp_request *rq, const char *uri, size_t
 	cmd->argv_len[0] = cmd_len;
 
 	if(!slash) {
-		redisAsyncCommandArgv(c, cmdCallback, cmd, 1, cmd->argv, cmd->argv_len);
+		redisAsyncCommandArgv(c, json_reply, cmd, 1, cmd->argv, cmd->argv_len);
 		return;
 	}
 	p = slash + 1;
@@ -84,6 +82,6 @@ cmd_run(redisAsyncContext *c, struct evhttp_request *rq, const char *uri, size_t
 		cur_param++;
 	}
 
-	redisAsyncCommandArgv(c, cmdCallback, cmd, param_count, cmd->argv, cmd->argv_len);
+	redisAsyncCommandArgv(c, json_reply, cmd, param_count, cmd->argv, cmd->argv_len);
 }
 

turnip.c

@@ -12,35 +12,8 @@
 #include <jansson.h>
 
 #include "conf.h"
-#include "json.h"
 #include "cmd.h"
 
-void
-cmdCallback(redisAsyncContext *c, void *r, void *privdata) {
-	json_reply(c,r,privdata);
-}
-
-#if 0
-	switch(reply->type) {
-		case REDIS_REPLY_STRING:
-		case REDIS_REPLY_STATUS:
-
-			/* send reply */
-			body = evbuffer_new();
-			evbuffer_add(body, reply->str, strlen(reply->str));
-			evhttp_send_reply(cmd->rq, 200, "OK", body);
-			evbuffer_free(body);
-			break;
-
-		case REDIS_REPLY_NIL:
-			evhttp_send_reply(cmd->rq, 404, "Not Found", NULL);
-			break;
-
-		default:
-			evhttp_send_reply(cmd->rq, 500, "Unknown redis format", NULL);
-	}
-#endif
-
 static void
 connectCallback(const redisAsyncContext *c) {
 	((void)c);