[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-263-g810e614

[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  810e6145fe5888c11e76853f833badbc42c8042e (commit)
       via  efa4a8d51afd9e841c141f7c0892d8f2508b7434 (commit)
      from  fc763153ffea70459d61ce10fa093c78efdb05fe (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 810e6145fe5888c11e76853f833badbc42c8042e
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Jun 21 15:41:31 2010 +0200

    Fix warnings reported by GCC 4.5.

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h 
b/myserver/include/conf/vhost/xml_vhost_handler.h
index 9fcd225..f2c6344 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -32,17 +32,16 @@ public:
   XmlVhostHandler (ListenThreads* lt, LogManager* lm);
   ~XmlVhostHandler ();
   int getHostsNumber ();
-  Vhost* getVHost (int n);
+  Vhost* getVHost (u_long n);
   void clean ();
-  int removeVHost (int n);
-  int switchVhosts (int n1, int n2);
+  int removeVHost (u_long n);
   vector<Vhost*>* getVHostList ();
 
   /*! Get a pointer to a vhost.  */
-  virtual Vhost* getVHost (const char*, const char*, u_short);
+  virtual Vhost* getVHost (const char *, const char *, u_short);
 
   /*! Add an element to the vhost list.  */
-  int addVHost (Vhost*);
+  int addVHost (Vhost *);
 
   /*! Load the virtual hosts list from a xml configuration file.  */
   virtual int load (const char *);
diff --git a/myserver/src/base/files_cache/cached_file_factory.cpp 
b/myserver/src/base/files_cache/cached_file_factory.cpp
index c473ac7..3695bcb 100644
--- a/myserver/src/base/files_cache/cached_file_factory.cpp
+++ b/myserver/src/base/files_cache/cached_file_factory.cpp
@@ -140,10 +140,9 @@ File* CachedFileFactory::open (const char* filename, int 
flags)
   CachedFileFactoryRecord *record;
   CachedFileBuffer *buffer;
   CachedFile* cachedFile;
-  u_long ticks;
+  u_long ticks = getTicks ();
 
   mutex.lock ();
-
   try
     {
       record = buffers.get (filename);
@@ -243,14 +242,13 @@ void CachedFileFactory::nullReferences (CachedFileBuffer* 
cfb)
   float averageUsage;
   float bufferAverageUsage;
   float spaceUsage;
-  u_long ticks;
+  u_long ticks = getTicks ();
   mutex.lock ();
 
   try
     {
-      ticks = getTicks ();
       record = buffers.get (cfb->getFilename ());
-      if (!record)
+      if (! record)
         {
           mutex.unlock ();
           return;
@@ -259,7 +257,7 @@ void CachedFileFactory::nullReferences (CachedFileBuffer* 
cfb)
       spaceUsage = (float)usedSize / size;
       averageUsage = (float)used * 1000.0f / (ticks - created);
       bufferAverageUsage = (float)record->used * 1000.0f /
-        (getTicks () - record->created);
+        (ticks - record->created);
 
       if (((spaceUsage > 0.65f) && (bufferAverageUsage < averageUsage)
            && ((ticks - record->created) > 10000))
diff --git a/myserver/src/base/process/fork_server.cpp 
b/myserver/src/base/process/fork_server.cpp
index 37a439a..88a9b78 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -108,7 +108,7 @@ int ForkServer::readString (Socket *sock, char **out)
   *out = new char[len + 1];
   (*out)[len] = '\0';
 
-  if (len && (sock->read (*out, len, &nbr) || nbr < len))
+  if (len && (sock->read (*out, len, &nbr) || (int) nbr < len))
     {
       delete [] *out;
       return -1;
diff --git a/myserver/src/conf/main/xml_main_configuration.cpp 
b/myserver/src/conf/main/xml_main_configuration.cpp
index 771e34d..98f21bb 100644
--- a/myserver/src/conf/main/xml_main_configuration.cpp
+++ b/myserver/src/conf/main/xml_main_configuration.cpp
@@ -49,7 +49,6 @@ const char *XmlMainConfiguration::getValue (const char* field)
   for (; lcur; lcur = lcur->next)
     if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *) "DEFINE"))
       {
-        NodeTree<string> *node = new NodeTree<string> ();
         const char *name = NULL;
         const char *value = NULL;
 
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp 
b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index 0092389..949571f 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -27,7 +27,7 @@
 #include <include/conf/xml_conf.h>
 
 
-static VhostManagerHandler *builder (ListenThreads* lt, LogManager* lm)
+static VhostManagerHandler *builder (ListenThreads *lt, LogManager *lm)
 {
   return new XmlVhostHandler (lt, lm);
 }
@@ -37,7 +37,7 @@ static VhostManagerHandler *builder (ListenThreads* lt, 
LogManager* lm)
 
   \param manager Where register the builder.
  */
-void XmlVhostHandler::registerBuilder (VhostManager& manager)
+void XmlVhostHandler::registerBuilder (VhostManager &manager)
 {
   string xml ("xml");
   manager.registerBuilder (xml, builder);
@@ -47,7 +47,7 @@ void XmlVhostHandler::registerBuilder (VhostManager& manager)
   XmlVhostHandler add function.
   \param vh The virtual host to add.
  */
-int XmlVhostHandler::addVHost (Vhost* vh)
+int XmlVhostHandler::addVHost (Vhost *vh)
 {
   vector<Vhost*>::iterator it;
 
@@ -84,7 +84,7 @@ int XmlVhostHandler::addVHost (Vhost* vh)
 /*!
   \see VhostManager#getVHost
  */
-Vhost* XmlVhostHandler::getVHost (const char* host, const char* ip, u_short 
port)
+Vhost* XmlVhostHandler::getVHost (const char *host, const char *ip, u_short 
port)
 {
   vector<Vhost*>::iterator it;
   /*
@@ -121,7 +121,7 @@ Vhost* XmlVhostHandler::getVHost (const char* host, const 
char* ip, u_short port
   \param lt A ListenThreads object to use to create new threads.
   \param lm The log manager to use.
  */
-XmlVhostHandler::XmlVhostHandler (ListenThreads* lt, LogManager* lm)
+XmlVhostHandler::XmlVhostHandler (ListenThreads *lt, LogManager *lm)
 {
   listenThreads = lt;
   logManager = lm;
@@ -533,7 +533,7 @@ int XmlVhostHandler::load (const char *filename)
 /*!
   \see VhostManager#getVHost
  */
-Vhost* XmlVhostHandler::getVHost (int n)
+Vhost* XmlVhostHandler::getVHost (u_long n)
 {
   if (n > hosts.size ())
     return NULL;
@@ -546,7 +546,7 @@ Vhost* XmlVhostHandler::getVHost (int n)
   First position is zero.
   \param n The virtual host identifier in the list.
  */
-int XmlVhostHandler::removeVHost (int n)
+int XmlVhostHandler::removeVHost (u_long n)
 {
   vector<Vhost*>::iterator it = hosts.erase (hosts.begin () + n - 1);
   delete *it;
diff --git a/myserver/src/filter/gzip/gzip_decompress.cpp 
b/myserver/src/filter/gzip/gzip_decompress.cpp
index d83a8d5..f5d3ac6 100644
--- a/myserver/src/filter/gzip/gzip_decompress.cpp
+++ b/myserver/src/filter/gzip/gzip_decompress.cpp
@@ -216,12 +216,11 @@ u_long GzipDecompress::getHeader (char *buffer, u_long 
buffersize)
 int GzipDecompress::read (char* buffer, u_long len, u_long *nbr)
 {
   char *tmp_buff;
-  int ret;
   u_long nbr_parent;
-  if (!parent)
+  if (! parent)
     return -1;
 
-  if (!active)
+  if (! active)
     return parent->read (buffer, len, nbr);
 
   tmp_buff = new char[len/2];
@@ -236,7 +235,6 @@ int GzipDecompress::read (char* buffer, u_long len, u_long 
*nbr)
       throw;
     }
 
-
   delete [] tmp_buff;
   return 0;
 }
diff --git a/myserver/src/http_handler/cgi/cgi.cpp 
b/myserver/src/http_handler/cgi/cgi.cpp
index bb19bc9..d94a15e 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -442,7 +442,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe 
&stdOutFile, FiltersChain &chai
           return 1;
         }
 
-      for (int i = std::max (0, (int) (headerOffset - nBytesRead - 10));
+      for (u_long i = std::max (0UL, (headerOffset - nBytesRead - 10));
            i < headerOffset; i++)
         {
           char *buff = td->auxiliaryBuffer->getBuffer ();
diff --git a/myserver/src/http_handler/http_file/http_file.cpp 
b/myserver/src/http_handler/http_file/http_file.cpp
index 18ddd9e..202ffaf 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -199,7 +199,6 @@ int HttpFile::send (HttpThreadContext* td, const char 
*filenamePath,
     With this routine we send a file through the HTTP protocol.
     Open the file and save its handle.
    */
-  int ret;
   u_long filesize = 0;
   File *file = NULL;
   u_long bytesToSend;
@@ -219,16 +218,16 @@ int HttpFile::send (HttpThreadContext* td, const char 
*filenamePath,
   try
     {
 
-      if (!td->request.cmd.compare ("PUT"))
+      if (! td->request.cmd.compare ("PUT"))
         return putFile (td, td->filenamePath);
 
-      if (!td->request.cmd.compare ("DELETE"))
+      if (! td->request.cmd.compare ("DELETE"))
         return deleteFile (td, td->filenamePath);
 
-      if (!(td->permissions & MYSERVER_PERMISSION_READ))
+      if (! (td->permissions & MYSERVER_PERMISSION_READ))
         return td->http->sendAuth ();
 
-      if (!FilesUtility::nodeExists (filenamePath))
+      if (! FilesUtility::nodeExists (filenamePath))
         return td->http->raiseHTTPError (404);
 
       lastMT = FilesUtility::getLastModTime (td->filenamePath.c_str ());
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp 
b/myserver/src/http_handler/mscgi/mscgi.cpp
index e65ea0c..c1831f4 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -57,7 +57,6 @@ int MsCgi::send (HttpThreadContext* td, const char* exec, 
const char* cmdLine,
   u_long nbw;
   DynamicLibrary hinstLib;
   CGIMAIN ProcMain = 0;
-  int ret = 0;
 
 #if !(WIN32 | HAVE_DL)
   return td->http->raiseHTTPError (501);
diff --git a/myserver/src/protocol/control/control_protocol.cpp 
b/myserver/src/protocol/control/control_protocol.cpp
index ede75b3..9f2e1b3 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -235,7 +235,8 @@ int ControlProtocol::controlConnection (ConnectionPtr a, 
char *request,
         Returning 0 from the controlConnection we will remove the connection
         from the active connections list.
        */
-      if (header.parse_header (request, nbtr, &realHeaderLength) != CONTROL_OK)
+      ret = header.parse_header (request, nbtr, &realHeaderLength);
+      if (ret != CONTROL_OK)
         {
           /* parse_header returns -1 on an incomplete header.  */
           if (ret == -1)
diff --git a/myserver/tests/test_exceptions.cpp 
b/myserver/tests/test_exceptions.cpp
index 1a983d4..bd7cdff 100644
--- a/myserver/tests/test_exceptions.cpp
+++ b/myserver/tests/test_exceptions.cpp
@@ -87,7 +87,7 @@ public:
     bool success = false;
     try
       {
-        char *p = checked::getcwd (buf, 1);
+        checked::getcwd (buf, 1);
         CPPUNIT_FAIL ("The exception in testWrongCwd wasn't thrown or caught");
       }
     catch (...)
diff --git a/myserver/tests/test_plugins_manager.cpp 
b/myserver/tests/test_plugins_manager.cpp
index 62eb8ee..16f5591 100644
--- a/myserver/tests/test_plugins_manager.cpp
+++ b/myserver/tests/test_plugins_manager.cpp
@@ -102,7 +102,7 @@ protected:
 
   virtual Plugin* preLoadPlugin (string &file, Server* server, bool global)
   {
-
+    return NULL;
   }
 };
 
@@ -116,6 +116,7 @@ private:
                         string &file, PluginInfo* pinfo)
   {
 
+    return 0;
   }
 
 public:
diff --git a/myserver/tests/test_socket.cpp b/myserver/tests/test_socket.cpp
index 3c53739..cd5040b 100644
--- a/myserver/tests/test_socket.cpp
+++ b/myserver/tests/test_socket.cpp
@@ -150,9 +150,7 @@ public:
 
   void testGetLocalIPsList ()
   {
-    int err = 0;
     string out;
-
     try
       {
         obj->socket (AF_INET, SOCK_STREAM, 0);
@@ -215,4 +213,5 @@ static DEFINE_THREAD (testRecvClient, pParam)
   catch (...)
     {
     }
+  return 0;
 }
diff --git a/myserver/tests/test_socket_stream_creator.cpp 
b/myserver/tests/test_socket_stream_creator.cpp
index 6a92453..e618209 100644
--- a/myserver/tests/test_socket_stream_creator.cpp
+++ b/myserver/tests/test_socket_stream_creator.cpp
@@ -51,6 +51,7 @@ public:
     try
       {
         LogStream* ls = ssc->create (ff, LOCALHOST_ADDRESS ":0", filters, 0);
+        CPPUNIT_ASSERT (ls);
       }
     catch (...)
       {
diff --git a/myserver/tests/test_unix_socket.cpp 
b/myserver/tests/test_unix_socket.cpp
index 769fd05..c73195b 100644
--- a/myserver/tests/test_unix_socket.cpp
+++ b/myserver/tests/test_unix_socket.cpp
@@ -144,7 +144,6 @@ public:
   {
 # ifndef WIN32
     const char *msg = "hello world";
-    ThreadID tid;
     Pipe pipe;
     u_long nbw;
     char buffer[64];



commit efa4a8d51afd9e841c141f7c0892d8f2508b7434
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Jun 21 15:06:26 2010 +0200

    Remove unused static function.

diff --git a/myserver/src/base/base64/mime_utils.cpp 
b/myserver/src/base/base64/mime_utils.cpp
index dca7b8f..4717434 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -40,35 +40,6 @@ static char* myserver_strupr (char * s)
   return s;
 }
 
-#define strupos(x, y) (strustr (x, y) != NULL ? strustr (x, y) - x : -1)
-
-static char* strustr (char *source, char *s)
-{
-  char *csource = new char[strlen (source) + 1];
-  if (csource == 0)
-    return 0;
-  char *cs = new char[strlen (s) + 1];
-  if (cs == 0)
-  {
-    delete [] csource;
-    return 0;
-  }
-  strncpy (csource, source, (strlen (source) + 2));
-  strncpy (cs, s, (strlen (s) + 2));
-  myserver_strupr (csource);
-  myserver_strupr (cs);
-  char *result = strstr (csource, cs);
-  if (result != NULL)
-  {
-    int pos =static_cast<int>(result - csource);
-    result = source;
-    result += pos;
-  }
-  delete [] csource;
-  delete [] cs;
-  return result;
-}
-
 const char base64chars[] = 
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 #define SKIP '\202'
 #define NOSKIP 'A'

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

Summary of changes:
 myserver/include/conf/vhost/xml_vhost_handler.h    |    9 +++---
 myserver/src/base/base64/mime_utils.cpp            |   29 --------------------
 .../src/base/files_cache/cached_file_factory.cpp   |   10 +++----
 myserver/src/base/process/fork_server.cpp          |    2 +-
 myserver/src/conf/main/xml_main_configuration.cpp  |    1 -
 myserver/src/conf/vhost/xml_vhost_handler.cpp      |   14 +++++-----
 myserver/src/filter/gzip/gzip_decompress.cpp       |    6 +---
 myserver/src/http_handler/cgi/cgi.cpp              |    2 +-
 myserver/src/http_handler/http_file/http_file.cpp  |    9 +++---
 myserver/src/http_handler/mscgi/mscgi.cpp          |    1 -
 myserver/src/protocol/control/control_protocol.cpp |    3 +-
 myserver/tests/test_exceptions.cpp                 |    2 +-
 myserver/tests/test_plugins_manager.cpp            |    3 +-
 myserver/tests/test_socket.cpp                     |    3 +-
 myserver/tests/test_socket_stream_creator.cpp      |    1 +
 myserver/tests/test_unix_socket.cpp                |    1 -
 16 files changed, 30 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
GNU MyServer