From d9744a0dfc72d99e9a89493c2658eb7027514b3c Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Thu, 2 Feb 2012 20:46:00 +0100 Subject: [PATCH] [Coverity] Restore std::cout flags and MimeAttr ctor. inits * Restore std::cout flags (CID11245, CID11246) after using hexadecimal and zero-filled flags; * Fix uninit MimeAttribute::fStatus field in one ctor. CID11292. --- src/bin/setmime.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bin/setmime.cpp b/src/bin/setmime.cpp index 8d02749929..c5ad68e6dd 100644 --- a/src/bin/setmime.cpp +++ b/src/bin/setmime.cpp @@ -290,6 +290,7 @@ MimeAttribute::MimeAttribute(BMessage& msg, int32 index) MimeAttribute::MimeAttribute(TUserArgs& args) { SyncWith(args); + fStatus = B_OK; } @@ -367,6 +368,8 @@ MimeAttribute::Dump() char c2 = (char)((type >> 16) & 0xFF); char c3 = (char)((type >> 8) & 0xFF); char c4 = (char)(type & 0xFF); + + ios::fmtflags flags = cout.flags(); cout << " \\" << endl << "\t\t" << kAttrType; if (IsPrintableChar(c1) && IsPrintableChar(c2) && @@ -381,6 +384,8 @@ MimeAttribute::Dump() cout << " \\" << endl << "\t\t" << kAttrViewable << " " << fViewable << " " << kAttrEditable << " " << fEditable << " " << kAttrExtra << " " << fExtra; + + cout.flags(flags); } @@ -699,12 +704,16 @@ MimeType::_DumpIcon(uint8 *iconData, size_t iconSize) int lineLimit = iconSize == B_MINI_ICON * B_MINI_ICON ? B_MINI_ICON : B_LARGE_ICON; + ios::fmtflags flags = cout.flags(); + for (size_t i = 0; i < iconSize; i++) { if (i % lineLimit == 0 && i != iconSize - 1) cout << "\\" << endl; cout << hex << setfill('0') << setw(2) << (uint16) iconData[i]; } + + cout.flags(flags); }