[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-36-ga696600

[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  a696600be1a0362983b50bfe89ac9130996c6431 (commit)
      from  ef4da49b38d71a122baf5e3540fb5b5a611f2f37 (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 a696600be1a0362983b50bfe89ac9130996c6431
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Feb 23 22:37:16 2010 +0100

    Filter::getName does not accept parameters now.

diff --git a/myserver/include/filter/filter.h b/myserver/include/filter/filter.h
index faa6858..b920a19 100644
--- a/myserver/include/filter/filter.h
+++ b/myserver/include/filter/filter.h
@@ -42,7 +42,7 @@ public:
   virtual int write (const char* buffer, u_long len, u_long*);
   virtual int flush (u_long*);
   virtual int modifyData ();
-  virtual const char* getName (char*, u_long);
+  virtual const char* getName ();
   void setParent (Stream*);
   Stream* getParent ();
   Filter ();
diff --git a/myserver/include/filter/gzip/gzip.h 
b/myserver/include/filter/gzip/gzip.h
index 1d678fe..1aa66c7 100644
--- a/myserver/include/filter/gzip/gzip.h
+++ b/myserver/include/filter/gzip/gzip.h
@@ -68,7 +68,7 @@ public:
   virtual int write (const char* buffer, u_long len, u_long*);
   virtual int flush (u_long*);
   virtual int modifyData ();
-  virtual const char* getName (char* name, u_long len);
+  virtual const char* getName ();
 private:
   int active;
   GzipData data;
diff --git a/myserver/include/filter/gzip/gzip_decompress.h 
b/myserver/include/filter/gzip/gzip_decompress.h
index 9cfe031..18e53b8 100644
--- a/myserver/include/filter/gzip/gzip_decompress.h
+++ b/myserver/include/filter/gzip/gzip_decompress.h
@@ -67,7 +67,7 @@ public:
   virtual int write (const char* buffer, u_long len, u_long*);
   virtual int flush (u_long*);
   virtual int modifyData ();
-  virtual const char* getName (char* name, u_long len);
+  virtual const char* getName ();
 private:
   int active;
   GzipData data;
diff --git a/myserver/src/filter/filter.cpp b/myserver/src/filter/filter.cpp
index 16713bb..6f63f01 100644
--- a/myserver/src/filter/filter.cpp
+++ b/myserver/src/filter/filter.cpp
@@ -127,15 +127,9 @@ int Filter::modifyData ()
 
 /*!
  * Return a string with the filter name.
- * If an external buffer is provided write the name there too.
- * \param name The buffer where write the filter name.
- * \param len The buffer length.
  */
-const char* Filter::getName (char* name, u_long len)
+const char* Filter::getName ()
 {
   /* No name by default.  */
-  if (name)
-    name[0] = '\0';
-
-  return "\0";
+  return "";
 }
diff --git a/myserver/src/filter/filters_chain.cpp 
b/myserver/src/filter/filters_chain.cpp
index f8ae4be..e657f6d 100644
--- a/myserver/src/filter/filters_chain.cpp
+++ b/myserver/src/filter/filters_chain.cpp
@@ -234,7 +234,7 @@ int FiltersChain::isFilterPresent (const char* name)
   list<Filter*>::iterator i = filters.begin ();
 
   for ( ; i != filters.end (); ++i )
-    if (! strcasecmp ((*i)->getName (0, 0), name))
+    if (! strcasecmp ((*i)->getName (), name))
       return 1;
   return 0;
 }
@@ -340,7 +340,7 @@ void FiltersChain::getName (string& out)
   {
     if (i != filters.end () && (*i)->modifyData ())
     {
-      const char* name = (*i)->getName (0, 0);
+      const char* name = (*i)->getName ();
       if (name)
         out.append (name);
     }
@@ -359,6 +359,6 @@ FiltersChain::getFilters ()
   list<Filter*>::iterator it;
   list<string> filters;
   for (it = this->filters.begin (); it != this->filters.end (); it++)
-    filters.push_back (string ((*it)->getName (0, 0)));
+    filters.push_back (string ((*it)->getName ()));
   return filters;
 }
diff --git a/myserver/src/filter/gzip/gzip.cpp 
b/myserver/src/filter/gzip/gzip.cpp
index da118f9..50b6d21 100644
--- a/myserver/src/filter/gzip/gzip.cpp
+++ b/myserver/src/filter/gzip/gzip.cpp
@@ -363,16 +363,9 @@ Filter* Gzip::factory (const char* name)
 
 /*!
  * Return a string with the filter name.
- * If an external buffer is provided write the name there too.
- * \param name Buffer where write the filter name.
- * \param len Buffer size.
  */
-const char* Gzip::getName (char* name, u_long len)
+const char* Gzip::getName ()
 {
-  /*! No name by default. */
-  if (name)
-    myserver_strlcpy (name, "gzip", len);
-
   return "gzip";
 }
 
diff --git a/myserver/src/filter/gzip/gzip_decompress.cpp 
b/myserver/src/filter/gzip/gzip_decompress.cpp
index 010150a..80d6c3e 100644
--- a/myserver/src/filter/gzip/gzip_decompress.cpp
+++ b/myserver/src/filter/gzip/gzip_decompress.cpp
@@ -318,12 +318,8 @@ Filter* GzipDecompress::factory (const char* name)
  * \param name Buffer where write the filter name.
  * \param len Buffer size.
  */
-const char* GzipDecompress::getName (char* name, u_long len)
+const char* GzipDecompress::getName ()
 {
-  /*! No name by default. */
-  if (name)
-    myserver_strlcpy (name, "gzip", len);
-
   return "gzip";
 }
 
diff --git a/myserver/tests/test_filter_chain.cpp 
b/myserver/tests/test_filter_chain.cpp
index 7ca30a2..adef724 100644
--- a/myserver/tests/test_filter_chain.cpp
+++ b/myserver/tests/test_filter_chain.cpp
@@ -123,23 +123,21 @@ public:
     u_long nbw;
     Filter* filter = Gzip::factory ("GzipFilter");
     MemBuf mb;
-    char name[32];
     MemoryStream ms (&mb);
 
     fc->setStream (&ms);
 
     CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter), 0);
