AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7586 fix some initializer warnings

Browse Source 
X-SVN-Rev: 28158
This commit is contained in:
Markus Scherer 2010-06-08 21:45:43 +00:00
parent 32b40e3ee2
commit bff71243ce
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
icu4c/source/common/ucol_swp.cpp
View File

@ -156,7 +156,7 @@ ucol_swapBinary(const UDataSwapper *ds,
const UCATableHeader *inHeader;
UCATableHeader *outHeader;
UCATableHeader header={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, 0 };
UCATableHeader header;
uint32_t count;
@ -181,6 +181,7 @@ ucol_swapBinary(const UDataSwapper *ds,
* sizeof(UCATableHeader)==42*4 in ICU 2.8
* check the length against the header size before reading the size field
*/
uprv_memset(&header, 0, sizeof(header));
if(length<0) {
header.size=udata_readInt32(ds, inHeader->size);
} else if((length<(42*4) || length<(header.size=udata_readInt32(ds, inHeader->size)))) {

40
icu4c/source/test/cintltst/cstrtest.c
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1998-2009, International Business Machines Corporation
* Copyright (C) 1998-2010, International Business Machines Corporation
* and others. All Rights Reserved.
**********************************************************************
*
@ -302,25 +302,25 @@ TestCompareInvEbcdicAsAscii() {
static const char *const invStrings[][2]={
/* invariant-character strings in ascending ASCII order */
/* EBCDIC native */
"", "",
"\x6c", "%",
"\xf0", "0",
"\xf0\xf0", "00",
"\xf0\xf0\x81", "00a",
"\x7e", "=",
"\xc1", "A",
"\xc1\xf0\xf0", "A00",
"\xc1\xf0\xf0", "A00",
"\xc1\xc1", "AA",
"\xc1\xc1\xf0", "AA0",
"\x6d", "_",
"\x81", "a",
"\x81\xf0\xf0", "a00",
"\x81\xf0\xf0", "a00",
"\x81\x81", "aa",
"\x81\x81\xf0", "aa0",
"\x81\x81\x81", "aaa",
"\x81\x81\x82", "aab"
{ "", "" },
{ "\x6c", "%" },
{ "\xf0", "0" },
{ "\xf0\xf0", "00" },
{ "\xf0\xf0\x81", "00a" },
{ "\x7e", "=" },
{ "\xc1", "A" },
{ "\xc1\xf0\xf0", "A00" },
{ "\xc1\xf0\xf0", "A00" },
{ "\xc1\xc1", "AA" },
{ "\xc1\xc1\xf0", "AA0" },
{ "\x6d", "_" },
{ "\x81", "a" },
{ "\x81\xf0\xf0", "a00" },
{ "\x81\xf0\xf0", "a00" },
{ "\x81\x81", "aa" },
{ "\x81\x81\xf0", "aa0" },
{ "\x81\x81\x81", "aaa" },
{ "\x81\x81\x82", "aab" }
};
int32_t i;
for(i=1; i<LENGTHOF(invStrings); ++i) {