[Gnash-commit] gnash ChangeLog libnet/http.cpp libnet/http.h l...

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/29 03:13:13

Modified files:
        .              : ChangeLog 
        libnet         : http.cpp http.h statistics.h 

Log message:
        Disambiguate symbols with prefixes as GCC 3.x doesn't have
        strongly typed enums.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6068&r2=1.6069
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/http.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/http.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/statistics.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6068
retrieving revision 1.6069
diff -u -b -r1.6068 -r1.6069
--- ChangeLog   29 Mar 2008 02:46:58 -0000      1.6068
+++ ChangeLog   29 Mar 2008 03:13:12 -0000      1.6069
@@ -1,3 +1,9 @@
+2008-03-28  Dossy Shiobara <address@hidden>
+
+       * libnet/http.cpp, libnet/http.h, libnet/statistics.h:
+         Disambiguate symbols with prefixes as GCC 3.x doesn't have
+         strongly typed enums.
+
 2008-03-29 Markus Gothe <address@hidden>
 
        * libbase/getclocktime.hpp: Workaround for systems lacking

Index: libnet/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/http.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/http.cpp     28 Mar 2008 21:30:25 -0000      1.2
+++ libnet/http.cpp     29 Mar 2008 03:13:12 -0000      1.3
@@ -40,6 +40,7 @@
 #include "log.h"
 #include "network.h"
 #include "handler.h"
+#include "utility.h"
 
 using namespace gnash;
 using namespace std;
@@ -212,7 +213,7 @@
     _filesize = _body.str().size();
     formatContentLength(_filesize);
     formatConnection("close");
-    formatContentType(HTTP::HTML);
+    formatContentType(HTTP::FILETYPE_HTML);
     return true;
 }
 
@@ -305,21 +306,21 @@
 //    GNASH_REPORT_FUNCTION;
     
     switch (filetype) {
-      case HTML:
+      case FILETYPE_HTML:
          _header << "Content-Type: text/html" << "\r\n";
 //       _header << "Content-Type: text/html; charset=UTF-8" << "\r\n";
          break;
-      case SWF:
+      case FILETYPE_SWF:
          _header << "Content-Type: application/x-shockwave-flash" << "\r\n";
 //       _header << "Content-Type: application/futuresplash" << "\r\n";
          break;
-      case VIDEO:
+      case FILETYPE_VIDEO:
          _header << "Content-Type: video/flv" << "\r\n";
          break;
-      case MP3:
+      case FILETYPE_MP3:
          _header << "Content-Type: audio/mpeg" << "\r\n";
          break;
-      case FCS:
+      case FILETYPE_FCS:
          _header << "Content-Type: application/x-fcs" << "\r\n";
          break;
       default:
@@ -472,7 +473,7 @@
     _header << "HTTP/1.1 200 OK" << "\r\n";
     formatDate();
     formatServer();
-    formatContentType(HTTP::FCS);
+    formatContentType(HTTP::FILETYPE_FCS);
     // All HTTP messages are followed by a blank line.
     terminateHeader();
     return true;
@@ -657,35 +658,35 @@
     // Extract the command
     start = body.find("GET", 0);
     if (start != string::npos) {
-        cmd = HTTP::GET;
+        cmd = HTTP::HTTP_GET;
     }
     start = body.find("POST", 0);
     if (start != string::npos) {
-        cmd = HTTP::POST;
+        cmd = HTTP::HTTP_POST;
     }
     start = body.find("HEAD", 0);
     if (start != string::npos) {
-        cmd = HTTP::HEAD;
+        cmd = HTTP::HTTP_HEAD;
     }
     start = body.find("CONNECT", 0);
     if (start != string::npos) {
-        cmd = HTTP::CONNECT;
+        cmd = HTTP::HTTP_CONNECT;
     }
     start = body.find("TRACE", 0);
     if (start != string::npos) {
-        cmd = HTTP::TRACE;
+        cmd = HTTP::HTTP_TRACE;
     }
     start = body.find("OPTIONS", 0);
     if (start != string::npos) {
-        cmd = HTTP::OPTIONS;
+        cmd = HTTP::HTTP_OPTIONS;
     }
     start = body.find("PUT", 0);
     if (start != string::npos) {
-        cmd = HTTP::PUT;
+        cmd = HTTP::HTTP_PUT;
     }
     start = body.find("DELETE", 0);
     if (start != string::npos) {
-        cmd = HTTP::DELETE;
+        cmd = HTTP::HTTP_DELETE;
     }
 
     _command = cmd;
@@ -1110,25 +1111,25 @@
                if (pos != string::npos) {
                    string suffix = filespec.substr(pos, filespec.size());
                    if (suffix == "html") {
-                       _filetype = HTML;
+                       _filetype = FILETYPE_HTML;
                        log_debug("HTML content found");
                    }
                    if (suffix == "swf") {
-                       _filetype = SWF;
+                       _filetype = FILETYPE_SWF;
                        log_debug("SWF content found");
                    }
                    if (suffix == "flv") {
-                       _filetype = VIDEO;
+                       _filetype = FILETYPE_VIDEO;
                        log_debug("FLV content found");
                    }
                    if (suffix == "mp3") {
-                       _filetype = AUDIO;
+                       _filetype = FILETYPE_AUDIO;
                        log_debug("MP3 content found");
                    }
                }
            }
        } else {
-           _filetype = HTTP::ERROR;
+           _filetype = HTTP::FILETYPE_ERROR;
        } // end of stat()
     } // end of try_waiting
 
@@ -1237,7 +1238,7 @@
        parameters = url.substr(pos + 1, url.size());
        // Get the file size for the HTTP header
        
-       if (www.getFileStats(filespec) == HTTP::ERROR) {
+       if (www.getFileStats(filespec) == HTTP::FILETYPE_ERROR) {
            www.formatErrorResponse(HTTP::NOT_FOUND);
        }
        www.sendGetReply(HTTP::LIFE_IS_GOOD);

Index: libnet/http.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/http.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/http.h       28 Mar 2008 21:30:26 -0000      1.2
+++ libnet/http.h       29 Mar 2008 03:13:12 -0000      1.3
@@ -88,14 +88,14 @@
        CLOSEPIPE = 1235
     } http_status_e;
     typedef enum {
-        OPTIONS,
-        GET,
-        HEAD,
-        POST,
-        PUT,
-        DELETE,
-        TRACE,
-        CONNECT
+        HTTP_OPTIONS,
+        HTTP_GET,
+        HTTP_HEAD,
+        HTTP_POST,
+        HTTP_PUT,
+        HTTP_DELETE,
+        HTTP_TRACE,
+        HTTP_CONNECT
     } http_method_e;
     typedef enum {
        OPEN,
@@ -108,15 +108,15 @@
         const char *msg;
     };
     typedef enum {
-       ERROR = -1,
-       NONE = 0,
-       HTML,
-       SWF,
-       VIDEO,
-       AUDIO,
-       MP3,
-       FCS,
-       OSCP
+       FILETYPE_ERROR = -1,
+       FILETYPE_NONE = 0,
+       FILETYPE_HTML,
+       FILETYPE_SWF,
+       FILETYPE_VIDEO,
+       FILETYPE_AUDIO,
+       FILETYPE_MP3,
+       FILETYPE_FCS,
+       FILETYPE_OSCP
     } filetype_e;
     HTTP();
     HTTP(Handler *hand);

Index: libnet/statistics.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/statistics.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/statistics.h 28 Mar 2008 21:30:27 -0000      1.2
+++ libnet/statistics.h 29 Mar 2008 03:13:12 -0000      1.3
@@ -44,12 +44,12 @@
         IE
     } browser_e;
     typedef enum {
-        NO_OSTYPE,
-        LINUX,
-        BSDS,
-        DARWIN,
-        WIN32,
-        SOLARIS
+        OSTYPE_NONE,
+        OSTYPE_LINUX,
+        OSTYPE_BSD,
+        OSTYPE_DARWIN,
+        OSTYPE_WIN32,
+        OSTYPE_SOLARIS
     } ostype_e;
 
     // Add a sample