From fb5c60bee921cd35ba39169e36a54829a26a1fcd Mon Sep 17 00:00:00 2001 From: Nicolas Favre-Felix Date: Tue, 21 Dec 2010 22:58:02 +0100 Subject: [PATCH] Small refactoring. --- README.markdown | 2 +- cmd.c | 8 +++----- jansson/src/.jansson.h.swp | Bin 16384 -> 0 bytes turnip.c | 27 --------------------------- 4 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 jansson/src/.jansson.h.swp diff --git a/README.markdown b/README.markdown index 4e74c73..6e61e3c 100644 --- a/README.markdown +++ b/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 diff --git a/cmd.c b/cmd.c index 459637f..14b05c8 100644 --- a/cmd.c +++ b/cmd.c @@ -1,12 +1,10 @@ #include "cmd.h" +#include "json.h" #include #include #include -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); } diff --git a/jansson/src/.jansson.h.swp b/jansson/src/.jansson.h.swp deleted file mode 100644 index 0fff064b3f5b7b1bdddf8b41d1be0e6721eb6647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI2Uu+yl9mkinK--WuYKTCnz{Ewt=i28xhbF0hnyOGhgjPl3pOARse*w{lR=@*&X?Y+JK=4qis=V+-AcF62W_NG* zcAcElmm=*+AD?$;<~P6j&TnRCW^X<>SDaznvSSK9>lNjW$JWn0{>pacjSnb_sn;z- zb13DipZQMfs_A~>L!QCWeYVw}x0XihR)dea9oy8~qbD`faV&GxvFrZ-*+su(`kg9} zD)7z~Sf^|m%jd|>odcWLhTCV~xyjT*sz9nhsz9nhsz9nhsz9nhsz9p1|BV7}dyVoi zyj|mY{E+wko}TX;yz3L*HTJcXbnZ7z5R#i008g*{r&%y+Z5#`@C)!D*ao(MF~GpBU>&%8tD?LPegb|Bz5%`r zo(AW^qu>#sf?eRF;12N5btng31LwgsxCQ(gzdLvmJOLgD=fGLe0>{8K7zY{f5wI5g zd#$3p4gLcD3|<8);4j2VQxF|MfoXs0el{`fB}wzZQyQj6Zpq_73C861Gosj z5554N0S|){;C}F7aOFm{5nKlU0)GR41wRL00?&faf#aYIc7qRs8^H}=4Y-6({v-Gv zXn{|F*U;zBfm2{N5HTQw^pvGH*w9J*AVan0Px88}>Mpkj#SNDY$$Ob`MK@g*&edr* zG?(|}8Fgkp7rYkgR6a3f~AZkdkD>WiAqh92O{3C11nswO|JnpS<0*B`i+ zg|4@!G^4{;Hn@62zI*;1U+t zN;Sj5?YX2}A;Z*){8s$f0V;^5F`Kt7+ttkluh|M^p^s1=!NtAMg?4mXZ;CEvn>ULb zBfD(gtXmy4chgQbC_5uFlBe{M5wa1=v2!QOWt20D7)YM|I?4w@L-#U@k_(M3`e+z_B1SJT2NgxjBrlY&~1!WV_7utoM?p2=?7LKmuwZa?5?|_ z?yjo6)GXni=aQzq1n`_2k!|Kc%ocW_RViPgS z7yJnf7mzbCA3_lE5lj`~A$XPi-T;)7P+~sKwzcKNHp$WMCsF5$N@*lufDW?;m%~C_ zAb_~d%{oUW#GxO`{%{dZ)*V$yOBWgHY!-=Pl}4K-<1oVzrechhW~Zk!!GQAZ%v%;F zW>b`hDH*%4FZw~+KYLaNAnwY36Sw20LWzC4w0~l{T8JA8)!nC|T4grDj@fC=djUZz z1#JsQN`{4+Ct_@c)^*d!r+x&l6ebb`k5=A~onon0I8dm>b&`?ncU?cGsXW}?OhjK%;ez!ViNze*#* z3Ve)I5q2^*HA8n~;Dm07{tsQtZX6EW;~0GOm`4YZV~%_tlRqne2B#)URa%J56elZXb*@mU z7Rx2JV+WqInT)b>K}rb~E@2fDD!d(o|15GG>vpcchymXZT8zq}t6;sz zv1%EZ96+2vHd-F4YQ1fA90K{U=rB4B&USb|99Qw!Z0ZZy#a*E^$88w;Jnk`?45)Lw zVT7u>7LZG~s9?<9gH*RkmHS#A#P%13*${MM9VFQh9l~?F1r?j(Vy0MQhF<5U!?Uc) zIh!s{7E0BEaG=3mO*fn@nV6Eld1vT=rj2}#)pSp5HXmopRtKv)6HC^HPBZy@2T_0; zHM22_RxD0*^o&hDW5xk21IPKFrU=P?0hQZs|kG}=J3%&!s z4Za9YfcwEF@Nw`luolqX{a4^I@F;i$90D5w?d5+4UId>7d%?}%BKGaS2N%G-;4qi~ zd%${d8@LrH;J?_rUjjb@KLkGjUjrAwygU=GZJ zyn)N$J#H&$Nm$iym%JaG~&^wimX2+(TdaHUW! zROSk5xw5ZNVY#JzF7()=9My8ArXDIBt>W>IPi`r8GEu6|RtoAwb+T9#89voxVX{1P zcw(|9ii-?mJsFCneT7nO(A&o;cd9dG&wz|Q28&CiCvfRVrR3dQ;o|uE` zpag#>-HkZ@nGVhrg&vJjubUR3w!Fle@r z3yZAW5ZU5(+7?Q#w`bx3LvhJ1+=%Js}@aWkRL?lI$E zN{wSa`<>%w>#K4HtM|!JY|E4*0+y0V0}9&Y+TSUwYT UN=$-CH7gX<;>E%ap?*~QKdLh-rT_o{ diff --git a/turnip.c b/turnip.c index 2fa81bb..cd28083 100644 --- a/turnip.c +++ b/turnip.c @@ -12,35 +12,8 @@ #include #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);