Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 6b39829f9285f736507e952c66ad463df21faef4..37dcb9e46aeda46caacafc57067d201e2c986262 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -581,7 +581,7 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                if (errno != EAGAIN) {
                        StopClientWatchers(IO, 1);
                        EV_syslog(LOG_DEBUG,
-                                 "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+                                 "IO_send_callback(): Socket Invalid! [%d] [%s] [%d]\n",
                                  errno, strerror(errno), IO->SendBuf.fd);
                        StrBufPrintf(IO->ErrMsg,
                                     "Socket Invalid! [%s]",
@@ -814,7 +814,7 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                        // FD is gone. kick it. 
                        StopClientWatchers(IO, 1);
                        EV_syslog(LOG_DEBUG,
-                                 "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+                                 "IO_recv_callback(): Socket Invalid! [%d] [%s] [%d]\n",
                                  errno, strerror(errno), IO->SendBuf.fd);
                        StrBufPrintf(IO->ErrMsg,
                                     "Socket Invalid! [%s]",
@@ -1039,7 +1039,7 @@ void InitIOStruct(AsyncIO *IO,
        IO->Data          = Data;
 
        IO->CitContext    = CloneContext(CC);
-       IO->CitContext->session_specific_data = (char*) Data;
+       IO->CitContext->session_specific_data = Data;
        IO->CitContext->IO = IO;
 
        IO->NextState     = NextState;
@@ -1077,7 +1077,7 @@ int InitcURLIOStruct(AsyncIO *IO,
        IO->Data          = Data;
 
        IO->CitContext    = CloneContext(CC);
-       IO->CitContext->session_specific_data = (char*) Data;
+       IO->CitContext->session_specific_data = Data;
        IO->CitContext->IO = IO;
 
        IO->SendDone      = SendDone;