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

ICU-96 BRAINDEAD CVS allowed new revision not to contain changes from the previous revision. Changes remerged now.

Browse Source 
X-SVN-Rev: 4911
This commit is contained in:
Vladimir Weinstein 2001-06-07 21:28:56 +00:00
parent 78e52aba92
commit 5e30c2c882
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4c/source/i18n/ucol.cpp
View File

@ -398,7 +398,6 @@ ucol_openRules( const UChar *rules,
fprintf(stderr, "invalid rule just before offset %i\n", src.current-src.source);
}
#endif
uprv_free(src.opts);
ucol_tok_closeTokenList(&src);
return NULL;
}
@ -412,9 +411,13 @@ ucol_openRules( const UChar *rules,
result->hasRealData = TRUE;
}
} else { /* no rules, but no error either */
/* must be only options */
// must be only options
// We will init the collator from UCA
result = ucol_initCollator(UCA->image,0,status);
ucol_setOptionsFromHeader(result, src.opts, status);
// And set only the options
UColOptionSet *opts = (UColOptionSet *)uprv_malloc(sizeof(UColOptionSet));
uprv_memcpy(opts, src.opts, sizeof(UColOptionSet));
ucol_setOptionsFromHeader(result, opts, status);
result->freeOptionsOnClose = TRUE;
result->hasRealData = FALSE;
}
@ -428,7 +431,6 @@ ucol_openRules( const UChar *rules,
ucol_setAttribute(result, UCOL_STRENGTH, strength, status);
ucol_setAttribute(result, UCOL_NORMALIZATION_MODE, norm, status);
} else {
uprv_free(src.opts);
if(table != NULL) {
uprv_free(table);
}