[Gnash-commit] /srv/bzr/gnash/trunk r12172: Remove extra writePlayer overloads.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12172
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-22 21:45:32 +0200
message:
  Remove extra writePlayer overloads.
modified:
  plugin/npapi/pluginScriptObject.cpp
  plugin/npapi/pluginScriptObject.h

=== modified file 'plugin/npapi/pluginScriptObject.cpp'
--- a/plugin/npapi/pluginScriptObject.cpp       2010-04-22 16:22:57 +0000
+++ b/plugin/npapi/pluginScriptObject.cpp       2010-04-22 19:45:32 +0000
@@ -710,12 +710,6 @@
 
 // Write to the standalone player over the control socket
 int
-GnashPluginScriptObject::writePlayer(const std::string &data)
-{
-    return writePlayer(_sockfds[WRITEFD], data);
-}
-
-int
 GnashPluginScriptObject::writePlayer(int fd, const std::string &data)
 {
 //    log_debug(__PRETTY_FUNCTION__);
@@ -723,28 +717,8 @@
 //    log_debug("Writing data: %s", data);
 
     if (fd > 2) {
-        return writePlayer(fd, data.c_str(), data.size());
-    }
-    
-    return 0;
-}
-
-int
-GnashPluginScriptObject::writePlayer(const char *data, size_t length)
-{
-    return writePlayer(_sockfds[WRITEFD], data, length);
-}
-
-int
-GnashPluginScriptObject::writePlayer(int fd, const char *data, size_t length)
-{
-    // log_debug(__PRETTY_FUNCTION__);    
-
-    if (fd > 2) {
-        return ::write(fd, data, length);
-    }
-
-//    log_debug("Writing data: %s", data);    
+        return ::write(fd, data.data(), data.size());
+    }
     
     return 0;
 }

=== modified file 'plugin/npapi/pluginScriptObject.h'
--- a/plugin/npapi/pluginScriptObject.h 2010-04-22 16:22:57 +0000
+++ b/plugin/npapi/pluginScriptObject.h 2010-04-22 19:45:32 +0000
@@ -127,9 +127,6 @@
     int getWriteFD() { return _sockfds[WRITEFD]; };
     
     // Write to the standalone player over the control socket
-    int writePlayer(const char *data, size_t length);
-    int writePlayer(int fd, const char *data, size_t length);
-    int writePlayer(const std::string &data);
     int writePlayer(int fd, const std::string &data);
     
     // Read the standalone player over the control socket