[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-18-gb9d7ce9

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  b9d7ce9539074a40afd6b77b26cfee98c00929a4 (commit)
      from  c99bc2a16814c5399e0ec55f426e2f2036519204 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit b9d7ce9539074a40afd6b77b26cfee98c00929a4
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jan 21 13:48:34 2010 +0100

    Leave an empty space between the cast type and the object to convert.

diff --git a/myserver/src/protocol/http/http_data_read.cpp 
b/myserver/src/protocol/http/http_data_read.cpp
index 963263f..bb71f47 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -161,7 +161,7 @@ int HttpDataRead::readChunkedPostData (const char* inBuffer,
                                        timeout))
        return -1;
 
-    dataToRead = (u_long)hexToInt (buffer);
+    dataToRead = (u_long) hexToInt (buffer);
 
     /*! The last chunk length is 0.  */
     if (dataToRead == 0)
diff --git a/myserver/src/protocol/http/http_headers.cpp 
b/myserver/src/protocol/http/http_headers.cpp
index 0d8b15a..844c3d2 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -158,14 +158,14 @@ u_long HttpHeaders::buildHTTPRequestHeader (char * str,
                                MAX - (long)(pos - str));
       pos += myserver_strlcpy (pos, " ", MAX - (long)(pos - str));
 
-      if (request->rangeByteBegin != (u_long)-1)
+      if (request->rangeByteBegin != (u_long) -1)
         {
           sprintf (buffer, "%lu", request->rangeByteBegin);
           pos += myserver_strlcpy (pos, buffer, MAX - (long)(pos - str));
         }
 
       pos += myserver_strlcpy (pos, "-", MAX - (long)(pos - str));
-      if (request->rangeByteEnd != (u_long)-1)
+      if (request->rangeByteEnd != (u_long) -1)
         {
           sprintf (buffer, "%lu", request->rangeByteEnd);
           pos += myserver_strlcpy (pos, buffer, MAX - (long)(pos - str));
@@ -599,7 +599,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char 
*input,
       token += tokenOff + 2;
       tokenOff = getCharInString (token, ":", maxTotchars);
     }
-  while (((u_long)(token - input) < maxTotchars) && token[0] != '\r');
+  while (((u_long) (token - input) < maxTotchars) && token[0] != '\r');
 
   *nHeaderChars = maxTotchars;
   return 200;
@@ -673,13 +673,13 @@ int HttpHeaders::readReqRangeLine (HttpRequestHeader 
*request,
   if (rangeByteBegin[0] == 0)
     request->rangeByteBegin=0;
   else
-    request->rangeByteBegin = (u_long)atol (rangeByteBegin);
+    request->rangeByteBegin = (u_long) atol (rangeByteBegin);
 
   if (rangeByteEnd[0] == '\r')
     request->rangeByteEnd = 0;
   else
     {
-      request->rangeByteEnd = (u_long)atol (rangeByteEnd);
+      request->rangeByteEnd = (u_long) atol (rangeByteEnd);
       if (request->rangeByteEnd < request->rangeByteBegin)
         return 400;
     }
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index db0acdb..e87cd65 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -872,7 +872,7 @@ int Server::initialize ()
 
   data = getData ("server.connection_timeout");
   if (data)
-    connectionTimeout = MYSERVER_SEC ((u_long)atol (data));
+    connectionTimeout = MYSERVER_SEC ((u_long) atol (data));
 
   data = getData ("server.static_threads");
   if (data)
@@ -899,16 +899,16 @@ int Server::initialize ()
   /* Get the default throttling rate to use on connections.  */
   data = getData ("connection.throttling");
   if (data)
-    throttlingRate = (u_long)atoi (data);
+    throttlingRate = (u_long) atoi (data);
 
   data = getData ("server.max_log_size");
   if (data)
-    maxLogFileSize=(u_long)atol (data);
+    maxLogFileSize=(u_long) atol (data);
 
   data = getData ("server.max_files_cache");
   if (data)
     {
-      u_long maxSize = (u_long)atol (data);
+      u_long maxSize = (u_long) atol (data);
       cachedFiles.initialize (maxSize);
     }
   else
@@ -927,14 +927,14 @@ int Server::initialize ()
   data = getData ("server.max_file_cache");
   if (data)
     {
-      u_long maxSize = (u_long)atol (data);
+      u_long maxSize = (u_long) atol (data);
       cachedFiles.setMaxSize (maxSize);
     }
 
   data = getData ("server.min_file_cache");
   if (data)
     {
-      u_long minSize = (u_long)atol (data);
+      u_long minSize = (u_long) atol (data);
       cachedFiles.setMinSize (minSize);
     }
 
@@ -1607,7 +1607,7 @@ int Server::addThread (bool staticThread)
 
   newThread->setStatic (staticThread);
 
-  newThread->id = (u_long)(++currentThreadID);
+  newThread->id = (u_long) (++currentThreadID);
 
   ret = newThread->run ();
 
diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index 40f689b..6f82483 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -70,5 +70,5 @@ test_suite_LDADD = ../src/libmyserver.a  ../lib/libgnu.a 
$(CPPUNIT_LDFLAGS) \
 
 install:
 
-check:
+check-am:
        ./test_suite$(EXEEXT)
diff --git a/myserver/tests/test_mem_stream.cpp 
b/myserver/tests/test_mem_stream.cpp
index 01686ff..c51400f 100644
--- a/myserver/tests/test_mem_stream.cpp
+++ b/myserver/tests/test_mem_stream.cpp
@@ -69,7 +69,7 @@ public:
   {
     u_long size = addSomeData (stream);
 
-    CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
+    CPPUNIT_ASSERT_EQUAL (size, (u_long) stream->availableToRead ());
   }
 
   void testRead ()
@@ -79,11 +79,11 @@ public:
 
     char buffer[20];
 
-    CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
+    CPPUNIT_ASSERT_EQUAL (size, (u_long) stream->availableToRead ());
 
     stream->read (buffer, 20, &nbr);
 
-    CPPUNIT_ASSERT_EQUAL (size - 20u, (u_long)stream->availableToRead ());
+    CPPUNIT_ASSERT_EQUAL (size - 20u, (u_long) stream->availableToRead ());
   }
 
 
@@ -94,12 +94,12 @@ public:
 
     char buffer[20];
 
-    CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
+    CPPUNIT_ASSERT_EQUAL (size, (u_long) stream->availableToRead ());
 
     stream->read (buffer, 20, &nbr);
     stream->refresh ();
 
-    CPPUNIT_ASSERT_EQUAL ((u_long)stream->availableToRead (), 0ul);
+    CPPUNIT_ASSERT_EQUAL ((u_long) stream->availableToRead (), 0ul);
   }
 
 
@@ -111,7 +111,7 @@ public:
 
     CPPUNIT_ASSERT_EQUAL (ret, 0);
 
-    CPPUNIT_ASSERT_EQUAL ((u_long)stream->availableToRead (), 12ul);
+    CPPUNIT_ASSERT_EQUAL ((u_long) stream->availableToRead (), 12ul);
   }
 
   void testFlush ()

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/protocol/http/http_data_read.cpp |    2 +-
 myserver/src/protocol/http/http_headers.cpp   |   10 +++++-----
 myserver/src/server/server.cpp                |   14 +++++++-------
 myserver/tests/Makefile.am                    |    2 +-
 myserver/tests/test_mem_stream.cpp            |   12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU MyServer