Merged revisions 273352 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r273352 | mnicholson | 2010-07-01 09:37:37 -0500 (Thu, 01 Jul 2010) | 2 lines

  Fixed whitespace problems
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273353 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index d17fd1b3d41a9d1c33062bc34c3424711a39e7cf..39296183d1b6c99de214e038f6b95788a60202d1 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -3210,7 +3210,7 @@ static void *session_do(void *data)
        struct mansession s = {.session = NULL, };
        int flags;
        int res;
-       struct protoent *p;
+       struct protoent *p;
 
        if (session == NULL)
                goto done;
@@ -3218,15 +3218,15 @@ static void *session_do(void *data)
        /* here we set TCP_NODELAY on the socket to disable Nagle's algorithm.
         * This is necessary to prevent delays (caused by buffering) as we
         * write to the socket in bits and peices. */
-       p = getprotobyname("tcp");
-       if (p) {
-               int arg = 1;
-               if( setsockopt(ser->fd, p->p_proto, TCP_NODELAY, (char *)&arg, sizeof(arg) ) < 0 ) {
-                       ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY mode: %s\nSome manager actions may be slow to respond.\n", strerror(errno));
-               }
-       } else {
-               ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY, getprotobyname(\"tcp\") failed\nSome manager actions may be slow to respond.\n");
-       }
+       p = getprotobyname("tcp");
+       if (p) {
+               int arg = 1;
+               if( setsockopt(ser->fd, p->p_proto, TCP_NODELAY, (char *)&arg, sizeof(arg) ) < 0 ) {
+                       ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY mode: %s\nSome manager actions may be slow to respond.\n", strerror(errno));
+               }
+       } else {
+               ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY, getprotobyname(\"tcp\") failed\nSome manager actions may be slow to respond.\n");
+       }
 
        session->writetimeout = 100;
        session->waiting_thread = AST_PTHREADT_NULL;