[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1823-g43f1f85

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  43f1f85878b53b0cce817957a16e3c6044b2b716 (commit)
      from  0df2a4693264f7b5777c629f621f4aa750b41653 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=43f1f85878b53b0cce817957a16e3c6044b2b716


commit 43f1f85878b53b0cce817957a16e3c6044b2b716
Author: Gabriele Giacone <address@hidden>
Date:   Wed Jan 8 01:30:07 2014 +0100

    Restore ostream format.
    
    Coverity scan CID 1149202, 1149203, 1149204, 1149205, 1149206.

diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index b8ae848..fde1cb8 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -257,9 +257,11 @@ HTTPServer::processGetRequest(Handler *hand, int fd, 
cygnal::Buffer *buf)
        struct timespec end;
        clock_gettime (CLOCK_REALTIME, &end);
        double time = (end.tv_sec - start.tv_sec) + ((end.tv_nsec - 
start.tv_nsec)/1e9);
+       ios::fmtflags f(cerr.flags());
        cerr << "File " << _filespec
             << " transferred " << filesize << " bytes in: " << fixed
             << time << " seconds for net fd #" << fd << endl;
+       cerr.flags(f);
 #endif
     }
     
diff --git a/cygnal/rtmp_server.cpp b/cygnal/rtmp_server.cpp
index 88d742d..a6f6f8c 100644
--- a/cygnal/rtmp_server.cpp
+++ b/cygnal/rtmp_server.cpp
@@ -1310,9 +1310,11 @@ RTMPServer::sendFile(int fd, const std::string &filespec)
        struct timespec end;
        clock_gettime (CLOCK_REALTIME, &end);
        double time = (end.tv_sec - start.tv_sec) + ((end.tv_nsec - 
start.tv_nsec)/1e9);
+       ios::fmtflags f(cerr.flags());
        cerr << "File " << _filespec
             << " transferred " << filesize << " bytes in: " << fixed
             << time << " seconds for net fd #" << fd << endl;
+       cerr.flags(f);
 #endif
     }    
 
diff --git a/libcore/as_value.cpp b/libcore/as_value.cpp
index 1a85c7b..4e05087 100644
--- a/libcore/as_value.cpp
+++ b/libcore/as_value.cpp
@@ -1043,7 +1043,10 @@ operator<<(std::ostream& o, const as_value& v)
             return o << "[null]";
         case as_value::BOOLEAN:
         {
-            return o << "[bool:" << std::boolalpha << v.getBool() << "]";
+            ios::fmtflags f(o.flags());
+            o << "[bool:" << std::boolalpha << v.getBool() << "]";
+            o.flags(f);
+            return o;
         }
         case as_value::OBJECT:
         {
diff --git a/libcore/parser/SWFParser.cpp b/libcore/parser/SWFParser.cpp
index f8bba02..7a09a9b 100644
--- a/libcore/parser/SWFParser.cpp
+++ b/libcore/parser/SWFParser.cpp
@@ -152,10 +152,12 @@ dumpTagBytes(SWFStream& in, std::ostream& os)
         }
         
         // Stream once as hex
+        ios::fmtflags f(os.flags());
         os << std::left << std::setw(3 * rowlength) << hexify(buf, got, false);
         
         // and once as ASCII
         os << "| " << hexify(buf, got, true) << std::endl;
+        os.flags(f);
 
         toRead -= got;
     }
diff --git a/libcore/swf/SWF.cpp b/libcore/swf/SWF.cpp
index 6fcd071..81c71c4 100644
--- a/libcore/swf/SWF.cpp
+++ b/libcore/swf/SWF.cpp
@@ -405,7 +405,10 @@ operator<<(std::ostream& os, const abc_action_type& opcode)
         case ABC_ACTION_SWEEP: return os << "SWEEP";
         case ABC_ACTION_CODEGENOP: return os << "CODEGENOP";
         case ABC_ACTION_VERIFYOP: return os << "VERIFYOP";
-        default: return os << "UNKNOWN " << std::hex << +opcode;
+        default:
+            ios::fmtflags f(os.flags());
+            os << "UNKNOWN " << std::hex << +opcode;
+            os.flags(f);
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 cygnal/http_server.cpp       |    2 ++
 cygnal/rtmp_server.cpp       |    2 ++
 libcore/as_value.cpp         |    5 ++++-
 libcore/parser/SWFParser.cpp |    2 ++
 libcore/swf/SWF.cpp          |    5 ++++-
 5 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash