[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-632-gb787ed5

[Sandro Santilli]

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  b787ed547dc1de96be8c3b7227ac1fa0754cd601 (commit)
      from  af836334e912d587e38bdd8ca0ae3a3f38cb56df (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=b787ed547dc1de96be8c3b7227ac1fa0754cd601


commit b787ed547dc1de96be8c3b7227ac1fa0754cd601
Author: Sandro Santilli <address@hidden>
Date:   Fri Aug 12 20:38:33 2011 +0200

    Reduce SharedLib constructors to 1, destructors to 0

diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index 0d882ca..f1048c1 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -299,7 +299,7 @@ Handler::initModule(const std::string& str)
     
     // Update the list of loaded plugins so we only load them once.
     if (_plugins[module] == 0) {
-        sl = new SharedLib(module, "CYGNAL_PLUGINS");
+        sl = new SharedLib(module);
        lt_dlsetsearchpath(_pluginsdir.c_str());
         sl->openLib();
         _plugins[module] = sl;
diff --git a/libbase/extension.cpp b/libbase/extension.cpp
index fb6456c..bcc00ae 100644
--- a/libbase/extension.cpp
+++ b/libbase/extension.cpp
@@ -128,7 +128,7 @@ Extension::initModule(const std::string& module, as_object 
&where)
     log_security(_("Initializing module: \"%s\" from %s"), symbol, 
_pluginsdir);
     
     if (_plugins[module] == 0) {
-        sl = new SharedLib(_pluginsdir + "/" + module, "GNASH_PLUGINS");
+        sl = new SharedLib(_pluginsdir + "/" + module);
         sl->openLib();
         _plugins[module] = sl;
     } else {
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index fc93759..e19869e 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -60,11 +60,6 @@ namespace gnash {
 SharedLib::SharedLib(const std::string& filespec)
 {
     _filespec = filespec;
-}
-
-SharedLib::SharedLib(const std::string& filespec, const std::string& envvar)
-{
-    _filespec = filespec;
     scoped_lock lock(_libMutex);
     
     // Initialize libtool's dynamic library loader
@@ -78,10 +73,6 @@ SharedLib::SharedLib(const std::string& filespec, const 
std::string& envvar)
 #endif    
 }
 
-SharedLib::~SharedLib()
-{
-}
-
 bool
 SharedLib::closeLib()
 {
diff --git a/libbase/sharedlib.h b/libbase/sharedlib.h
index 73cd26b..ac1ae84 100644
--- a/libbase/sharedlib.h
+++ b/libbase/sharedlib.h
@@ -55,9 +55,7 @@ public:
     typedef bool entrypoint (void *obj);
     typedef void initentry(as_object &obj);
     
-    SharedLib(const std::string& filespec);
-    DSOEXPORT SharedLib(const std::string& filespec, const std::string& 
envvar);
-    ~SharedLib();
+    DSOEXPORT SharedLib(const std::string& filespec);
 
     DSOEXPORT bool openLib();
     bool openLib(const std::string &filespec);

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

Summary of changes:
 cygnal/handler.cpp    |    2 +-
 libbase/extension.cpp |    2 +-
 libbase/sharedlib.cpp |    9 ---------
 libbase/sharedlib.h   |    4 +---
 4 files changed, 3 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash