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

ICU-5568 Add ucal_clone()

Browse Source 
X-SVN-Rev: 24014
This commit is contained in:
Peter Edberg 2008-05-28 04:53:32 +00:00
parent 89523a2fb6
commit 342953342c
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/i18n/ucal.cpp
View File

@ -139,6 +139,22 @@ ucal_close(UCalendar *cal)
delete (Calendar*) cal;
}
U_CAPI UCalendar* U_EXPORT2
ucal_clone(const UCalendar* cal,
UErrorCode* status)
{
if(U_FAILURE(*status)) return 0;
Calendar* res = ((Calendar*)cal)->clone();
if(res == 0) {
*status = U_MEMORY_ALLOCATION_ERROR;
return 0;
}
return (UCalendar*) res;
}
U_CAPI void U_EXPORT2
ucal_setTimeZone( UCalendar* cal,
const UChar* zoneID,

12
icu4c/source/i18n/unicode/ucal.h
View File

@ -622,6 +622,18 @@ ucal_open(const UChar* zoneID,
U_STABLE void U_EXPORT2
ucal_close(UCalendar *cal);
/**
* Open a copy of a UCalendar.
* This function performs a deep copy.
* @param cal The calendar to copy
* @param status A pointer to an UErrorCode to receive any errors.
* @return A pointer to a UCalendar identical to cal.
* @draft ICU 4.0
*/
U_DRAFT UCalendar* U_EXPORT2
ucal_clone(const UCalendar* cal,
UErrorCode* status);
/**
* Set the TimeZone used by a UCalendar.
* A UCalendar uses a timezone for converting from Greenwich time to local time.

12
icu4c/source/test/cintltst/ccaltst.c
View File

@ -58,7 +58,7 @@ static const UChar AMERICA_LOS_ANGELES[] = {0x41, 0x6D, 0x65, 0x72, 0x69, 0x63,
static void TestCalendar()
{
UCalendar *caldef = 0, *caldef2 = 0, *calfr = 0, *calit = 0;
UCalendar *caldef = 0, *caldef2 = 0, *calfr = 0, *calit = 0, *calfrclone = 0;
UEnumeration* uenum = NULL;
int32_t count, count2, i,j;
UChar tzID[4];
@ -234,7 +234,12 @@ static void TestCalendar()
if(U_FAILURE(status)) {
log_err("FAIL: error in ucal_open calit : %s\n", u_errorName(status));
}
/*Testing the clone() function*/
calfrclone = ucal_clone(calfr, &status);
if(U_FAILURE(status)){
log_err("FAIL: error in ucal_clone calfr : %s\n", u_errorName(status));
}
/*Testing udat_getAvailable() and udat_countAvailable()*/
log_verbose("\nTesting getAvailableLocales and countAvailable()\n");
@ -256,7 +261,7 @@ static void TestCalendar()
log_verbose("\nTesting ucal_equivalentTo()\n");
if(caldef && caldef2 && calfr && calit) {
if(ucal_equivalentTo(caldef, caldef2) == FALSE || ucal_equivalentTo(caldef, calfr)== TRUE ||
ucal_equivalentTo(caldef, calit)== TRUE) {
ucal_equivalentTo(caldef, calit)== TRUE || ucal_equivalentTo(calfr, calfrclone) == FALSE) {
log_err("FAIL: Error. equivalentTo test failed\n");
} else {
log_verbose("PASS: equivalentTo test passed\n");
@ -390,6 +395,7 @@ static void TestCalendar()
ucal_close(caldef2);
ucal_close(calfr);
ucal_close(calit);
ucal_close(calfrclone);
/*closing the UDateFormat used */
udat_close(datdef);
free(result);