[Gnash-commit] gnash ChangeLog server/asobj/LocalConnection.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/29 14:52:18

Modified files:
        .              : ChangeLog 
        server/asobj   : LocalConnection.cpp 

Log message:
        Remove duplicated implementation of gnash::Listener class methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5516&r2=1.5517
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5516
retrieving revision 1.5517
diff -u -b -r1.5516 -r1.5517
--- ChangeLog   29 Jan 2008 12:31:09 -0000      1.5516
+++ ChangeLog   29 Jan 2008 14:52:17 -0000      1.5517
@@ -1,5 +1,10 @@
 2008-01-29 Sandro Santilli <address@hidden>
 
+       * server/asobj/LocalConnection.cpp: remove duplicated
+         implementation of gnash::Listener class methods.
+
+2008-01-29 Sandro Santilli <address@hidden>
+
        * server/as_value.h: make PROPNAME a noop
        * server/movie_root.{cpp,h}: provide a isLevelTarget
          method to take care of case-insensitively matching

Index: server/asobj/LocalConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/LocalConnection.cpp    25 Jan 2008 18:48:29 -0000      1.20
+++ server/asobj/LocalConnection.cpp    29 Jan 2008 14:52:18 -0000      1.21
@@ -98,79 +98,6 @@
     GNASH_REPORT_FUNCTION;
 }
 
-Listener::Listener()
-    : _baseaddr(0)
-{
-    GNASH_REPORT_FUNCTION;
-}
-
-Listener::Listener(boost::uint8_t *x)
-{
-    GNASH_REPORT_FUNCTION;
-    _baseaddr = x;
-}
-
-Listener::~Listener()
-{
-    GNASH_REPORT_FUNCTION;
-}
-
-bool
-Listener::addListener(std::string &name)
-{
-    GNASH_REPORT_FUNCTION;
-
-    boost::uint8_t *addr = _baseaddr + LC_LISTENERS_START;
-    boost::uint8_t *item = addr;
-    // Walk to the end of the list
-    while (*item != 0) {
-        item += strlen(reinterpret_cast<char *>(item))+1;
-    }
-    // Add ourselves to the list
-    if (memcpy(item, name.c_str(), name.size()) == 0) {
-        return false;
-    }
-    return true;
-}
-
-bool
-Listener::removeListener(std::string &name)
-{
-    GNASH_REPORT_FUNCTION;
-
-    boost::uint8_t *addr = _baseaddr + LC_LISTENERS_START;
-    boost::uint8_t *item = addr;
-    while (*item != 0) {
-        if (name.c_str() == reinterpret_cast<char *>(item)) {
-            int len = strlen(reinterpret_cast<char *>(item)) + 1;
-            while (*item != 0) {
-                memcpy(item, item + len, len);
-                item += len + 1;
-            }
-            return true;
-        }
-        item += strlen(reinterpret_cast<char *>(item)) + 1;
-    }
-    return false;
-}
-
-auto_ptr< vector<string> >
-Listener::listListeners()
-{
-    GNASH_REPORT_FUNCTION;
-
-    boost::uint8_t *addr = _baseaddr + LC_LISTENERS_START;
-
-    auto_ptr< vector<string> > listeners ( new vector<string> );
-    const char *item = reinterpret_cast<char *>(addr);
-    while (*item != 0) {
-        listeners->push_back(item);
-        item += strlen(item) + 1;
-    }    
-
-    return listeners;
-}
-
 /// \brief Closes (disconnects) the LocalConnection object.
 void
 LocalConnection::close()
@@ -205,40 +132,6 @@
         return false; 
     }
     
-#if 0 // { // what are these Listeners ?
-
-    Listener::setBaseAddress(Shm::getAddr());
-        
-    string str1 = "HelloWorld";
-    addListener(str1);
-    str1 = "GutenTag";
-    addListener(str1);
-    str1 = "Aloha";
-    addListener(str1);
-    
-    vector<string>::const_iterator it;
-    auto_ptr< vector<string> > listeners ( listListeners() );
-    if (listeners->size() == 0) {
-        log_msg("Nobody is listening");
-    } else {
-        log_msg("There are %d", listeners->size());
-        for (it=listeners->begin(); it!=listeners->end(); it++) {
-            string str = *it;
-            log_debug("Listeners: %s", str.c_str());
-        }
-    }
-
-    str1 = "HelloWorld";
-    removeListener(str1);
-    listeners = listListeners();  
-    log_msg("There are %d", listeners->size());
-    for (it=listeners->begin(); it != listeners->end(); it++) {
-        string str = *it;
-        log_debug("Listeners: %s", str.c_str());
-    }
-    
-#endif // }
-    
     return true;
 }