organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-1100 Don't fail on ures_getIntVector and ures_getBinary any more.

Browse source 
X-SVN-Rev: 5687
This commit is contained in:
George Rhoten 2001-09-05 18:44:27 +00:00
parent f9e031e351
commit 589ceba976
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
icu4c/source/common/uresbund.c
View file

@ -546,7 +546,6 @@ U_CAPI const UChar* U_EXPORT2 ures_getString(const UResourceBundle* resB, int32_
U_CAPI const uint8_t* U_EXPORT2 ures_getBinary(const UResourceBundle* resB, int32_t* len,
UErrorCode* status) {
const uint8_t *p;
if (status==NULL || U_FAILURE(*status)) {
return NULL;
}
@ -556,11 +555,7 @@ U_CAPI const uint8_t* U_EXPORT2 ures_getBinary(const UResourceBundle* resB, int3
}
switch(RES_GET_TYPE(resB->fRes)) {
case RES_BINARY:
p = res_getBinary(&(resB->fResData), resB->fRes, len);
if (*len == 0) {
*status = U_MISSING_RESOURCE_ERROR;
}
return p;
return res_getBinary(&(resB->fResData), resB->fRes, len);
case RES_INT:
case RES_STRING:
case RES_INT_VECTOR:
@ -575,7 +570,6 @@ U_CAPI const uint8_t* U_EXPORT2 ures_getBinary(const UResourceBundle* resB, int3
U_CAPI const int32_t* U_EXPORT2 ures_getIntVector(const UResourceBundle* resB, int32_t* len,
UErrorCode* status) {
const int32_t *p;
if (status==NULL || U_FAILURE(*status)) {
return NULL;
}
@ -585,11 +579,7 @@ U_CAPI const int32_t* U_EXPORT2 ures_getIntVector(const UResourceBundle* resB, i
}
switch(RES_GET_TYPE(resB->fRes)) {
case RES_INT_VECTOR:
p = res_getIntVector(&(resB->fResData), resB->fRes, len);
if (*len == 0) {
*status = U_MISSING_RESOURCE_ERROR;
}
return p;
return res_getIntVector(&(resB->fResData), resB->fRes, len);
case RES_INT:
case RES_STRING:
case RES_ARRAY:

4
icu4c/source/test/cintltst/creststn.c
View file

@ -411,7 +411,7 @@ static void TestEmptyTypes() {
}
else {
zeroIntVect=ures_getIntVector(res, &len, &status);
if(U_SUCCESS(status) || resArray != NULL || len != 0) {
if(!U_SUCCESS(status) || resArray != NULL || len != 0) {
log_err("Shouldn't get emptyintv\n");
}
}
@ -427,7 +427,7 @@ static void TestEmptyTypes() {
}
else {
binResult=ures_getBinary(res, &len, &status);
if(U_SUCCESS(status) || binResult != NULL || len != 0) {
if(!U_SUCCESS(status) || binResult != NULL || len != 0) {
log_err("Shouldn't get emptybin\n");
}
}