Minor code aesthetic change to use Redis code base style rule of saving vertical...

[redis.git] / deps / hiredis / adapters / ae.h

diff --git a/deps/hiredis/adapters/ae.h b/deps/hiredis/adapters/ae.h
index b8b2228ed9b8e86af32f892193b20a0da35739ae..65235f802aa22e045c311a2a65dee01d288653d9 100644 (file)
--- a/deps/hiredis/adapters/ae.h
+++ b/deps/hiredis/adapters/ae.h
@@ -1,3 +1,5 @@
+#ifndef __HIREDIS_AE_H__
+#define __HIREDIS_AE_H__

 #include <sys/types.h>
 #include <ae.h>
 #include "../hiredis.h"
 #include <sys/types.h>
 #include <ae.h>
 #include "../hiredis.h"


@@ -10,21 +12,21 @@ typedef struct redisAeEvents {
     int reading, writing;
 } redisAeEvents;
 
     int reading, writing;
 } redisAeEvents;
 

-void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {

     ((void)el); ((void)fd); ((void)mask);
 
     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAsyncHandleRead(e->context);
 }
 
     ((void)el); ((void)fd); ((void)mask);
 
     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAsyncHandleRead(e->context);
 }
 

-void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {

     ((void)el); ((void)fd); ((void)mask);
 
     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAsyncHandleWrite(e->context);
 }
 
     ((void)el); ((void)fd); ((void)mask);
 
     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAsyncHandleWrite(e->context);
 }
 

-void redisAeAddRead(void *privdata) {
+static void redisAeAddRead(void *privdata) {

     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (!e->reading) {
     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (!e->reading) {


@@ -33,7 +35,7 @@ void redisAeAddRead(void *privdata) {
     }
 }
 
     }
 }
 

-void redisAeDelRead(void *privdata) {
+static void redisAeDelRead(void *privdata) {

     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (e->reading) {
     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (e->reading) {


@@ -42,7 +44,7 @@ void redisAeDelRead(void *privdata) {
     }
 }
 
     }
 }
 

-void redisAeAddWrite(void *privdata) {
+static void redisAeAddWrite(void *privdata) {

     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (!e->writing) {
     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (!e->writing) {


@@ -51,7 +53,7 @@ void redisAeAddWrite(void *privdata) {
     }
 }
 
     }
 }
 

-void redisAeDelWrite(void *privdata) {
+static void redisAeDelWrite(void *privdata) {

     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (e->writing) {
     redisAeEvents *e = (redisAeEvents*)privdata;
     aeEventLoop *loop = e->loop;
     if (e->writing) {


@@ -60,19 +62,19 @@ void redisAeDelWrite(void *privdata) {
     }
 }
 
     }
 }
 

-void redisAeCleanup(void *privdata) {
+static void redisAeCleanup(void *privdata) {

     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAeDelRead(privdata);
     redisAeDelWrite(privdata);
     free(e);
 }
 
     redisAeEvents *e = (redisAeEvents*)privdata;
     redisAeDelRead(privdata);
     redisAeDelWrite(privdata);
     free(e);
 }
 

-int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
+static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {

     redisContext *c = &(ac->c);
     redisAeEvents *e;
 
     /* Nothing should be attached when something is already attached */
     redisContext *c = &(ac->c);
     redisAeEvents *e;
 
     /* Nothing should be attached when something is already attached */

-    if (ac->_adapter_data != NULL)
+    if (ac->ev.data != NULL)

         return REDIS_ERR;
 
     /* Create container for context and r/w events */
         return REDIS_ERR;
 
     /* Create container for context and r/w events */


@@ -83,13 +85,13 @@ int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
     e->reading = e->writing = 0;
 
     /* Register functions to start/stop listening for events */
     e->reading = e->writing = 0;
 
     /* Register functions to start/stop listening for events */

-    ac->evAddRead = redisAeAddRead;
-    ac->evDelRead = redisAeDelRead;
-    ac->evAddWrite = redisAeAddWrite;
-    ac->evDelWrite = redisAeDelWrite;
-    ac->evCleanup = redisAeCleanup;
-    ac->_adapter_data = e;
+    ac->ev.addRead = redisAeAddRead;
+    ac->ev.delRead = redisAeDelRead;
+    ac->ev.addWrite = redisAeAddWrite;
+    ac->ev.delWrite = redisAeDelWrite;
+    ac->ev.cleanup = redisAeCleanup;
+    ac->ev.data = e;

 
     return REDIS_OK;
 }
 
     return REDIS_OK;
 }

-
+#endif