SourceFormat Enforcement

[thirdparty/squid.git] / tools / purge / socket.cc

diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc
index b661b81699cdd6111e2d0de2dc959c07a17d3d11..97cf57f1a2530617778f7bc666e9fbf2b8fcd405 100644 (file)
--- a/tools/purge/socket.cc
+++ b/tools/purge/socket.cc
@@ -1,13 +1,15 @@
+#include "squid.h"
+
 //
-// $Id: socket.cc,v 1.3 1999/01/19 11:00:50 voeckler Exp $
+// $Id$
 //
-// Author:  Jens-S. Vöckler <voeckler@rvs.uni-hannover.de>
+// Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    socket.hh
 //          Sun May  3 1998
 //
 // (c) 1998 Lehrgebiet Rechnernetze und Verteilte Systeme
-//          Universität Hannover, Germany
+//          Universit?t Hannover, Germany
 //
 // Books:   W. Richard Steven, "Advanced Programming in the UNIX Environment",
 //          Addison-Wesley, 1992.
@@ -34,7 +36,6 @@
 // ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 // SOFTWARE.
 //
-// $Log: socket.cc,v $
 // Revision 1.3  1999/01/19 11:00:50  voeckler
 // Linux glibc2 fixes for socket size parameters.
 //
@@ -45,7 +46,7 @@
 // Initial revision
 //
 //
-#if defined(__GNUC__) || defined(__GNUG__)
+#if (defined(__GNUC__) || defined(__GNUG__)) && !defined(__clang__)
 #pragma implementation
 #endif
 
@@ -61,9 +62,6 @@
 
 #include "convert.hh"
 
-static const char* RCS_ID =
-    "$Id: socket.cc,v 1.3 1999/01/19 11:00:50 voeckler Exp $";
-
 int
 setSocketBuffers( int sockfd, int size )
 // purpose: set socket buffers for both directions to the specified size
@@ -96,7 +94,7 @@ getSocketNoDelay( int sockfd )
 //         -1, if an error occurred (e.g. datagram socket)
 {
     int delay = 0;
-    SOCKLEN len = sizeof(delay);
+    socklen_t len = sizeof(delay);
     if ( getsockopt( sockfd, IPPROTO_TCP, TCP_NODELAY,
                      (char*) &delay, &len ) == -1 ) {
         perror( "# getsockopt( TCP_NODELAY ) failed" );
@@ -122,7 +120,6 @@ setSocketNoDelay( int sockfd, bool nodelay )
         return 0;
 }
 
-
 int
 commonCode( int& sockfd, bool nodelay, int sendBufferSize, int recvBufferSize )
 // purpose: common code in server sockets and client sockets