[Gnash-commit] gnash ./ChangeLog libbase/Makefile.am libbase/c...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/15 21:32:30

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am curl_adapter.cpp 
Added files:
        libbase        : Error.h 

Log message:
        * libbase/: Makefile.am, Error.h, curl_adapter.cpp:
        moved Error class to own file, and in gnash namespace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.323&tr2=1.324&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Error.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/curl_adapter.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.323 gnash/ChangeLog:1.324
--- gnash/ChangeLog:1.323       Mon May 15 12:50:59 2006
+++ gnash/ChangeLog     Mon May 15 21:32:30 2006
@@ -1,5 +1,7 @@
 2006-05-15 Sandro Santilli <address@hidden>
 
+       * libbase/: Makefile.am, Error.h, curl_adapter.cpp:
+       moved Error class to own file, and in gnash namespace.
        * server/: Makefile.am, as_value.cpp, action.cpp:
        moved as_value class implementation from action.cpp
        to as_value.cpp.
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.26 gnash/libbase/Makefile.am:1.27
--- gnash/libbase/Makefile.am:1.26      Mon May 15 03:21:07 2006
+++ gnash/libbase/Makefile.am   Mon May 15 21:32:30 2006
@@ -112,6 +112,7 @@
        container.h             \
        demo.h                  \
        dlmalloc.h              \
+       Error.h                 \
        grid_index.h            \
        image.h                 \
        jpeg.h                  \
Index: gnash/libbase/curl_adapter.cpp
diff -u gnash/libbase/curl_adapter.cpp:1.2 gnash/libbase/curl_adapter.cpp:1.3
--- gnash/libbase/curl_adapter.cpp:1.2  Fri May 12 22:17:29 2006
+++ gnash/libbase/curl_adapter.cpp      Mon May 15 21:32:30 2006
@@ -46,6 +46,7 @@
 #include "curl_adapter.h"
 #include "tu_file.h"
 #include "utility.h"
+#include "Error.h"
 
 //#define GNASH_CURL_VERBOSE 1
 
@@ -80,19 +81,6 @@
 {
 
 
-struct Error: public std::runtime_error
-{
-       Error(const std::string& s)
-               :
-               std::runtime_error(s)
-       {}
-
-       Error()
-               :
-               std::runtime_error("Generic CURL error")
-       {}
-};
-
 /***********************************************************************
  *
  *  CurlStreamFile definition
@@ -213,7 +201,7 @@
                        "writing to cache file: requested %d, wrote %d (%s)",
                        sz, wrote, strerror(errno));
                fprintf(stderr, "%s\n", errmsg);
-               throw Error(errmsg);
+               throw gnash::Error(errmsg);
        }
 
        // reset position for next read
@@ -243,7 +231,7 @@
 
                if ( mcode != CURLM_OK )
                {
-                       throw Error(curl_multi_strerror(mcode));
+                       throw gnash::Error(curl_multi_strerror(mcode));
                }
 
                // we already have that much data
@@ -285,7 +273,7 @@
        /// in the constructor
        _cache = tmpfile();
        if ( ! _cache ) {
-               throw Error("Could not create temporary cache file");
+               throw gnash::Error("Could not create temporary cache file");
        }
        _cachefd = fileno(_cache);
 
@@ -296,7 +284,7 @@
        // for verbose operations
        ccode = curl_easy_setopt(_handle, CURLOPT_VERBOSE, 1);
        if ( ccode != CURLE_OK ) {
-               throw Error(curl_easy_strerror(ccode));
+               throw gnash::Error(curl_easy_strerror(ccode));
        }
 #endif
 
@@ -307,13 +295,13 @@
 */
        ccode = curl_easy_setopt(_handle, CURLOPT_NOSIGNAL, true);
        if ( ccode != CURLE_OK ) {
-               throw Error(curl_easy_strerror(ccode));
+               throw gnash::Error(curl_easy_strerror(ccode));
        }
 
        // set url
        ccode = curl_easy_setopt(_handle, CURLOPT_URL, _url.c_str());
        if ( ccode != CURLE_OK ) {
-               throw Error(curl_easy_strerror(ccode));
+               throw gnash::Error(curl_easy_strerror(ccode));
        }
 
        //curl_easy_setopt(_handle, CURLOPT_NOPROGRESS, false);
@@ -322,19 +310,19 @@
        // set write data and function
        curl_easy_setopt(_handle, CURLOPT_WRITEDATA, this);
        if ( ccode != CURLE_OK ) {
-               throw Error(curl_easy_strerror(ccode));
+               throw gnash::Error(curl_easy_strerror(ccode));
        }
 
        curl_easy_setopt(_handle, CURLOPT_WRITEFUNCTION,
                CurlStreamFile::recv);
        if ( ccode != CURLE_OK ) {
-               throw Error(curl_easy_strerror(ccode));
+               throw gnash::Error(curl_easy_strerror(ccode));
        }
 
        // CURLMcode ret = 
        mcode = curl_multi_add_handle(_mhandle, _handle);
        if ( mcode != CURLM_OK ) {
-               throw Error(curl_multi_strerror(mcode));
+               throw gnash::Error(curl_multi_strerror(mcode));
        }
 
        //fill_cache(32); // pre-cache 32 bytes