[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1245-g29f3591

[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  29f3591db99bfe54a912d75f733819bc299ee51b (commit)
      from  2691547e2df1debdcb2710a176666c67091acde7 (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=29f3591db99bfe54a912d75f733819bc299ee51b


commit 29f3591db99bfe54a912d75f733819bc299ee51b
Author: Rob Savoye <address@hidden>
Date:   Wed Nov 30 09:39:07 2011 -0700

    Cleanup compilation warnings when using -pedantic

diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index f1048c1..f975bd0 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -244,7 +244,7 @@ Handler::recvMsg(int fd)
          log_error("FD #%d has no protocol handler registered", fd);
          break;
     }
-};
+}
 
 void
 Handler::removeClient(int x)
diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index 6615523..71b98b1 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -191,8 +191,8 @@ HTTPServer::processGetRequest(Handler *hand, int fd, 
cygnal::Buffer *buf)
     if (buf == 0) {
      //        log_debug("Que empty, net connection dropped for fd #%d", 
getFileFd());
        log_debug("Que empty, net connection dropped for fd #%d", fd);
-       cygnal::Buffer buf;
-       return buf;
+//     cygnal::Buffer buf;
+       return _buf;
     }
     
     clearHeader();
diff --git a/cygnal/http_server.h b/cygnal/http_server.h
index ff93e96..65fa371 100644
--- a/cygnal/http_server.h
+++ b/cygnal/http_server.h
@@ -100,6 +100,7 @@ public:
 
     void dump();    
 private:
+    cygnal::Buffer _buf;
     boost::shared_ptr<gnash::DiskStream> _diskstream;
 };
 
diff --git a/cygnal/libnet/diskstream.cpp b/cygnal/libnet/diskstream.cpp
index 20ad1ff..a63ca37 100644
--- a/cygnal/libnet/diskstream.cpp
+++ b/cygnal/libnet/diskstream.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #include <sys/types.h>
+#include <boost/cstdint.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <iostream>
@@ -339,7 +340,7 @@ DiskStream::fullyPopulated()
        return true;
     }
     return false;
-};
+}
 
 /// \brief Close the open disk file, but stay resident in memory.
 void
@@ -660,7 +661,7 @@ DiskStream::open(const string &filespec, int netfd, 
Statistics &statistics)
        _filefd = ::open(_filespec.c_str(), O_RDONLY);
        log_debug (_("Opening file %s (fd #%d), %lld bytes in size."),
                   _filespec, _filefd,
-                (long long int) _filesize);
+                  (boost::int64_t) _filesize);
        _state = OPEN;
        _filetype = determineFileType(filespec);
        loadToMem(0); // load the first page into memory
diff --git a/cygnal/libnet/diskstream.h b/cygnal/libnet/diskstream.h
index 2f4fd9c..a6c95fa 100644
--- a/cygnal/libnet/diskstream.h
+++ b/cygnal/libnet/diskstream.h
@@ -83,7 +83,7 @@ public:
     FILETYPE_XML,
     FILETYPE_FLAC,
     FILETYPE_ENCODED,
-    FILETYPE_PHP,
+    FILETYPE_PHP
   } filetype_e;
 
     DSOEXPORT DiskStream();

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

Summary of changes:
 cygnal/handler.cpp           |    2 +-
 cygnal/http_server.cpp       |    4 ++--
 cygnal/http_server.h         |    1 +
 cygnal/libnet/diskstream.cpp |    5 +++--
 cygnal/libnet/diskstream.h   |    2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash