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

[Sandro Santilli]

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

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

Log message:
        * libbase/: GnashException.h, Error.h, curl_adapter.cpp,
        URL.cpp: renamed gnash::Error to gnash::GnashException
        ( we already had an Error class, modeling an ActionScript
        object )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.325&tr2=1.326&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/GnashException.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/URL.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/curl_adapter.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.325 gnash/ChangeLog:1.326
--- gnash/ChangeLog:1.325       Mon May 15 21:44:02 2006
+++ gnash/ChangeLog     Mon May 15 22:24:24 2006
@@ -1,5 +1,9 @@
 2006-05-15 Sandro Santilli <address@hidden>
 
+       * libbase/: GnashException.h, Error.h, curl_adapter.cpp,
+       URL.cpp: renamed gnash::Error to gnash::GnashException
+       ( we already had an Error class, modeling an ActionScript
+       object )
        * libbase/URL.cpp: throw gnash::Error on error.
        * libbase/: Makefile.am, Error.h, curl_adapter.cpp:
        moved Error class to own file, and in gnash namespace.
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.27 gnash/libbase/Makefile.am:1.28
--- gnash/libbase/Makefile.am:1.27      Mon May 15 21:32:30 2006
+++ gnash/libbase/Makefile.am   Mon May 15 22:24:24 2006
@@ -112,7 +112,7 @@
        container.h             \
        demo.h                  \
        dlmalloc.h              \
-       Error.h                 \
+       GnashException.h        \
        grid_index.h            \
        image.h                 \
        jpeg.h                  \
Index: gnash/libbase/URL.cpp
diff -u gnash/libbase/URL.cpp:1.9 gnash/libbase/URL.cpp:1.10
--- gnash/libbase/URL.cpp:1.9   Mon May 15 21:44:02 2006
+++ gnash/libbase/URL.cpp       Mon May 15 22:24:24 2006
@@ -50,7 +50,7 @@
 #include <sstream>
 #include <algorithm>
 #include <errno.h>
-#include <Error.h>
+#include <GnashException.h>
 
 // these are for stat(2)
 #include <sys/types.h>
@@ -79,7 +79,7 @@
                if ( pos == in.size() )
                {
                        std::cerr << "protocol-only url!" << std::endl;
-                       throw gnash::Error("protocol-only url");
+                       throw gnash::GnashException("protocol-only url");
                }
 
                // Find host 
@@ -127,7 +127,7 @@
                {
                        stringstream err;
                        err << "getcwd failed: " << strerror(errno);
-                       throw gnash::Error(err.str());
+                       throw gnash::GnashException(err.str());
                }
                char* ptr = buf+strlen(buf);
                *ptr = '/';
Index: gnash/libbase/curl_adapter.cpp
diff -u gnash/libbase/curl_adapter.cpp:1.3 gnash/libbase/curl_adapter.cpp:1.4
--- gnash/libbase/curl_adapter.cpp:1.3  Mon May 15 21:32:30 2006
+++ gnash/libbase/curl_adapter.cpp      Mon May 15 22:24:24 2006
@@ -46,7 +46,7 @@
 #include "curl_adapter.h"
 #include "tu_file.h"
 #include "utility.h"
-#include "Error.h"
+#include "GnashException.h"
 
 //#define GNASH_CURL_VERBOSE 1
 
@@ -201,7 +201,7 @@
                        "writing to cache file: requested %d, wrote %d (%s)",
                        sz, wrote, strerror(errno));
                fprintf(stderr, "%s\n", errmsg);
-               throw gnash::Error(errmsg);
+               throw gnash::GnashException(errmsg);
        }
 
        // reset position for next read
@@ -231,7 +231,7 @@
 
                if ( mcode != CURLM_OK )
                {
-                       throw gnash::Error(curl_multi_strerror(mcode));
+                       throw gnash::GnashException(curl_multi_strerror(mcode));
                }
 
                // we already have that much data
@@ -273,7 +273,7 @@
        /// in the constructor
        _cache = tmpfile();
        if ( ! _cache ) {
-               throw gnash::Error("Could not create temporary cache file");
+               throw gnash::GnashException("Could not create temporary cache 
file");
        }
        _cachefd = fileno(_cache);
 
@@ -284,7 +284,7 @@
        // for verbose operations
        ccode = curl_easy_setopt(_handle, CURLOPT_VERBOSE, 1);
        if ( ccode != CURLE_OK ) {
-               throw gnash::Error(curl_easy_strerror(ccode));
+               throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 #endif
 
@@ -295,13 +295,13 @@
 */
        ccode = curl_easy_setopt(_handle, CURLOPT_NOSIGNAL, true);
        if ( ccode != CURLE_OK ) {
-               throw gnash::Error(curl_easy_strerror(ccode));
+               throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
        // set url
        ccode = curl_easy_setopt(_handle, CURLOPT_URL, _url.c_str());
        if ( ccode != CURLE_OK ) {
-               throw gnash::Error(curl_easy_strerror(ccode));
+               throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
        //curl_easy_setopt(_handle, CURLOPT_NOPROGRESS, false);
@@ -310,19 +310,19 @@
        // set write data and function
        curl_easy_setopt(_handle, CURLOPT_WRITEDATA, this);
        if ( ccode != CURLE_OK ) {
-               throw gnash::Error(curl_easy_strerror(ccode));
+               throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
        curl_easy_setopt(_handle, CURLOPT_WRITEFUNCTION,
                CurlStreamFile::recv);
        if ( ccode != CURLE_OK ) {
-               throw gnash::Error(curl_easy_strerror(ccode));
+               throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
        // CURLMcode ret = 
        mcode = curl_multi_add_handle(_mhandle, _handle);
        if ( mcode != CURLM_OK ) {
-               throw gnash::Error(curl_multi_strerror(mcode));
+               throw gnash::GnashException(curl_multi_strerror(mcode));
        }
 
        //fill_cache(32); // pre-cache 32 bytes