1 files changed, 53 insertions, 53 deletions

diff --git a/adapters/libevent.h b/adapters/libevent.h
index 936c37e..66ce6b6 100644
--- a/adapters/libevent.h
+++ b/adapters/libevent.h
@@ -9,59 +9,59 @@
  *
  */
 
-#ifndef __HIREDIS_LIBEVENT_H__
-#define __HIREDIS_LIBEVENT_H__
+#ifndef __HIREDICT_LIBEVENT_H__
+#define __HIREDICT_LIBEVENT_H__
 #include <event2/event.h>
 #include "../hiredict.h"
 #include "../async.h"
 
-#define REDIS_LIBEVENT_DELETED 0x01
-#define REDIS_LIBEVENT_ENTERED 0x02
+#define REDICT_LIBEVENT_DELETED 0x01
+#define REDICT_LIBEVENT_ENTERED 0x02
 
-typedef struct redisLibeventEvents {
-    redisAsyncContext *context;
+typedef struct redictLibeventEvents {
+    redictAsyncContext *context;
     struct event *ev;
     struct event_base *base;
     struct timeval tv;
     short flags;
     short state;
-} redisLibeventEvents;
+} redictLibeventEvents;
 
-static void redisLibeventDestroy(redisLibeventEvents *e) {
+static void redictLibeventDestroy(redictLibeventEvents *e) {
     hi_free(e);
 }
 
-static void redisLibeventHandler(evutil_socket_t fd, short event, void *arg) {
+static void redictLibeventHandler(evutil_socket_t fd, short event, void *arg) {
     ((void)fd);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    e->state |= REDIS_LIBEVENT_ENTERED;
+    redictLibeventEvents *e = (redictLibeventEvents*)arg;
+    e->state |= REDICT_LIBEVENT_ENTERED;
 
-    #define CHECK_DELETED() if (e->state & REDIS_LIBEVENT_DELETED) {\
-        redisLibeventDestroy(e);\
+    #define CHECK_DELETED() if (e->state & REDICT_LIBEVENT_DELETED) {\
+        redictLibeventDestroy(e);\
         return; \
     }
 
-    if ((event & EV_TIMEOUT) && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleTimeout(e->context);
+    if ((event & EV_TIMEOUT) && (e->state & REDICT_LIBEVENT_DELETED) == 0) {
+        redictAsyncHandleTimeout(e->context);
         CHECK_DELETED();
     }
 
-    if ((event & EV_READ) && e->context && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleRead(e->context);
+    if ((event & EV_READ) && e->context && (e->state & REDICT_LIBEVENT_DELETED) == 0) {
+        redictAsyncHandleRead(e->context);
         CHECK_DELETED();
     }
 
-    if ((event & EV_WRITE) && e->context && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleWrite(e->context);
+    if ((event & EV_WRITE) && e->context && (e->state & REDICT_LIBEVENT_DELETED) == 0) {
+        redictAsyncHandleWrite(e->context);
         CHECK_DELETED();
     }
 
-    e->state &= ~REDIS_LIBEVENT_ENTERED;
+    e->state &= ~REDICT_LIBEVENT_ENTERED;
     #undef CHECK_DELETED
 }
 
-static void redisLibeventUpdate(void *privdata, short flag, int isRemove) {
-    redisLibeventEvents *e = (redisLibeventEvents *)privdata;
+static void redictLibeventUpdate(void *privdata, short flag, int isRemove) {
+    redictLibeventEvents *e = (redictLibeventEvents *)privdata;
     const struct timeval *tv = e->tv.tv_sec || e->tv.tv_usec ? &e->tv : NULL;
 
     if (isRemove) {
@@ -80,28 +80,28 @@ static void redisLibeventUpdate(void *privdata, short flag, int isRemove) {
 
     event_del(e->ev);
     event_assign(e->ev, e->base, e->context->c.fd, e->flags | EV_PERSIST,
-                 redisLibeventHandler, privdata);
+                 redictLibeventHandler, privdata);
     event_add(e->ev, tv);
 }
 
-static void redisLibeventAddRead(void *privdata) {
-    redisLibeventUpdate(privdata, EV_READ, 0);
+static void redictLibeventAddRead(void *privdata) {
+    redictLibeventUpdate(privdata, EV_READ, 0);
 }
 
-static void redisLibeventDelRead(void *privdata) {
-    redisLibeventUpdate(privdata, EV_READ, 1);
+static void redictLibeventDelRead(void *privdata) {
+    redictLibeventUpdate(privdata, EV_READ, 1);
 }
 
-static void redisLibeventAddWrite(void *privdata) {
-    redisLibeventUpdate(privdata, EV_WRITE, 0);
+static void redictLibeventAddWrite(void *privdata) {
+    redictLibeventUpdate(privdata, EV_WRITE, 0);
 }
 
-static void redisLibeventDelWrite(void *privdata) {
-    redisLibeventUpdate(privdata, EV_WRITE, 1);
+static void redictLibeventDelWrite(void *privdata) {
+    redictLibeventUpdate(privdata, EV_WRITE, 1);
 }
 
-static void redisLibeventCleanup(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+static void redictLibeventCleanup(void *privdata) {
+    redictLibeventEvents *e = (redictLibeventEvents*)privdata;
     if (!e) {
         return;
     }
@@ -109,48 +109,48 @@ static void redisLibeventCleanup(void *privdata) {
     event_free(e->ev);
     e->ev = NULL;
 
-    if (e->state & REDIS_LIBEVENT_ENTERED) {
-        e->state |= REDIS_LIBEVENT_DELETED;
+    if (e->state & REDICT_LIBEVENT_ENTERED) {
+        e->state |= REDICT_LIBEVENT_DELETED;
     } else {
-        redisLibeventDestroy(e);
+        redictLibeventDestroy(e);
     }
 }
 
-static void redisLibeventSetTimeout(void *privdata, struct timeval tv) {
-    redisLibeventEvents *e = (redisLibeventEvents *)privdata;
+static void redictLibeventSetTimeout(void *privdata, struct timeval tv) {
+    redictLibeventEvents *e = (redictLibeventEvents *)privdata;
     short flags = e->flags;
     e->flags = 0;
     e->tv = tv;
-    redisLibeventUpdate(e, flags, 0);
+    redictLibeventUpdate(e, flags, 0);
 }
 
-static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
-    redisContext *c = &(ac->c);
-    redisLibeventEvents *e;
+static int redictLibeventAttach(redictAsyncContext *ac, struct event_base *base) {
+    redictContext *c = &(ac->c);
+    redictLibeventEvents *e;
 
     /* Nothing should be attached when something is already attached */
     if (ac->ev.data != NULL)
-        return REDIS_ERR;
+        return REDICT_ERR;
 
     /* Create container for context and r/w events */
-    e = (redisLibeventEvents*)hi_calloc(1, sizeof(*e));
+    e = (redictLibeventEvents*)hi_calloc(1, sizeof(*e));
     if (e == NULL)
-        return REDIS_ERR;
+        return REDICT_ERR;
 
     e->context = ac;
 
     /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibeventAddRead;
-    ac->ev.delRead = redisLibeventDelRead;
-    ac->ev.addWrite = redisLibeventAddWrite;
-    ac->ev.delWrite = redisLibeventDelWrite;
-    ac->ev.cleanup = redisLibeventCleanup;
-    ac->ev.scheduleTimer = redisLibeventSetTimeout;
+    ac->ev.addRead = redictLibeventAddRead;
+    ac->ev.delRead = redictLibeventDelRead;
+    ac->ev.addWrite = redictLibeventAddWrite;
+    ac->ev.delWrite = redictLibeventDelWrite;
+    ac->ev.cleanup = redictLibeventCleanup;
+    ac->ev.scheduleTimer = redictLibeventSetTimeout;
     ac->ev.data = e;
 
     /* Initialize and install read/write events */
-    e->ev = event_new(base, c->fd, EV_READ | EV_WRITE, redisLibeventHandler, e);
+    e->ev = event_new(base, c->fd, EV_READ | EV_WRITE, redictLibeventHandler, e);
     e->base = base;
-    return REDIS_OK;
+    return REDICT_OK;
 }
 #endif