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

ICU-6945 reduce gcc 4.2 warnings

Browse Source 
X-SVN-Rev: 26411
This commit is contained in:
Markus Scherer 2009-07-22 05:15:28 +00:00
parent ffe5ca79f2
commit ceff3fcad0
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4c/source/common/uresdata.c
View File

@ -50,8 +50,14 @@
#define URESDATA_ITEM_NOT_FOUND -1
/* empty resource of any type, returned when the resource offset is 0 */
static const int32_t gEmpty[2]={ 0, 0 };
/* empty resources, returned when the resource offset is 0 */
static const uint16_t gEmpty16=0;
static const int32_t gEmpty32=0;
static const struct {
int32_t length;
UChar nul;
UChar pad;
} gEmptyString={ 0, 0, 0 };
/*
* All the type-access functions assume that
@ -150,7 +156,7 @@ res_init(ResourceData *pResData,
/* get the root resource */
pResData->pRoot=(const int32_t *)inBytes;
pResData->rootRes=(Resource)*pResData->pRoot;
pResData->p16BitUnits=(const uint16_t *)gEmpty;
pResData->p16BitUnits=&gEmpty16;
/* formatVersion 1.1 must have a root item and at least 5 indexes */
if(length>=0 && (length/4)<((formatVersion[0]==1 && formatVersion[1]==0) ? 1 : 1+5)) {
@ -307,7 +313,7 @@ res_getString(const ResourceData *pResData, Resource res, int32_t *pLength) {
p+=3;
}
} else if(res==offset) /* RES_GET_TYPE(res)==URES_STRING */ {
const int32_t *p32= res==0 ? gEmpty : pResData->pRoot+res;
const int32_t *p32= res==0 ? &gEmptyString.length : pResData->pRoot+res;
length=*p32++;
p=(const UChar *)p32;
} else {
@ -326,7 +332,7 @@ res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength) {
uint32_t offset=RES_GET_OFFSET(res);
int32_t length;
if(RES_GET_TYPE(res)==URES_ALIAS) {
const int32_t *p32= offset==0 ? gEmpty : pResData->pRoot+offset;
const int32_t *p32= offset==0 ? &gEmptyString.length : pResData->pRoot+offset;
length=*p32++;
p=(const UChar *)p32;
} else {
@ -345,7 +351,7 @@ res_getBinary(const ResourceData *pResData, Resource res, int32_t *pLength) {
uint32_t offset=RES_GET_OFFSET(res);
int32_t length;
if(RES_GET_TYPE(res)==URES_BINARY) {
const int32_t *p32= offset==0 ? gEmpty : pResData->pRoot+offset;
const int32_t *p32= offset==0 ? &gEmpty32 : pResData->pRoot+offset;
length=*p32++;
p=(const uint8_t *)p32;
} else {
@ -365,7 +371,7 @@ res_getIntVector(const ResourceData *pResData, Resource res, int32_t *pLength) {
uint32_t offset=RES_GET_OFFSET(res);
int32_t length;
if(RES_GET_TYPE(res)==URES_INT_VECTOR) {
p= offset==0 ? gEmpty : pResData->pRoot+offset;
p= offset==0 ? &gEmpty32 : pResData->pRoot+offset;
length=*p++;
} else {
p=NULL;
@ -390,9 +396,9 @@ res_countArrayItems(const ResourceData *pResData, Resource res) {
return 1;
case URES_ARRAY:
case URES_TABLE32:
return *(offset==0 ? gEmpty : pResData->pRoot+offset);
return offset==0 ? 0 : *(pResData->pRoot+offset);
case URES_TABLE:
return *(offset==0 ? (const uint16_t *)gEmpty : (const uint16_t *)(pResData->pRoot+offset));
return offset==0 ? 0 : *((const uint16_t *)(pResData->pRoot+offset));
case URES_ARRAY16:
case URES_TABLE16:
return pResData->p16BitUnits[offset];
@ -412,7 +418,7 @@ res_getTableItemByKey(const ResourceData *pResData, Resource table,
}
switch(RES_GET_TYPE(table)) {
case URES_TABLE: {
const uint16_t *p= offset==0 ? (const uint16_t *)gEmpty : (const uint16_t *)(pResData->pRoot+offset);
const uint16_t *p= offset==0 ? &gEmpty16 : (const uint16_t *)(pResData->pRoot+offset);
length=*p++;
*indexR=idx=_res_findTableItem(pResData, p, length, *key, key);
if(idx>=0) {
@ -431,7 +437,7 @@ res_getTableItemByKey(const ResourceData *pResData, Resource table,
break;
}
case URES_TABLE32: {
const int32_t *p= offset==0 ? gEmpty : pResData->pRoot+offset;
const int32_t *p= offset==0 ? &gEmpty32 : pResData->pRoot+offset;
length=*p++;
*indexR=idx=_res_findTable32Item(pResData, p, length, *key, key);
if(idx>=0) {
@ -452,7 +458,7 @@ res_getTableItemByIndex(const ResourceData *pResData, Resource table,
int32_t length;
switch(RES_GET_TYPE(table)) {
case URES_TABLE: {
const uint16_t *p= offset==0 ? (const uint16_t *)gEmpty : (const uint16_t *)(pResData->pRoot+offset);
const uint16_t *p= offset==0 ? &gEmpty16 : (const uint16_t *)(pResData->pRoot+offset);
length=*p++;
if(indexR<length) {
const Resource *p32=(const Resource *)(p+length+(~length&1));
@ -475,7 +481,7 @@ res_getTableItemByIndex(const ResourceData *pResData, Resource table,
break;
}
case URES_TABLE32: {
const int32_t *p= offset==0 ? gEmpty : pResData->pRoot+offset;
const int32_t *p= offset==0 ? &gEmpty32 : pResData->pRoot+offset;
length=*p++;
if(indexR<length) {
if(key!=NULL) {
@ -503,7 +509,7 @@ res_getArrayItem(const ResourceData *pResData, Resource array, int32_t indexR) {
uint32_t offset=RES_GET_OFFSET(array);
switch(RES_GET_TYPE(array)) {
case URES_ARRAY: {
const int32_t *p= offset==0 ? gEmpty : pResData->pRoot+offset;
const int32_t *p= offset==0 ? &gEmpty32 : pResData->pRoot+offset;
if(indexR<*p) {
return (Resource)p[1+indexR];
}

2
icu4c/source/tools/genrb/genrb.c
View File

@ -136,7 +136,7 @@ main(int argc,
if(options[FORMAT_VERSION].doesOccur) {
const char *s = options[FORMAT_VERSION].value;
if(uprv_strlen(s) != 1 || (s[0] != '1' && s[0] != '2')) {
fprintf(stderr, "%s: unsupported --formatVersion %s\n", s);
fprintf(stderr, "%s: unsupported --formatVersion %s\n", argv[0], s);
argc = -1;
} else if(s[0] == '1' &&
(options[WRITE_POOL_BUNDLE].doesOccur || options[USE_POOL_BUNDLE].doesOccur)

9
icu4c/source/tools/genrb/reslist.c
View File

@ -649,7 +649,6 @@ void bundle_write(struct SRBRoot *bundle,
char *writtenFilename, int writtenFilenameLen,
UErrorCode *status) {
UNewDataMemory *mem = NULL;
uint8_t pad = 0;
uint32_t byteOffset = 0;
uint32_t top, size;
char dataName[1024];
@ -661,7 +660,7 @@ void bundle_write(struct SRBRoot *bundle,
* Safe because the capacity is a multiple of 4.
*/
while (bundle->fKeysTop & 3) {
bundle->fKeys[bundle->fKeysTop++] = 0xaa;
bundle->fKeys[bundle->fKeysTop++] = (char)0xaa;
}
/*
* In URES_TABLE, use all local key offsets that fit into 16 bits,
@ -828,6 +827,11 @@ void bundle_write(struct SRBRoot *bundle,
}
/* Opening Functions */
/* gcc 4.2 complained "no previous prototype for ‘res_open’" without this prototype... */
struct SResource* res_open(struct SRBRoot *bundle, const char *tag,
const struct UString* comment, UErrorCode* status);
struct SResource* res_open(struct SRBRoot *bundle, const char *tag,
const struct UString* comment, UErrorCode* status){
struct SResource *res;
@ -1554,7 +1558,6 @@ bundle_compactKeys(struct SRBRoot *bundle, UErrorCode *status) {
compareKeyNewpos, NULL, FALSE, status);
if (U_SUCCESS(*status)) {
int32_t oldpos, newpos, limit;
int32_t i;
oldpos = newpos = bundle->fKeysBottom;
limit = bundle->fKeysTop;
/* skip key offsets that point into the pool bundle rather than this new bundle */

6
icu4c/source/tools/toolutil/swapimpl.cpp
View File

@ -541,10 +541,7 @@ test_swap(const UDataSwapper *ds,
const uint8_t *inBytes;
uint8_t *outBytes;
const int32_t *inIndexes;
int32_t indexes[32];
int32_t i, offset, count;
int32_t offset;
/* udata_swapDataHeader checks the arguments */
headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode);
@ -594,6 +591,7 @@ test_swap(const UDataSwapper *ds,
return headerSize+size;
}
/* swap any data (except a .dat package) ------------------------------------ */
static const struct {