[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2041-g47f771e

[Bastiaan Jacques]

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  47f771e61b0d143c24ac9131310b334a8e851faf (commit)
       via  1d4252e424990c29e35d5cb06b20ade3f4dfd8e2 (commit)
      from  cc4013c8301d29fa32d0b7cc87586fa01dd2fab8 (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=47f771e61b0d143c24ac9131310b334a8e851faf


commit 47f771e61b0d143c24ac9131310b334a8e851faf
Author: Bastiaan Jacques <address@hidden>
Date:   Wed May 21 21:01:22 2014 +0200

    Squash various warnings by removing unused code and not marking functions
    with a C++ signature as extern "C".

diff --git a/cygnal/cgi-bin/echo/echo.cpp b/cygnal/cgi-bin/echo/echo.cpp
index 56b8a85..0b9d871 100644
--- a/cygnal/cgi-bin/echo/echo.cpp
+++ b/cygnal/cgi-bin/echo/echo.cpp
@@ -47,8 +47,6 @@ static bool netdebug = false;
 
 static EchoTest echo;
        
-extern "C" {
-    
     // the standard API
     std::shared_ptr<Handler::cygnal_init_t>
     echo_init_func(std::shared_ptr<gnash::RTMPMsg> &msg)
@@ -102,8 +100,6 @@ extern "C" {
 //         GNASH_REPORT_RETURN;
     }
     
-} // end of extern C
-
 int
 main(int argc, char *argv[])
 {
diff --git a/cygnal/cgi-bin/echo/echo.h b/cygnal/cgi-bin/echo/echo.h
index 8c63b50..48b2f27 100644
--- a/cygnal/cgi-bin/echo/echo.h
+++ b/cygnal/cgi-bin/echo/echo.h
@@ -71,12 +71,10 @@ private:
 };  
 
 // the standard API
-extern "C" {
     
std::shared_ptr<Handler::cygnal_init_t>echo_init_func(std::shared_ptr<gnash::RTMPMsg>
 &msg);
     
     std::shared_ptr<cygnal::Buffer> echo_read_func();
     size_t echo_write_func(std::uint8_t *data, size_t size);
-}
 
 } // end of cygnal namespace
 #endif  // end of __ECHO_H__
diff --git a/cygnal/libamf/lcshm.cpp b/cygnal/libamf/lcshm.cpp
index acd54b8..e241dc3 100644
--- a/cygnal/libamf/lcshm.cpp
+++ b/cygnal/libamf/lcshm.cpp
@@ -53,10 +53,12 @@ using gnash::log_error;
 namespace cygnal
 {
 
+#if 0
 // The maximum 
 // although a bool is one byte, it appears to be a short in AMF,
 // plus the type byte.
 const int AMF_BOOLEAN_SIZE = 3;
+#endif
 
 /// \var LC_HEADER_SIZE
 ///     The header size for a memory segment.
diff --git a/cygnal/libnet/cache.cpp b/cygnal/libnet/cache.cpp
index 83ffd0d..aa4ade4 100644
--- a/cygnal/libnet/cache.cpp
+++ b/cygnal/libnet/cache.cpp
@@ -44,16 +44,14 @@ namespace gnash
 {
 
 Cache::Cache() 
-    : _max_size(0),
 #ifdef USE_STATS_CACHE
-      _pathname_lookups(0),
+    : _pathname_lookups(0),
       _pathname_hits(0),
       _response_lookups(0),
       _response_hits(0),
       _file_lookups(0),
-      _file_hits(0),
+      _file_hits(0)
 #endif
-      _pagesize(0)
 {
 //    GNASH_REPORT_FUNCTION;
     log_error(_("using this constructor is only allowed for testing 
purposes."));
diff --git a/cygnal/libnet/cache.h b/cygnal/libnet/cache.h
index a707500..0d5c36c 100644
--- a/cygnal/libnet/cache.h
+++ b/cygnal/libnet/cache.h
@@ -82,10 +82,6 @@ private:
     ///                The cache of Distream handles to often played files.
     std::map<std::string, std::shared_ptr<DiskStream> > _files;
 
-    /// \var Cache::_max_size
-    ///                The maximum amount of memory the cache is allowed to 
use.
-    size_t _max_size;
-
     /// \brief Cache file statistics variables are defined here.
 #ifdef USE_STATS_CACHE
     struct timespec _last_access;
@@ -96,11 +92,6 @@ private:
     long       _file_lookups;
     long       _file_hits;
 #endif
-    /// \var Cache::_pagesize
-    ///                The memory page size.
-    size_t     _pagesize;    
-
-cygnal::AMF::filetype_e  _filetype; // FIXME: this shouldn't be here still
 };
 
 /// \brief Dump to the specified output stream.
diff --git a/cygnal/libnet/http.cpp b/cygnal/libnet/http.cpp
index 0ed1ea9..e9cc4ca 100644
--- a/cygnal/libnet/http.cpp
+++ b/cygnal/libnet/http.cpp
@@ -69,8 +69,10 @@ namespace gnash
 
 // extern map<int, Handler *> handlers;
 
+#if 0
 // FIXME, this seems too small to me.  --gnu
 static const int readsize = 1024;
+#endif
 
 static Cache& cache = Cache::getDefaultInstance();
 
diff --git a/gui/qt/Qt4GlueOgl.cpp b/gui/qt/Qt4GlueOgl.cpp
index 59823a8..6cf375b 100644
--- a/gui/qt/Qt4GlueOgl.cpp
+++ b/gui/qt/Qt4GlueOgl.cpp
@@ -35,10 +35,7 @@ namespace gnash
 {
 
 Qt4OglGlue::Qt4OglGlue()
-:
-  _width(0),
-  _height(0),
-  _renderer(nullptr)
+: _renderer(nullptr)
 {
 }
 
diff --git a/gui/qt/Qt4GlueOgl.h b/gui/qt/Qt4GlueOgl.h
index 39e145e..3421fe9 100644
--- a/gui/qt/Qt4GlueOgl.h
+++ b/gui/qt/Qt4GlueOgl.h
@@ -47,8 +47,6 @@ class Qt4OglGlue : public Qt4Glue
     void render(const QRect& updateRect);
 
   private:
-    int _width;
-    int _height;
     Renderer* _renderer; // We don't own this pointer.
 };
 
diff --git a/libmedia/gst/VideoInputGst.cpp b/libmedia/gst/VideoInputGst.cpp
index 82a319b..caa0d82 100644
--- a/libmedia/gst/VideoInputGst.cpp
+++ b/libmedia/gst/VideoInputGst.cpp
@@ -1037,7 +1037,7 @@ VideoInputGst::webcamChangeSourceBin()
         
         //check here to make sure the fps value is supported (only valid for
         //non test sources)
-        if (! strcmp(webcam->_webcamDevice->getGstreamerSrc(), "videotestsrc") 
== 0) {
+        if (strcmp(webcam->_webcamDevice->getGstreamerSrc(), "videotestsrc") 
== 0) {
             int newFps = _fps;
             if (checkForSupportedFramerate(webcam, newFps)) {
                 log_debug("checkforsupportedfr returned true");
diff --git a/librender/cairo/Renderer_cairo.cpp 
b/librender/cairo/Renderer_cairo.cpp
index 9253ed2..c27d289 100644
--- a/librender/cairo/Renderer_cairo.cpp
+++ b/librender/cairo/Renderer_cairo.cpp
@@ -338,11 +338,9 @@ get_cairo_pattern(const FillStyle& style, const SWFCxForm& 
cx)
 class CairoPathRunner : public PathParser
 {
 public:
-  CairoPathRunner(Renderer_cairo& renderer,
-                  const std::vector<Path>& paths,
+  CairoPathRunner(const std::vector<Path>& paths,
                   const std::vector<FillStyle>& FillStyles, cairo_t* context)
   : PathParser(paths, FillStyles.size()),
-    _renderer(renderer),
     _cr(context),
     _pattern(nullptr),
     _FillStyles(FillStyles)
@@ -409,7 +407,6 @@ public:
   }
 
 private:
-  Renderer_cairo& _renderer;
   cairo_t* _cr;
   cairo_pattern_t* _pattern;
   const std::vector<FillStyle>& _FillStyles;
@@ -943,7 +940,7 @@ Renderer_cairo::draw_subshape(const PathVec& path_vec, 
const SWFMatrix& mat,
                               const std::vector<FillStyle>& FillStyles,
                               const std::vector<LineStyle>& line_styles)
 { 
-    CairoPathRunner runner(*this, path_vec, FillStyles, _cr);
+    CairoPathRunner runner(path_vec, FillStyles, _cr);
     runner.run(cx, mat);
 
     draw_outlines(path_vec, line_styles, cx, mat);

http://git.savannah.gnu.org/cgit//commit/?id=1d4252e424990c29e35d5cb06b20ade3f4dfd8e2


commit 1d4252e424990c29e35d5cb06b20ade3f4dfd8e2
Author: Bastiaan Jacques <address@hidden>
Date:   Wed May 21 16:17:07 2014 +0200

    Replace a few more instances of zero assigned to pointers with nullptr.

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 443b8e7..33677b3 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -206,7 +206,7 @@ setupFDs(gnash::Player& p, const std::string& fds)
     int hostfd = 0, controlfd = 0;
     hostfd = std::strtol(fds.substr(0, fds.find(":")).c_str(), nullptr, 0);
     std::string csub = fds.substr(fds.find(":")+1, fds.size());
-    controlfd = strtol(csub.c_str(), 0, 0);
+    controlfd = strtol(csub.c_str(), nullptr, 0);
     // gnash::log_debug("Host FD #%d, Control FD #%d\n", hostfd, controlfd);
 
     if (hostfd < 0) {
diff --git a/libbase/extension.cpp b/libbase/extension.cpp
index 31b31d3..693c402 100644
--- a/libbase/extension.cpp
+++ b/libbase/extension.cpp
@@ -126,7 +126,7 @@ Extension::initModule(const std::string& module, as_object 
&where)
     
     SharedLib *sl = _plugins[module];
 
-    if (sl == 0) {
+    if (!sl) {
         sl = _plugins[module] = new SharedLib(_pluginsdir + "/" + module);
         if ( ! sl->openLib() ) return false;
     } 
@@ -155,7 +155,7 @@ Extension::initModuleWithFunc(const std::string& module,
 
     SharedLib *sl = _plugins[module];
 
-    if (sl == 0) {
+    if (!sl) {
         sl = _plugins[module] = new SharedLib(module);
         if ( ! sl->openLib() ) return false;
     } 
diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index 312c19b..38ba3ed 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -160,7 +160,7 @@ RcInitFile::loadFiles()
 #endif
     
     // Check the users home directory
-    const char *home = 0;
+    const char *home = nullptr;
 #if defined (__amigaos4__)
     //on AmigaOS we have a GNASH: assign that point to program dir
     home = "/gnash";
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index cebee7b..3c6f423 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -438,7 +438,7 @@ nsPluginInstance::nsPluginInstance(nsPluginCreateData* data)
     _childpid(0),
     _filefd(-1),
     _name(),
-    _scriptObject(0)
+    _scriptObject(nullptr)
 {
     // gnash::log_debug("%s: %x", __PRETTY_FUNCTION__, (void *)this);
 
@@ -739,7 +739,7 @@ nsPluginInstance::handlePlayerRequests(GIOChannel* iochan, 
GIOCondition cond)
     gchar buffer[buf_size];
 
     do {
-        GError* error = 0;
+        GError* error = nullptr;
         gsize bytes_read = 0;
 
         GIOStatus status = g_io_channel_read_chars(iochan, buffer, buf_size,
@@ -1121,7 +1121,7 @@ nsPluginInstance::setupCookies(const std::string& pageurl)
 
     std::string ncookie;
  
-    char *cookie = 0;
+    char *cookie = nullptr;
     uint32_t length = 0;
 
     NPError rv = NPERR_GENERIC_ERROR;
@@ -1196,7 +1196,7 @@ nsPluginInstance::setupProxy(const std::string& url)
     if (!NPNFuncs.getvalueforurl) return;
 #endif
 
-    char *proxy = 0;
+    char *proxy = nullptr;
     uint32_t length = 0;
 #if NPAPI_VERSION != 190
     NPN_GetValueForURL(_instance, NPNURLVProxy, url.c_str(),
@@ -1404,7 +1404,7 @@ nsPluginInstance::startProc()
     
     std::transform(arg_vec.begin(), arg_vec.end(), std::back_inserter(args),
                    std::mem_fun_ref(&std::string::c_str));
-    args.push_back(0);
+    args.push_back(nullptr);
     
     // Argument List prepared, now fork(), close file descriptors and execv()
     

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

Summary of changes:
 cygnal/cgi-bin/echo/echo.cpp       |    4 ----
 cygnal/cgi-bin/echo/echo.h         |    2 --
 cygnal/libamf/lcshm.cpp            |    2 ++
 cygnal/libnet/cache.cpp            |    6 ++----
 cygnal/libnet/cache.h              |    9 ---------
 cygnal/libnet/http.cpp             |    2 ++
 gui/gnash.cpp                      |    2 +-
 gui/qt/Qt4GlueOgl.cpp              |    5 +----
 gui/qt/Qt4GlueOgl.h                |    2 --
 libbase/extension.cpp              |    4 ++--
 libbase/rc.cpp                     |    2 +-
 libmedia/gst/VideoInputGst.cpp     |    2 +-
 librender/cairo/Renderer_cairo.cpp |    7 ++-----
 plugin/npapi/plugin.cpp            |   10 +++++-----
 14 files changed, 19 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
Gnash