Remove ^M on line endings.

[irc/rqf/shadowircd.git] / src / listener.c

diff --git a/src/listener.c b/src/listener.c
index 0cf3302a1b8dd6d4a177d5cf90466d719cda71ea..4147bfabe8f0792c77a3b417218e2b13bb597a60 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -147,7 +147,7 @@ show_ports(struct Client *source_p)
                           ntohs(((struct sockaddr_in *)&listener->addr)->sin_port),
 #endif
                           IsOperAdmin(source_p) ? listener->name : me.name,
-                          listener->ref_count, (listener->active) ? "active" : "disabled",\r
+                          listener->ref_count, (listener->active) ? "active" : "disabled",
                           listener->ssl ? " ssl" : "");
        }
 }
@@ -462,8 +462,8 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, voi
        new_client->localClient->F = F;
        add_to_cli_fd_hash(new_client);
        new_client->localClient->listener = listener;
-       new_client->localClient->ssl_ctl = ssl_ctl;\r
-       if(ssl_ctl != NULL || rb_fd_ssl(F))\r
+       new_client->localClient->ssl_ctl = ssl_ctl;
+       if(ssl_ctl != NULL || rb_fd_ssl(F))
                SetSSL(new_client);
 
        ++listener->ref_count;
@@ -487,10 +487,10 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        struct ConfItem *aconf;
        static time_t last_oper_notice = 0;
 
-       if(listener->ssl && (!ssl_ok || !get_ssld_count()))\r
-       {\r
-               rb_close(F);\r
-               return 0;\r
+       if(listener->ssl && (!ssl_ok || !get_ssld_count()))
+       {
+               rb_close(F);
+               return 0;
        }
 
        if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
@@ -543,14 +543,14 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        return 1;
 }
 
-static void\r
-accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)\r
-{\r
-       ssl_ctl_t *ctl;\r
-       rb_fde_t *xF[2];\r
-       rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");\r
-       ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */\r
-       add_connection(listener, xF[0], addr, ctl, 1);\r
+static void
+accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)
+{
+       ssl_ctl_t *ctl;
+       rb_fde_t *xF[2];
+       rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");
+       ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */
+       add_connection(listener, xF[0], addr, ctl, 1);
 }
 
 static void
@@ -569,8 +569,8 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
                rb_close(F);
        }
        
-       if(listener->ssl)\r
-               accept_ssld(F, addr, (struct sockaddr *)&lip, listener);\r
-       else\r
+       if(listener->ssl)
+               accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
+       else
                add_connection(listener, F, addr, NULL, 1);
 }