'Dummy' warning fixes (might be used uninitialized).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2739,7 +2739,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// and now the interesting part: the timezone
|
// and now the interesting part: the timezone
|
||||||
int offset;
|
int offset wxDUMMY_INITIALIZE(0);
|
||||||
if ( *p == _T('-') || *p == _T('+') )
|
if ( *p == _T('-') || *p == _T('+') )
|
||||||
{
|
{
|
||||||
// the explicit offset given: it has the form of hhmm
|
// the explicit offset given: it has the form of hhmm
|
||||||
|
@@ -1809,10 +1809,8 @@ int wxString::Printf(const wxChar *pszFormat, ...)
|
|||||||
int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
|
int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
|
||||||
{
|
{
|
||||||
int size = 1024;
|
int size = 1024;
|
||||||
int len;
|
|
||||||
|
|
||||||
for ( ;; )
|
for ( ;; )
|
||||||
{
|
|
||||||
{
|
{
|
||||||
wxStringBuffer tmp(*this, size + 1);
|
wxStringBuffer tmp(*this, size + 1);
|
||||||
wxChar* buf = tmp;
|
wxChar* buf = tmp;
|
||||||
@@ -1827,14 +1825,13 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
|
|||||||
// only a copy
|
// only a copy
|
||||||
va_list argptrcopy;
|
va_list argptrcopy;
|
||||||
wxVaCopy(argptrcopy, argptr);
|
wxVaCopy(argptrcopy, argptr);
|
||||||
len = wxVsnprintf(buf, size, pszFormat, argptrcopy);
|
int len = wxVsnprintf(buf, size, pszFormat, argptrcopy);
|
||||||
va_end(argptrcopy);
|
va_end(argptrcopy);
|
||||||
|
|
||||||
// some implementations of vsnprintf() don't NUL terminate
|
// some implementations of vsnprintf() don't NUL terminate
|
||||||
// the string if there is not enough space for it so
|
// the string if there is not enough space for it so
|
||||||
// always do it manually
|
// always do it manually
|
||||||
buf[size] = _T('\0');
|
buf[size] = _T('\0');
|
||||||
}
|
|
||||||
|
|
||||||
// vsnprintf() may return either -1 (traditional Unix behaviour) or the
|
// vsnprintf() may return either -1 (traditional Unix behaviour) or the
|
||||||
// total number of characters which would have been written if the
|
// total number of characters which would have been written if the
|
||||||
|
@@ -668,7 +668,6 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
|||||||
wxChar key[64];
|
wxChar key[64];
|
||||||
const char *clr_def;
|
const char *clr_def;
|
||||||
bool hasMask;
|
bool hasMask;
|
||||||
wxXPMColourMapData clr_data;
|
|
||||||
wxXPMColourMap clr_tbl;
|
wxXPMColourMap clr_tbl;
|
||||||
wxXPMColourMap::iterator it;
|
wxXPMColourMap::iterator it;
|
||||||
wxString maskKey;
|
wxString maskKey;
|
||||||
@@ -702,6 +701,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
|||||||
*/
|
*/
|
||||||
for (i = 0; i < colors_cnt; i++)
|
for (i = 0; i < colors_cnt; i++)
|
||||||
{
|
{
|
||||||
|
wxXPMColourMapData clr_data = {255,0,255};
|
||||||
|
|
||||||
for (i_key = 0; i_key < chars_per_pixel; i_key++)
|
for (i_key = 0; i_key < chars_per_pixel; i_key++)
|
||||||
key[i_key] = (wxChar)xpm_data[1 + i][i_key];
|
key[i_key] = (wxChar)xpm_data[1 + i][i_key];
|
||||||
clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
|
clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
|
||||||
@@ -710,17 +711,15 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
|||||||
{
|
{
|
||||||
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
||||||
xpm_data[1+i]);
|
xpm_data[1+i]);
|
||||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool isNone;
|
bool isNone = false;
|
||||||
if ( !GetRGBFromName(clr_def, &isNone,
|
if ( !GetRGBFromName(clr_def, &isNone,
|
||||||
&clr_data.R, &clr_data.G, &clr_data.B) )
|
&clr_data.R, &clr_data.G, &clr_data.B) )
|
||||||
{
|
{
|
||||||
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
||||||
xpm_data[1+i]);
|
xpm_data[1+i]);
|
||||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -729,7 +728,6 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
|||||||
img.SetMask(true);
|
img.SetMask(true);
|
||||||
img.SetMaskColour(255, 0, 255);
|
img.SetMaskColour(255, 0, 255);
|
||||||
hasMask = true;
|
hasMask = true;
|
||||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
|
||||||
maskKey = key;
|
maskKey = key;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1765,7 +1765,7 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
|
|||||||
default : nextpos = pos; break; /* just to fool compiler, never happens */
|
default : nextpos = pos; break; /* just to fool compiler, never happens */
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t toskip;
|
size_t toskip wxDUMMY_INITIALIZE(0);
|
||||||
if ( nextpos >= pos )
|
if ( nextpos >= pos )
|
||||||
{
|
{
|
||||||
toskip = (size_t)(nextpos - pos);
|
toskip = (size_t)(nextpos - pos);
|
||||||
|
@@ -1157,7 +1157,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
|
|||||||
|
|
||||||
// open file
|
// open file
|
||||||
// ---------
|
// ---------
|
||||||
bool bOk;
|
bool bOk wxDUMMY_INITIALIZE(false);
|
||||||
if ( wxFile::Exists(filename) ) {
|
if ( wxFile::Exists(filename) ) {
|
||||||
bool bAppend = false;
|
bool bAppend = false;
|
||||||
wxString strMsg;
|
wxString strMsg;
|
||||||
|
Reference in New Issue
Block a user