[Gnash-commit] gnash ChangeLog cygnal/cygnal.cpp cygnal/http.c...

[John Gilmore]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     John Gilmore <jgilmore> 08/02/29 22:20:08

Modified files:
        .              : ChangeLog 
        cygnal         : cygnal.cpp http.cpp http.h 

Log message:
        * cygnal/http.cpp, cygnal/cygnal.cpp, cygnal/http.h:  Lint.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5762&r2=1.5763
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5762
retrieving revision 1.5763
diff -u -b -r1.5762 -r1.5763
--- ChangeLog   29 Feb 2008 10:55:53 -0000      1.5762
+++ ChangeLog   29 Feb 2008 22:20:07 -0000      1.5763
@@ -1,3 +1,7 @@
+2008-02-29  John Gilmore  <address@hidden>
+
+       * cygnal/http.cpp, cygnal/cygnal.cpp, cygnal/http.h:  Lint.
+
 2008-02-29 Sandro Santilli <address@hidden>
 
        * gui/klash.moc.in: added to repository.

Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- cygnal/cygnal.cpp   22 Feb 2008 11:24:37 -0000      1.22
+++ cygnal/cygnal.cpp   29 Feb 2008 22:20:08 -0000      1.23
@@ -76,11 +76,11 @@
 static void cntrlc_handler(int sig);
 
 //static void start_thread();
-static void rtmp_thread(struct thread_params *conndata);
+//static void rtmp_thread(struct thread_params *conndata);
 static void http_thread(struct thread_params *conndata);
-static void ssl_thread(struct thread_params *conndata);
+//static void ssl_thread(struct thread_params *conndata);
 static void stream_thread(struct thread_params *sendfile);
-static void dispatch_thread(struct thread_params *params);
+//static void dispatch_thread(struct thread_params *params);
 
 LogFile& dbglogfile = LogFile::getDefaultInstance();
 CRcInitFile& crcfile = CRcInitFile::getDefaultInstance();
@@ -228,8 +228,6 @@
     string url, filespec, parameters;
     string::size_type pos;
     int port = RTMPT + port_offset;
-    int filesize;
-    struct stat filestats;
 
     www.toggleDebug(true);
     

Index: cygnal/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- cygnal/http.cpp     19 Feb 2008 19:20:48 -0000      1.16
+++ cygnal/http.cpp     29 Feb 2008 22:20:08 -0000      1.17
@@ -46,7 +46,7 @@
 static const int readsize = 1024;
 
 HTTP::HTTP() 
-    : _port(80), _filesize(0), _keepalive(false)
+    : _filesize(0), _port(80), _keepalive(false)
 {
 //    GNASH_REPORT_FUNCTION;
 //    struct status_codes *status = new struct status_codes;
@@ -71,6 +71,7 @@
     _te.clear();
     _accept.clear();
     _filesize = 0;
+    return true;
 }
 
 HTTP &
@@ -132,6 +133,7 @@
     GNASH_REPORT_FUNCTION;
 
     formatHeader(_filesize, type);
+    return true;
 }
 
 
@@ -149,6 +151,7 @@
     this->formatContentType();
     // All HTTP messages are followed by a blank line.
     this->terminateHeader();
+    return true;
 }
 
 bool
@@ -176,6 +179,7 @@
     formatContentLength(_filesize);
     formatConnection("close");
     formatContentType(HTTP::HTML);
+    return true;
 }
 
 bool
@@ -204,7 +208,7 @@
     _header << " "  << d.year();
     _header << " "  << now.time_of_day();
     _header << " GMT" << endl;
-
+    return true;
 }
 
 bool
@@ -212,6 +216,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Server: Cygnal (GNU/Linux)" << endl;
+    return true;
 }
 
 bool
@@ -219,6 +224,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Server: " << data << endl;
+    return true;
 }
 
 bool
@@ -226,6 +232,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Method: " << data << endl;
+    return true;
 }
 
 bool
@@ -233,6 +240,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Referer: " << refer << endl;
+    return true;
 }
 
 bool
@@ -240,6 +248,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Connection: " << options << endl;
+    return true;
 }
 
 bool
@@ -270,6 +279,7 @@
       default:
          _header << "Content-Type: text/html; charset=UTF-8" << endl;
     }
+    return true;
 }
 
 bool
@@ -277,6 +287,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     _header << "Content-Length: " << _filesize << endl;
+    return true;
 }
 
 bool
@@ -284,6 +295,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     _header << "Content-Length: " << filesize << endl;
+    return true;
 }
 
 bool
@@ -291,6 +303,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     _header << "Host: " << host << endl;
+    return true;
 }
 
 bool
@@ -298,6 +311,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     _header << "User-Agent: " << agent << endl;
+    return true;
 }
 
 bool
@@ -307,6 +321,7 @@
 
     // For some browsers this appears to also be Content-Language
     _header << "Accept-Language: " << lang << endl;
+    return true;
 }
 
 bool
@@ -315,6 +330,7 @@
     GNASH_REPORT_FUNCTION;
     // For some browsers this appears to also be Content-Charset
     _header << "Accept-Charset: " << set << endl;
+    return true;
 }
 
 bool
@@ -322,6 +338,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "Accept-Encoding: " << code << endl;
+    return true;
 }
 
 bool
@@ -329,6 +346,7 @@
 {
     GNASH_REPORT_FUNCTION;
     _header << "TE: " << te << endl;
+    return true;
 }
 
 bool
@@ -373,7 +391,7 @@
 
     _header << "Connection: Keep-Alive, TE" << endl;
     _header << "TE: deflate, gzip, chunked, identity, trailers" << endl;
-    
+    return true;
 }
 // bool
 // HTTP::sendGetReply(Network &net)

Index: cygnal/http.h
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- cygnal/http.h       21 Jan 2008 20:56:06 -0000      1.12
+++ cygnal/http.h       29 Feb 2008 22:20:08 -0000      1.13
@@ -138,6 +138,7 @@
     std::string extractAgent(const char *data);
 
     // These methods add data to the fields in the HTTP header.
+    // These return true if OK, false if error.
     bool clearHeader();
     bool formatHeader(int filesize, const short type);
     bool formatHeader(const short type);