Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around "possibly uninitialized variable" warning in wxFileName.

Browse Source 
Initialize multiplier to its default value in GetHumanReadableSize() to avoid
a "warning: 'multiplier' may be used uninitialized in this function" from g++.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-04-07 12:43:29 +00:00
parent a07526187a
commit 7f19ef40eb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/filename.cpp
View File

@@ -2656,17 +2656,18 @@ wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
// depending on the convention used the multiplier may be either 1000 or // depending on the convention used the multiplier may be either 1000 or
// 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB") // 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB")
double multiplier; double multiplier = 1024.;
wxString biInfix; wxString biInfix;
switch ( conv ) switch ( conv )
{ {
case wxSIZE_CONV_TRADITIONAL:
// nothing to do, this corresponds to the default values of both
// the multiplier and infix string
break;
case wxSIZE_CONV_IEC: case wxSIZE_CONV_IEC:
biInfix = "i"; biInfix = "i";
// fall through
case wxSIZE_CONV_TRADITIONAL:
multiplier = 1024.;
break; break;
case wxSIZE_CONV_SI: case wxSIZE_CONV_SI: