[Gnash-commit] gnash/libbase URL.cpp URL.h

[Sandro Santilli]

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

Modified files:
        libbase        : URL.cpp URL.h 

Log message:
        Added missing includes, fixed small assertion bug (needs more testing,
        unit test fails)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/URL.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/URL.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/libbase/URL.cpp
diff -u gnash/libbase/URL.cpp:1.1 gnash/libbase/URL.cpp:1.2
--- gnash/libbase/URL.cpp:1.1   Sat May 13 21:33:09 2006
+++ gnash/libbase/URL.cpp       Sat May 13 22:36:06 2006
@@ -62,7 +62,7 @@
        size_t len = strlen(in);
        const char* last = in+len;
 
-       assert(last==NULL);
+       assert(*last==0);
 
        // Find protocol
        char* ptr = strstr(in, "://");
@@ -133,7 +133,7 @@
                // get dirname from basurl path
                _path = baseurl._path.substr(
                        0,
-                       baseurl._path.find_last_of("/"));
+                       baseurl._path.find_last_of("/")+1);
                _path += relative_url;
        }
 
@@ -141,21 +141,24 @@
 
 /*public*/
 std::string
-URL::toString() const
+URL::str() const
 {
-       std::string ret = _proto + "://";
+       std::string ret = _proto;
 
        if ( _host != "" ) {
-               ret += _host;
+               ret += "://" + _host;
+       } else {
+               // it's a local filename
+               ret += ":/" + _host;
        }
        ret += _path;
 
        return ret;
 }
 
-std::ostream& operator<< (const URL& u, std::ostream& o)
+std::ostream& operator<< (std::ostream& o, const URL& u)
 {
-       return o << u.toString();
+       return o << u.str();
 }
 
 } // end of gnash namespace
Index: gnash/libbase/URL.h
diff -u gnash/libbase/URL.h:1.1 gnash/libbase/URL.h:1.2
--- gnash/libbase/URL.h:1.1     Sat May 13 21:33:09 2006
+++ gnash/libbase/URL.h Sat May 13 22:36:06 2006
@@ -43,6 +43,9 @@
 #include "config.h"
 #endif
 
+#include <iosfwd>
+#include <string>
+
 namespace gnash {
 
 /// Uniform Resource Locator
@@ -54,7 +57,7 @@
 
 public:
 
-       friend std::ostream& operator<< (const URL& u, std::ostream& o);
+       friend std::ostream& operator<< (std::ostream&o, const URL& u);
 
        /// Construct an URL from the given absolute url string.
        //
@@ -87,7 +90,7 @@
        /// Return the full absolute URL as a string.
        //
        /// TODO: make output operator and operator+ for strings
-       std::string toString() const;
+       std::string str() const;
 
 private:
 
@@ -101,7 +104,7 @@
 
 };
 
-std::ostream& operator<< (const URL& u, std::ostream& o);
+std::ostream& operator<< (std::ostream&o, const URL& u);
 
 } // end of gnash namespace