-    CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName (name, 32)), 0);
+    CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName ()), 0);
 
     fc->addFilter (filter, &nbw);
 
     CPPUNIT_ASSERT (fc->isFilterPresent (filter) != 0);
-    CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName (name, 32)) != 0);
+    CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName ()) != 0);
   }
 
   void testRemoveFilter ()
   {
-    char name[32];
     MemBuf mb;
     u_long nbw;
     Filter* filter = Gzip::factory ("GzipFilter");
@@ -150,12 +148,12 @@ public:
     fc->addFilter (filter, &nbw);
 
     CPPUNIT_ASSERT (fc->isFilterPresent (filter) != 0);
-    CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName (name, 32)) != 0);
+    CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName ()) != 0);
 
     fc->removeFilter (filter);
 
     CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter), 0);
-    CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName (name, 32)), 0);
+    CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName ()), 0);
   }
 
 };

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

Summary of changes:
 myserver/include/filter/filter.h               |    2 +-
 myserver/include/filter/gzip/gzip.h            |    2 +-
 myserver/include/filter/gzip/gzip_decompress.h |    2 +-
 myserver/src/filter/filter.cpp                 |   10 ++--------
 myserver/src/filter/filters_chain.cpp          |    6 +++---
 myserver/src/filter/gzip/gzip.cpp              |    9 +--------
 myserver/src/filter/gzip/gzip_decompress.cpp   |    6 +-----
 myserver/tests/test_filter_chain.cpp           |   10 ++++------
 8 files changed, 14 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
GNU MyServer