[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1238-ga8010b3

[Rob Savoye]

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 "Gnash".

The branch, master has been updated
       via  a8010b335d37213d3830a9b47da81f6805ee0ceb (commit)
       via  26e4998ce526028667d8869dad41a67a28ea07b8 (commit)
      from  45044b09e2fec37a1192828bbe8c8fb2e3ac76f4 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=a8010b335d37213d3830a9b47da81f6805ee0ceb


commit a8010b335d37213d3830a9b47da81f6805ee0ceb
Author: Rob Savoye <address@hidden>
Date:   Fri Nov 25 21:30:07 2011 -0700

    Buffer is in cygnal namespace now, not amf

diff --git a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
index 01514e4..08e65ed 100644
--- a/cygnal/libnet/sshclient.cpp
+++ b/cygnal/libnet/sshclient.cpp
@@ -103,7 +103,7 @@ SSHClient::setUser()
 
 // Read bytes from the already opened SSH connection
 int
-SSHClient::sshRead(amf::Buffer &buf)
+SSHClient::sshRead(cygnal::Buffer &buf)
 {
     GNASH_REPORT_FUNCTION;
 
@@ -125,7 +125,7 @@ SSHClient::sshRead(boost::uint8_t *buf, size_t size)
 
 // Write bytes to the already opened SSH connection
 int
-SSHClient::sshWrite(amf::Buffer &buf)
+SSHClient::sshWrite(cygnal::Buffer &buf)
 {
     GNASH_REPORT_FUNCTION;
 
@@ -401,7 +401,7 @@ SSHClient::openChannel(ssh_session session)
 }
 
 int 
-SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
+SSHClient::readChannel(ssh_channel channel, cygnal::Buffer &buf)
 {
 //    GNASH_REPORT_FUNCTION;
     int ret = -1;
@@ -416,7 +416,7 @@ SSHClient::readChannel(ssh_channel channel, amf::Buffer 
&buf)
 }
 
 int 
-SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
+SSHClient::writeChannel(ssh_channel channel, cygnal::Buffer &buf)
 {
 //    GNASH_REPORT_FUNCTION;
     int ret = -1;

http://git.savannah.gnu.org/cgit//commit/?id=26e4998ce526028667d8869dad41a67a28ea07b8


commit 26e4998ce526028667d8869dad41a67a28ea07b8
Author: Rob Savoye <address@hidden>
Date:   Fri Nov 25 21:29:21 2011 -0700

    Buffer is in cygnal namespace now, not amf

diff --git a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
index 0aff826..4f22904 100644
--- a/cygnal/libnet/sshclient.h
+++ b/cygnal/libnet/sshclient.h
@@ -56,12 +56,12 @@ public:
     ~SSHClient();
 
     // Read bytes from the already opened SSH connection
-    int sshRead(amf::Buffer &buf);
+    int sshRead(cygnal::Buffer &buf);
     int sshRead(boost::uint8_t *buf, size_t length);
     int sshRead(std::string &buf);
 
     // Write bytes to the already opened SSH connection
-    int sshWrite(amf::Buffer &buf);
+    int sshWrite(cygnal::Buffer &buf);
     int sshWrite(const boost::uint8_t *buf, size_t length);
     int sshWrite(std::string &buf);
 
@@ -104,13 +104,13 @@ public:
     // Accessors
     ssh_channel getChannel() { return _channel; };
     ssh_session getSession() { return _session; };
-    boost::shared_ptr<amf::Buffer> &getBuffer()  { return _buffer; };
+    boost::shared_ptr<cygnal::Buffer> &getBuffer()  { return _buffer; };
 
     // Dump internal data to the screen for debugging
     void dump();
  protected:
-    int readChannel (ssh_channel channel, amf::Buffer &buf);
-    int writeChannel(ssh_channel channel, amf::Buffer &buf);
+    int readChannel (ssh_channel channel, cygnal::Buffer &buf);
+    int writeChannel(ssh_channel channel, cygnal::Buffer &buf);
 
     std::string                _hostname;
     std::string                _user;
@@ -126,7 +126,7 @@ public:
     ssh_session _session;
     ssh_channel        _channel;
 #endif
-    boost::shared_ptr<amf::Buffer> _buffer;
+    boost::shared_ptr<cygnal::Buffer> _buffer;
 };
     
 } // end of gnash namespace
@@ -136,5 +136,5 @@ public:
 
 // local Variables:
 // mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
 // End:

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

Summary of changes:
 cygnal/libnet/sshclient.cpp |    8 ++++----
 cygnal/libnet/sshclient.h   |   14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash