organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 04:29:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-5253 support resource==0 as designed and documented

Browse source 
X-SVN-Rev: 19787
This commit is contained in:
Markus Scherer 2006-07-03 21:38:39 +00:00
parent 6b3d20d454
commit 21502ad4e2
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/common/uresdata.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
* *
* Copyright (C) 1999-2005, International Business Machines Corporation *
* Copyright (C) 1999-2006, International Business Machines Corporation *
* and others. All Rights Reserved. *
* *
*******************************************************************************
@ -262,8 +262,16 @@ res_unload(ResourceData *pResData) {
U_CFUNC const UChar *
res_getString(const ResourceData *pResData, const Resource res, int32_t *pLength) {
/*
* The data structure is documented as supporting res==0 for empty strings.
* Return a fixed pointer in such a case.
* This was dropped in uresdata.c 1.17 as part of Jitterbug 1005 work
* on code coverage for ICU 2.0.
* Re-added for consistency with the design and with other code.
*/
static const int32_t emptyString[2]={ 0, 0 };
if(res!=RES_BOGUS && RES_GET_TYPE(res)==URES_STRING) {
const int32_t *p=(const int32_t *)RES_GET_POINTER(pResData->pRoot, res);
const int32_t *p= res==0 ? emptyString : (const int32_t *)RES_GET_POINTER(pResData->pRoot, res);
if (pLength) {
*pLength=*p;
}