diff --git a/icu4c/source/common/appendable.cpp b/icu4c/source/common/appendable.cpp index f9b20180eb7..8a14c1e9d9a 100644 --- a/icu4c/source/common/appendable.cpp +++ b/icu4c/source/common/appendable.cpp @@ -63,7 +63,7 @@ Appendable::getAppendBuffer(int32_t minCapacity, int32_t *resultCapacity) { if(minCapacity<1 || scratchCapacity= min_capacity) { diff --git a/icu4c/source/common/bytestrie.cpp b/icu4c/source/common/bytestrie.cpp index c272cc40221..532ea9e9c0a 100644 --- a/icu4c/source/common/bytestrie.cpp +++ b/icu4c/source/common/bytestrie.cpp @@ -68,7 +68,7 @@ BytesTrie::jumpByDelta(const uint8_t *pos) { UStringTrieResult BytesTrie::current() const { const uint8_t *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } else { int32_t node; @@ -182,7 +182,7 @@ BytesTrie::nextImpl(const uint8_t *pos, int32_t inByte) { UStringTrieResult BytesTrie::next(int32_t inByte) { const uint8_t *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } if(inByte<0) { @@ -212,7 +212,7 @@ BytesTrie::next(const char *s, int32_t sLength) { return current(); } const uint8_t *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } int32_t length=remainingMatchLength_; // Actual remaining match length minus 1. @@ -317,8 +317,8 @@ BytesTrie::findUniqueValueFromBranch(const uint8_t *pos, int32_t length, UBool haveUniqueValue, int32_t &uniqueValue) { while(length>kMaxBranchLinearSubNodeLength) { ++pos; // ignore the comparison byte - if(NULL==findUniqueValueFromBranch(jumpByDelta(pos), length>>1, haveUniqueValue, uniqueValue)) { - return NULL; + if(nullptr==findUniqueValueFromBranch(jumpByDelta(pos), length>>1, haveUniqueValue, uniqueValue)) { + return nullptr; } length=length-(length>>1); pos=skipDelta(pos); @@ -333,7 +333,7 @@ BytesTrie::findUniqueValueFromBranch(const uint8_t *pos, int32_t length, if(isFinal) { if(haveUniqueValue) { if(value!=uniqueValue) { - return NULL; + return nullptr; } } else { uniqueValue=value; @@ -341,7 +341,7 @@ BytesTrie::findUniqueValueFromBranch(const uint8_t *pos, int32_t length, } } else { if(!findUniqueValue(pos+value, haveUniqueValue, uniqueValue)) { - return NULL; + return nullptr; } haveUniqueValue=true; } @@ -358,7 +358,7 @@ BytesTrie::findUniqueValue(const uint8_t *pos, UBool haveUniqueValue, int32_t &u node=*pos++; } pos=findUniqueValueFromBranch(pos, node+1, haveUniqueValue, uniqueValue); - if(pos==NULL) { + if(pos==nullptr) { return false; } haveUniqueValue=true; @@ -387,7 +387,7 @@ BytesTrie::findUniqueValue(const uint8_t *pos, UBool haveUniqueValue, int32_t &u int32_t BytesTrie::getNextBytes(ByteSink &out) const { const uint8_t *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return 0; } if(remainingMatchLength_>=0) { diff --git a/icu4c/source/common/bytestriebuilder.cpp b/icu4c/source/common/bytestriebuilder.cpp index ac7d3d867e5..a61cccf8486 100644 --- a/icu4c/source/common/bytestriebuilder.cpp +++ b/icu4c/source/common/bytestriebuilder.cpp @@ -127,13 +127,13 @@ BytesTrieElement::compareStringTo(const BytesTrieElement &other, const CharStrin } BytesTrieBuilder::BytesTrieBuilder(UErrorCode &errorCode) - : strings(NULL), elements(NULL), elementsCapacity(0), elementsLength(0), - bytes(NULL), bytesCapacity(0), bytesLength(0) { + : strings(nullptr), elements(nullptr), elementsCapacity(0), elementsLength(0), + bytes(nullptr), bytesCapacity(0), bytesLength(0) { if(U_FAILURE(errorCode)) { return; } strings=new CharString(); - if(strings==NULL) { + if(strings==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -162,7 +162,7 @@ BytesTrieBuilder::add(StringPiece s, int32_t value, UErrorCode &errorCode) { newCapacity=4*elementsCapacity; } BytesTrieElement *newElements=new BytesTrieElement[newCapacity]; - if(newElements==NULL) { + if(newElements==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return *this; // error instead of dereferencing null } @@ -192,13 +192,13 @@ U_CDECL_END BytesTrie * BytesTrieBuilder::build(UStringTrieBuildOption buildOption, UErrorCode &errorCode) { buildBytes(buildOption, errorCode); - BytesTrie *newTrie=NULL; + BytesTrie *newTrie=nullptr; if(U_SUCCESS(errorCode)) { newTrie=new BytesTrie(bytes, bytes+(bytesCapacity-bytesLength)); - if(newTrie==NULL) { + if(newTrie==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } else { - bytes=NULL; // The new trie now owns the array. + bytes=nullptr; // The new trie now owns the array. bytesCapacity=0; } } @@ -220,7 +220,7 @@ BytesTrieBuilder::buildBytes(UStringTrieBuildOption buildOption, UErrorCode &err if(U_FAILURE(errorCode)) { return; } - if(bytes!=NULL && bytesLength>0) { + if(bytes!=nullptr && bytesLength>0) { // Already built. return; } @@ -256,7 +256,7 @@ BytesTrieBuilder::buildBytes(UStringTrieBuildOption buildOption, UErrorCode &err if(bytesCapacity(uprv_malloc(capacity)); - if(bytes==NULL) { + if(bytes==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; bytesCapacity=0; return; @@ -264,7 +264,7 @@ BytesTrieBuilder::buildBytes(UStringTrieBuildOption buildOption, UErrorCode &err bytesCapacity=capacity; } StringTrieBuilder::build(buildOption, elementsLength, errorCode); - if(bytes==NULL) { + if(bytes==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -374,7 +374,7 @@ BytesTrieBuilder::createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t le UBool BytesTrieBuilder::ensureCapacity(int32_t length) { - if(bytes==NULL) { + if(bytes==nullptr) { return false; // previous memory allocation had failed } if(length>bytesCapacity) { @@ -383,10 +383,10 @@ BytesTrieBuilder::ensureCapacity(int32_t length) { newCapacity*=2; } while(newCapacity<=length); char *newBytes=static_cast(uprv_malloc(newCapacity)); - if(newBytes==NULL) { + if(newBytes==nullptr) { // unable to allocate memory uprv_free(bytes); - bytes=NULL; + bytes=nullptr; bytesCapacity=0; return false; } diff --git a/icu4c/source/common/bytestrieiterator.cpp b/icu4c/source/common/bytestrieiterator.cpp index eacb7eedb0d..65f54be48ae 100644 --- a/icu4c/source/common/bytestrieiterator.cpp +++ b/icu4c/source/common/bytestrieiterator.cpp @@ -27,7 +27,7 @@ BytesTrie::Iterator::Iterator(const void *trieBytes, int32_t maxStringLength, : bytes_(static_cast(trieBytes)), pos_(bytes_), initialPos_(bytes_), remainingMatchLength_(-1), initialRemainingMatchLength_(-1), - str_(NULL), maxLength_(maxStringLength), value_(0), stack_(NULL) { + str_(nullptr), maxLength_(maxStringLength), value_(0), stack_(nullptr) { if(U_FAILURE(errorCode)) { return; } @@ -39,7 +39,7 @@ BytesTrie::Iterator::Iterator(const void *trieBytes, int32_t maxStringLength, // cost is minimal. str_=new CharString(); stack_=new UVector32(errorCode); - if(U_SUCCESS(errorCode) && (str_==NULL || stack_==NULL)) { + if(U_SUCCESS(errorCode) && (str_==nullptr || stack_==nullptr)) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -49,7 +49,7 @@ BytesTrie::Iterator::Iterator(const BytesTrie &trie, int32_t maxStringLength, : bytes_(trie.bytes_), pos_(trie.pos_), initialPos_(trie.pos_), remainingMatchLength_(trie.remainingMatchLength_), initialRemainingMatchLength_(trie.remainingMatchLength_), - str_(NULL), maxLength_(maxStringLength), value_(0), stack_(NULL) { + str_(nullptr), maxLength_(maxStringLength), value_(0), stack_(nullptr) { if(U_FAILURE(errorCode)) { return; } @@ -58,7 +58,7 @@ BytesTrie::Iterator::Iterator(const BytesTrie &trie, int32_t maxStringLength, if(U_FAILURE(errorCode)) { return; } - if(str_==NULL || stack_==NULL) { + if(str_==nullptr || stack_==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -96,7 +96,7 @@ BytesTrie::Iterator::reset() { } UBool -BytesTrie::Iterator::hasNext() const { return pos_!=NULL || !stack_->isEmpty(); } +BytesTrie::Iterator::hasNext() const { return pos_!=nullptr || !stack_->isEmpty(); } UBool BytesTrie::Iterator::next(UErrorCode &errorCode) { @@ -104,7 +104,7 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) { return false; } const uint8_t *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { if(stack_->isEmpty()) { return false; } @@ -118,7 +118,7 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) { length=(int32_t)((uint32_t)length>>16); if(length>1) { pos=branchNext(pos, length, errorCode); - if(pos==NULL) { + if(pos==nullptr) { return true; // Reached a final value. } } else { @@ -137,7 +137,7 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) { UBool isFinal=(UBool)(node&kValueIsFinal); value_=readValue(pos, node>>1); if(isFinal || (maxLength_>0 && str_->length()==maxLength_)) { - pos_=NULL; + pos_=nullptr; } else { pos_=skipValue(pos, node); } @@ -151,7 +151,7 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) { node=*pos++; } pos=branchNext(pos, node+1, errorCode); - if(pos==NULL) { + if(pos==nullptr) { return true; // Reached a final value. } } else { @@ -170,12 +170,12 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) { StringPiece BytesTrie::Iterator::getString() const { - return str_ == NULL ? StringPiece() : str_->toStringPiece(); + return str_ == nullptr ? StringPiece() : str_->toStringPiece(); } UBool BytesTrie::Iterator::truncateAndStop() { - pos_=NULL; + pos_=nullptr; value_=-1; // no real value for str return true; } @@ -203,9 +203,9 @@ BytesTrie::Iterator::branchNext(const uint8_t *pos, int32_t length, UErrorCode & stack_->addElement(((length-1)<<16)|str_->length(), errorCode); str_->append((char)trieByte, errorCode); if(isFinal) { - pos_=NULL; + pos_=nullptr; value_=value; - return NULL; + return nullptr; } else { return pos+value; } diff --git a/icu4c/source/common/caniter.cpp b/icu4c/source/common/caniter.cpp index 81f17265fbb..4a733f9d816 100644 --- a/icu4c/source/common/caniter.cpp +++ b/icu4c/source/common/caniter.cpp @@ -68,10 +68,10 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CanonicalIterator) *@param source string to get results for */ CanonicalIterator::CanonicalIterator(const UnicodeString &sourceStr, UErrorCode &status) : - pieces(NULL), + pieces(nullptr), pieces_length(0), - pieces_lengths(NULL), - current(NULL), + pieces_lengths(nullptr), + current(nullptr), current_length(0), nfd(*Normalizer2::getNFDInstance(status)), nfcImpl(*Normalizer2Factory::getNFCImpl(status)) @@ -87,23 +87,23 @@ CanonicalIterator::~CanonicalIterator() { void CanonicalIterator::cleanPieces() { int32_t i = 0; - if(pieces != NULL) { + if(pieces != nullptr) { for(i = 0; i < pieces_length; i++) { - if(pieces[i] != NULL) { + if(pieces[i] != nullptr) { delete[] pieces[i]; } } uprv_free(pieces); - pieces = NULL; + pieces = nullptr; pieces_length = 0; } - if(pieces_lengths != NULL) { + if(pieces_lengths != nullptr) { uprv_free(pieces_lengths); - pieces_lengths = NULL; + pieces_lengths = nullptr; } - if(current != NULL) { + if(current != nullptr) { uprv_free(current); - current = NULL; + current = nullptr; current_length = 0; } } @@ -170,7 +170,7 @@ void CanonicalIterator::setSource(const UnicodeString &newSource, UErrorCode &st UChar32 cp = 0; int32_t start = 0; int32_t i = 0; - UnicodeString *list = NULL; + UnicodeString *list = nullptr; nfd.normalize(newSource, source, status); if(U_FAILURE(status)) { @@ -187,7 +187,7 @@ void CanonicalIterator::setSource(const UnicodeString &newSource, UErrorCode &st pieces_length = 1; current = (int32_t*)uprv_malloc(1 * sizeof(int32_t)); current_length = 1; - if (pieces == NULL || pieces_lengths == NULL || current == NULL) { + if (pieces == nullptr || pieces_lengths == nullptr || current == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; goto CleanPartialInitialization; } @@ -233,7 +233,7 @@ void CanonicalIterator::setSource(const UnicodeString &newSource, UErrorCode &st pieces_lengths = (int32_t*)uprv_malloc(list_length * sizeof(int32_t)); current = (int32_t*)uprv_malloc(list_length * sizeof(int32_t)); current_length = list_length; - if (pieces == NULL || pieces_lengths == NULL || current == NULL) { + if (pieces == nullptr || pieces_lengths == nullptr || current == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; goto CleanPartialInitialization; } @@ -252,7 +252,7 @@ void CanonicalIterator::setSource(const UnicodeString &newSource, UErrorCode &st return; // Common section to cleanup all local variables and reset object variables. CleanPartialInitialization: - if (list != NULL) { + if (list != nullptr) { delete[] list; } cleanPieces(); @@ -276,7 +276,7 @@ void U_EXPORT2 CanonicalIterator::permute(UnicodeString &source, UBool skipZeros // we check for length < 2 to keep from counting code points all the time if (source.length() <= 2 && source.countChar32() <= 1) { UnicodeString *toPut = new UnicodeString(source); - /* test for NULL */ + /* test for nullptr */ if (toPut == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -295,7 +295,7 @@ void U_EXPORT2 CanonicalIterator::permute(UnicodeString &source, UBool skipZeros for (i = 0; i < source.length(); i += U16_LENGTH(cp)) { cp = source.char32At(i); - const UHashElement *ne = NULL; + const UHashElement *ne = nullptr; int32_t el = UHASH_FIRST; UnicodeString subPermuteString = source; @@ -321,11 +321,11 @@ void U_EXPORT2 CanonicalIterator::permute(UnicodeString &source, UBool skipZeros // prefix this character to all of them ne = subpermute.nextElement(el); - while (ne != NULL) { + while (ne != nullptr) { UnicodeString *permRes = (UnicodeString *)(ne->value.pointer); UnicodeString *chStr = new UnicodeString(cp); - //test for NULL - if (chStr == NULL) { + //test for nullptr + if (chStr == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -360,23 +360,23 @@ UnicodeString* CanonicalIterator::getEquivalents(const UnicodeString &segment, i // add only the ones that are canonically equivalent // TODO: optimize by not permuting any class zero. - const UHashElement *ne = NULL; + const UHashElement *ne = nullptr; int32_t el = UHASH_FIRST; //Iterator it = basic.iterator(); ne = basic.nextElement(el); //while (it.hasNext()) - while (ne != NULL) { + while (ne != nullptr) { //String item = (String) it.next(); UnicodeString item = *((UnicodeString *)(ne->value.pointer)); permutations.removeAll(); permute(item, CANITER_SKIP_ZEROES, &permutations, status); - const UHashElement *ne2 = NULL; + const UHashElement *ne2 = nullptr; int32_t el2 = UHASH_FIRST; //Iterator it2 = permutations.iterator(); ne2 = permutations.nextElement(el2); //while (it2.hasNext()) - while (ne2 != NULL) { + while (ne2 != nullptr) { //String possible = (String) it2.next(); //UnicodeString *possible = new UnicodeString(*((UnicodeString *)(ne2->value.pointer))); UnicodeString possible(*((UnicodeString *)(ne2->value.pointer))); @@ -403,24 +403,24 @@ UnicodeString* CanonicalIterator::getEquivalents(const UnicodeString &segment, i } // convert into a String[] to clean up storage //String[] finalResult = new String[result.size()]; - UnicodeString *finalResult = NULL; + UnicodeString *finalResult = nullptr; int32_t resultCount; if((resultCount = result.count()) != 0) { finalResult = new UnicodeString[resultCount]; if (finalResult == 0) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } } else { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } //result.toArray(finalResult); result_len = 0; el = UHASH_FIRST; ne = result.nextElement(el); - while(ne != NULL) { + while(ne != nullptr) { finalResult[result_len++] = *((UnicodeString *)(ne->value.pointer)); ne = result.nextElement(el); } @@ -432,7 +432,7 @@ UnicodeString* CanonicalIterator::getEquivalents(const UnicodeString &segment, i Hashtable *CanonicalIterator::getEquivalents2(Hashtable *fillinResult, const UChar *segment, int32_t segLen, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } //if (PROGRESS) printf("Adding: %s\n", UToS(Tr(segment))); @@ -457,7 +457,7 @@ Hashtable *CanonicalIterator::getEquivalents2(Hashtable *fillinResult, const UCh UChar32 cp2 = iter.getCodepoint(); Hashtable remainder(status); remainder.setValueDeleter(uprv_deleteUObject); - if (extract(&remainder, cp2, segment, segLen, i, status) == NULL) { + if (extract(&remainder, cp2, segment, segLen, i, status) == nullptr) { continue; } @@ -467,13 +467,13 @@ Hashtable *CanonicalIterator::getEquivalents2(Hashtable *fillinResult, const UCh int32_t el = UHASH_FIRST; const UHashElement *ne = remainder.nextElement(el); - while (ne != NULL) { + while (ne != nullptr) { UnicodeString item = *((UnicodeString *)(ne->value.pointer)); UnicodeString *toAdd = new UnicodeString(prefix); - /* test for NULL */ + /* test for nullptr */ if (toAdd == 0) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } *toAdd += item; fillinResult->put(*toAdd, toAdd, status); @@ -487,7 +487,7 @@ Hashtable *CanonicalIterator::getEquivalents2(Hashtable *fillinResult, const UCh /* Test for buffer overflows */ if(U_FAILURE(status)) { - return NULL; + return nullptr; } return fillinResult; } @@ -503,7 +503,7 @@ Hashtable *CanonicalIterator::extract(Hashtable *fillinResult, UChar32 comp, con //if (PROGRESS) printf("%s, %i\n", UToS(Tr(segment)), segmentPos); if (U_FAILURE(status)) { - return NULL; + return nullptr; } UnicodeString temp(comp); @@ -511,11 +511,11 @@ Hashtable *CanonicalIterator::extract(Hashtable *fillinResult, UChar32 comp, con UnicodeString decompString; nfd.normalize(temp, decompString, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (decompString.isBogus()) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } const UChar *decomp=decompString.getBuffer(); int32_t decompLen=decompString.length(); @@ -561,7 +561,7 @@ Hashtable *CanonicalIterator::extract(Hashtable *fillinResult, UChar32 comp, con } } if (!ok) - return NULL; // we failed, characters left over + return nullptr; // we failed, characters left over //if (PROGRESS) printf("Matches\n"); @@ -575,7 +575,7 @@ Hashtable *CanonicalIterator::extract(Hashtable *fillinResult, UChar32 comp, con UnicodeString trial; nfd.normalize(temp, trial, status); if(U_FAILURE(status) || trial.compare(segment+segmentPos, segLen - segmentPos) != 0) { - return NULL; + return nullptr; } return getEquivalents2(fillinResult, temp.getBuffer()+inputLen, temp.length()-inputLen, status); diff --git a/icu4c/source/common/charstr.cpp b/icu4c/source/common/charstr.cpp index 8a0994c7374..e6dab631716 100644 --- a/icu4c/source/common/charstr.cpp +++ b/icu4c/source/common/charstr.cpp @@ -113,7 +113,7 @@ CharString &CharString::append(const char *s, int32_t sLength, UErrorCode &error if(U_FAILURE(errorCode)) { return *this; } - if(sLength<-1 || (s==NULL && sLength!=0)) { + if(sLength<-1 || (s==nullptr && sLength!=0)) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return *this; } @@ -181,7 +181,7 @@ char *CharString::getAppendBuffer(int32_t minCapacity, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { resultCapacity=0; - return NULL; + return nullptr; } int32_t appendCapacity=buffer.getCapacity()-len-1; // -1 for NUL if(appendCapacity>=minCapacity) { @@ -193,7 +193,7 @@ char *CharString::getAppendBuffer(int32_t minCapacity, return buffer.getAlias()+len; } resultCapacity=0; - return NULL; + return nullptr; } CharString &CharString::appendInvariantChars(const UnicodeString &s, UErrorCode &errorCode) { @@ -226,8 +226,8 @@ UBool CharString::ensureCapacity(int32_t capacity, if(desiredCapacityHint==0) { desiredCapacityHint=capacity+buffer.getCapacity(); } - if( (desiredCapacityHint<=capacity || buffer.resize(desiredCapacityHint, len+1)==NULL) && - buffer.resize(capacity, len+1)==NULL + if( (desiredCapacityHint<=capacity || buffer.resize(desiredCapacityHint, len+1)==nullptr) && + buffer.resize(capacity, len+1)==nullptr ) { errorCode=U_MEMORY_ALLOCATION_ERROR; return false; diff --git a/icu4c/source/common/cmemory.cpp b/icu4c/source/common/cmemory.cpp index 64f5034921f..57e9c48be6d 100644 --- a/icu4c/source/common/cmemory.cpp +++ b/icu4c/source/common/cmemory.cpp @@ -15,8 +15,8 @@ * If you have a need to replace ICU allocation, this is the * place to do it. * -* Note that uprv_malloc(0) returns a non-NULL pointer, and -* that a subsequent free of that pointer value is a NOP. +* Note that uprv_malloc(0) returns a non-nullptr pointer, +* and that a subsequent free of that pointer value is a NOP. * ****************************************************************************** */ @@ -103,7 +103,7 @@ uprv_free(void *buffer) { U_CAPI void * U_EXPORT2 uprv_calloc(size_t num, size_t size) { - void *mem = NULL; + void *mem = nullptr; size *= num; mem = uprv_malloc(size); if (mem) { @@ -118,7 +118,7 @@ u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMem if (U_FAILURE(*status)) { return; } - if (a==NULL || r==NULL || f==NULL) { + if (a==nullptr || r==nullptr || f==nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -130,9 +130,9 @@ u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMem U_CFUNC UBool cmemory_cleanup(void) { - pContext = NULL; - pAlloc = NULL; - pRealloc = NULL; - pFree = NULL; + pContext = nullptr; + pAlloc = nullptr; + pRealloc = nullptr; + pFree = nullptr; return true; } diff --git a/icu4c/source/common/cmemory.h b/icu4c/source/common/cmemory.h index f03b7dcce6b..5f7897d8bd2 100644 --- a/icu4c/source/common/cmemory.h +++ b/icu4c/source/common/cmemory.h @@ -192,13 +192,13 @@ public: * Constructor takes ownership. * @param p simple pointer to an array of T items that is adopted */ - explicit LocalMemory(T *p=NULL) : LocalPointerBase(p) {} + explicit LocalMemory(T *p=nullptr) : LocalPointerBase(p) {} /** * Move constructor, leaves src with isNull(). * @param src source smart pointer */ LocalMemory(LocalMemory &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; + src.ptr=nullptr; } /** * Destructor deletes the memory it owns. @@ -215,7 +215,7 @@ public: LocalMemory &operator=(LocalMemory &&src) U_NOEXCEPT { uprv_free(LocalPointerBase::ptr); LocalPointerBase::ptr=src.ptr; - src.ptr=NULL; + src.ptr=nullptr; return *this; } /** @@ -248,21 +248,21 @@ public: * Deletes the array it owns, allocates a new one and reset its bytes to 0. * Returns the new array pointer. * If the allocation fails, then the current array is unchanged and - * this method returns NULL. + * this method returns nullptr. * @param newCapacity must be >0 - * @return the allocated array pointer, or NULL if the allocation failed + * @return the allocated array pointer, or nullptr if the allocation failed */ inline T *allocateInsteadAndReset(int32_t newCapacity=1); /** * Deletes the array it owns and allocates a new one, copying length T items. * Returns the new array pointer. * If the allocation fails, then the current array is unchanged and - * this method returns NULL. + * this method returns nullptr. * @param newCapacity must be >0 * @param length number of T items to be copied from the old array to the new one; * must be no more than the capacity of the old array, * which the caller must track because the LocalMemory does not track it - * @return the allocated array pointer, or NULL if the allocation failed + * @return the allocated array pointer, or nullptr if the allocation failed */ inline T *allocateInsteadAndCopy(int32_t newCapacity=1, int32_t length=0); /** @@ -278,14 +278,14 @@ template inline T *LocalMemory::allocateInsteadAndReset(int32_t newCapacity) { if(newCapacity>0) { T *p=(T *)uprv_malloc(newCapacity*sizeof(T)); - if(p!=NULL) { + if(p!=nullptr) { uprv_memset(p, 0, newCapacity*sizeof(T)); uprv_free(LocalPointerBase::ptr); LocalPointerBase::ptr=p; } return p; } else { - return NULL; + return nullptr; } } @@ -294,7 +294,7 @@ template inline T *LocalMemory::allocateInsteadAndCopy(int32_t newCapacity, int32_t length) { if(newCapacity>0) { T *p=(T *)uprv_malloc(newCapacity*sizeof(T)); - if(p!=NULL) { + if(p!=nullptr) { if(length>0) { if(length>newCapacity) { length=newCapacity; @@ -306,7 +306,7 @@ inline T *LocalMemory::allocateInsteadAndCopy(int32_t newCapacity, int32_t le } return p; } else { - return NULL; + return nullptr; } } @@ -403,11 +403,11 @@ public: /** * Deletes the array (if owned) and aliases another one, no transfer of ownership. * If the arguments are illegal, then the current array is unchanged. - * @param otherArray must not be NULL + * @param otherArray must not be nullptr * @param otherCapacity must be >0 */ void aliasInstead(T *otherArray, int32_t otherCapacity) { - if(otherArray!=NULL && otherCapacity>0) { + if(otherArray!=nullptr && otherCapacity>0) { releaseArray(); ptr=otherArray; capacity=otherCapacity; @@ -418,17 +418,17 @@ public: * Deletes the array (if owned) and allocates a new one, copying length T items. * Returns the new array pointer. * If the allocation fails, then the current array is unchanged and - * this method returns NULL. + * this method returns nullptr. * @param newCapacity can be less than or greater than the current capacity; * must be >0 * @param length number of T items to be copied from the old array to the new one - * @return the allocated array pointer, or NULL if the allocation failed + * @return the allocated array pointer, or nullptr if the allocation failed */ inline T *resize(int32_t newCapacity, int32_t length=0); /** * Gives up ownership of the array if owned, or else clones it, * copying length T items; resets itself to the internal stack array. - * Returns NULL if the allocation failed. + * Returns nullptr if the allocation failed. * @param length number of T items to copy when cloning, * and capacity of the clone when cloning * @param resultCapacity will be set to the returned array's capacity (output-only) @@ -443,7 +443,7 @@ protected: if (U_FAILURE(status)) { return; } - if (this->resize(src.capacity, 0) == NULL) { + if (this->resize(src.capacity, 0) == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -508,7 +508,7 @@ inline T *MaybeStackArray::resize(int32_t newCapacity, int32_t ::fprintf(::stderr, "MaybeStackArray (resize) alloc %d * %lu\n", newCapacity, sizeof(T)); #endif T *p=(T *)uprv_malloc(newCapacity*sizeof(T)); - if(p!=NULL) { + if(p!=nullptr) { if(length>0) { if(length>capacity) { length=capacity; @@ -525,7 +525,7 @@ inline T *MaybeStackArray::resize(int32_t newCapacity, int32_t } return p; } else { - return NULL; + return nullptr; } } @@ -535,7 +535,7 @@ inline T *MaybeStackArray::orphanOrClone(int32_t length, int32 if(needToRelease) { p=ptr; } else if(length<=0) { - return NULL; + return nullptr; } else { if(length>capacity) { length=capacity; @@ -544,8 +544,8 @@ inline T *MaybeStackArray::orphanOrClone(int32_t length, int32 #if U_DEBUG && defined(UPRV_MALLOC_COUNT) ::fprintf(::stderr,"MaybeStacArray (orphan) alloc %d * %lu\n", length,sizeof(T)); #endif - if(p==NULL) { - return NULL; + if(p==nullptr) { + return nullptr; } uprv_memcpy(p, ptr, (size_t)length*sizeof(T)); } @@ -618,11 +618,11 @@ public: /** * Deletes the memory block (if owned) and aliases another one, no transfer of ownership. * If the arguments are illegal, then the current memory is unchanged. - * @param otherArray must not be NULL + * @param otherArray must not be nullptr * @param otherCapacity must be >0 */ void aliasInstead(H *otherMemory, int32_t otherCapacity) { - if(otherMemory!=NULL && otherCapacity>0) { + if(otherMemory!=nullptr && otherCapacity>0) { releaseMemory(); ptr=otherMemory; capacity=otherCapacity; @@ -634,17 +634,17 @@ public: * copying the header and length T array items. * Returns the new header pointer. * If the allocation fails, then the current memory is unchanged and - * this method returns NULL. + * this method returns nullptr. * @param newCapacity can be less than or greater than the current capacity; * must be >0 * @param length number of T items to be copied from the old array to the new one - * @return the allocated pointer, or NULL if the allocation failed + * @return the allocated pointer, or nullptr if the allocation failed */ inline H *resize(int32_t newCapacity, int32_t length=0); /** * Gives up ownership of the memory if owned, or else clones it, * copying the header and length T array items; resets itself to the internal memory. - * Returns NULL if the allocation failed. + * Returns nullptr if the allocation failed. * @param length number of T items to copy when cloning, * and array capacity of the clone when cloning * @param resultCapacity will be set to the returned array's capacity (output-only) @@ -680,7 +680,7 @@ inline H *MaybeStackHeaderAndArray::resize(int32_t newCapac ::fprintf(::stderr,"MaybeStackHeaderAndArray alloc %d + %d * %ul\n", sizeof(H),newCapacity,sizeof(T)); #endif H *p=(H *)uprv_malloc(sizeof(H)+newCapacity*sizeof(T)); - if(p!=NULL) { + if(p!=nullptr) { if(length<0) { length=0; } else if(length>0) { @@ -699,7 +699,7 @@ inline H *MaybeStackHeaderAndArray::resize(int32_t newCapac } return p; } else { - return NULL; + return nullptr; } } @@ -719,8 +719,8 @@ inline H *MaybeStackHeaderAndArray::orphanOrClone(int32_t l ::fprintf(::stderr,"MaybeStackHeaderAndArray (orphan) alloc %ul + %d * %lu\n", sizeof(H),length,sizeof(T)); #endif p=(H *)uprv_malloc(sizeof(H)+length*sizeof(T)); - if(p==NULL) { - return NULL; + if(p==nullptr) { + return nullptr; } uprv_memcpy(p, ptr, sizeof(H)+(size_t)length*sizeof(T)); } diff --git a/icu4c/source/common/cstr.cpp b/icu4c/source/common/cstr.cpp index 24654f8fc22..b87597e4504 100644 --- a/icu4c/source/common/cstr.cpp +++ b/icu4c/source/common/cstr.cpp @@ -21,7 +21,7 @@ U_NAMESPACE_BEGIN CStr::CStr(const UnicodeString &in) { UErrorCode status = U_ZERO_ERROR; #if !UCONFIG_NO_CONVERSION || U_CHARSET_IS_UTF8 - int32_t length = in.extract(0, in.length(), static_cast(NULL), static_cast(0)); + int32_t length = in.extract(0, in.length(), static_cast(nullptr), static_cast(0)); int32_t resultCapacity = 0; char *buf = s.getAppendBuffer(length, length, resultCapacity, status); if (U_SUCCESS(status)) { diff --git a/icu4c/source/common/cstring.cpp b/icu4c/source/common/cstring.cpp index 06275c4b564..e95816c1301 100644 --- a/icu4c/source/common/cstring.cpp +++ b/icu4c/source/common/cstring.cpp @@ -189,7 +189,7 @@ T_CString_integerToString(char* buffer, int32_t v, int32_t radix) /* * Takes a int64_t and fills in a char* string with that number "radix"-based. * Writes at most 21: chars ("-9223372036854775807" plus NUL). - * Returns the length of the string, not including the terminating NULL. + * Returns the length of the string, not including the terminating NUL. */ U_CAPI int32_t U_EXPORT2 T_CString_int64ToString(char* buffer, int64_t v, uint32_t radix) @@ -233,16 +233,16 @@ T_CString_stringToInteger(const char *integerString, int32_t radix) U_CAPI int U_EXPORT2 uprv_stricmp(const char *str1, const char *str2) { - if(str1==NULL) { - if(str2==NULL) { + if(str1==nullptr) { + if(str2==nullptr) { return 0; } else { return -1; } - } else if(str2==NULL) { + } else if(str2==nullptr) { return 1; } else { - /* compare non-NULL strings lexically with lowercase */ + /* compare non-nullptr strings lexically with lowercase */ int rc; unsigned char c1, c2; @@ -272,16 +272,16 @@ uprv_stricmp(const char *str1, const char *str2) { U_CAPI int U_EXPORT2 uprv_strnicmp(const char *str1, const char *str2, uint32_t n) { - if(str1==NULL) { - if(str2==NULL) { + if(str1==nullptr) { + if(str2==nullptr) { return 0; } else { return -1; } - } else if(str2==NULL) { + } else if(str2==nullptr) { return 1; } else { - /* compare non-NULL strings lexically with lowercase */ + /* compare non-nullptr strings lexically with lowercase */ int rc; unsigned char c1, c2; diff --git a/icu4c/source/common/dictionarydata.cpp b/icu4c/source/common/dictionarydata.cpp index 6e2dbee5b61..de987e02e25 100644 --- a/icu4c/source/common/dictionarydata.cpp +++ b/icu4c/source/common/dictionarydata.cpp @@ -57,13 +57,13 @@ int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t codePointsMatched += 1; if (USTRINGTRIE_HAS_VALUE(result)) { if (wordCount < limit) { - if (values != NULL) { + if (values != nullptr) { values[wordCount] = uct.getValue(); } - if (lengths != NULL) { + if (lengths != nullptr) { lengths[wordCount] = lengthMatched; } - if (cpLengths != NULL) { + if (cpLengths != nullptr) { cpLengths[wordCount] = codePointsMatched; } ++wordCount; @@ -80,7 +80,7 @@ int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t } } - if (prefix != NULL) { + if (prefix != nullptr) { *prefix = codePointsMatched; } return wordCount; @@ -124,13 +124,13 @@ int32_t BytesDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t codePointsMatched += 1; if (USTRINGTRIE_HAS_VALUE(result)) { if (wordCount < limit) { - if (values != NULL) { + if (values != nullptr) { values[wordCount] = bt.getValue(); } - if (lengths != NULL) { + if (lengths != nullptr) { lengths[wordCount] = lengthMatched; } - if (cpLengths != NULL) { + if (cpLengths != nullptr) { cpLengths[wordCount] = codePointsMatched; } ++wordCount; @@ -147,7 +147,7 @@ int32_t BytesDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t } } - if (prefix != NULL) { + if (prefix != nullptr) { *prefix = codePointsMatched; } return wordCount; @@ -170,7 +170,7 @@ udict_swap(const UDataSwapper *ds, const void *inData, int32_t length, int32_t i, offset, size; headerSize = udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if (pErrorCode == NULL || U_FAILURE(*pErrorCode)) return 0; + if (pErrorCode == nullptr || U_FAILURE(*pErrorCode)) return 0; pInfo = (const UDataInfo *)((const char *)inData + 4); if (!(pInfo->dataFormat[0] == 0x44 && pInfo->dataFormat[1] == 0x69 && diff --git a/icu4c/source/common/dictionarydata.h b/icu4c/source/common/dictionarydata.h index e75716f54b9..3c63515aa66 100644 --- a/icu4c/source/common/dictionarydata.h +++ b/icu4c/source/common/dictionarydata.h @@ -79,15 +79,15 @@ public: * matching words to be found. * @param lengths output array, filled with the lengths of the matches, in order, * from shortest to longest. Lengths are in native indexing units - * of the UText. May be NULL. + * of the UText. May be nullptr. * @param cpLengths output array, filled with the lengths of the matches, in order, * from shortest to longest. Lengths are the number of Unicode code points. - * May be NULL. + * May be nullptr. * @param values Output array, filled with the values associated with the words found. - * May be NULL. + * May be nullptr. * @param prefix Output parameter, the code point length of the prefix match, even if that * prefix didn't lead to a complete word. Will always be >= the cpLength - * of the longest complete word matched. May be NULL. + * of the longest complete word matched. May be nullptr. * @return Number of matching words found. */ virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, diff --git a/icu4c/source/common/edits.cpp b/icu4c/source/common/edits.cpp index 21d7c3f0061..8bceb53200b 100644 --- a/icu4c/source/common/edits.cpp +++ b/icu4c/source/common/edits.cpp @@ -233,7 +233,7 @@ UBool Edits::growArray() { return false; } uint16_t *newArray = (uint16_t *)uprv_malloc((size_t)newCapacity * 2); - if (newArray == NULL) { + if (newArray == nullptr) { errorCode_ = U_MEMORY_ALLOCATION_ERROR; return false; } diff --git a/icu4c/source/common/filteredbrk.cpp b/icu4c/source/common/filteredbrk.cpp index ebe8f8a262e..7647320099f 100644 --- a/icu4c/source/common/filteredbrk.cpp +++ b/icu4c/source/common/filteredbrk.cpp @@ -35,7 +35,7 @@ static void _fb_trace(const char *m, const UnicodeString *s, UBool b, int32_t d, if(s) { s->extract(0,s->length(),buf,2048); } else { - strcpy(buf,"NULL"); + strcpy(buf,"nullptr"); } fprintf(stderr,"%s:%d: %s. s='%s'(%p), b=%c, d=%d\n", f, l, m, buf, (const void*)s, b?'T':'F',(int)d); diff --git a/icu4c/source/common/filterednormalizer2.cpp b/icu4c/source/common/filterednormalizer2.cpp index 63f01206e97..5eafcb6d78f 100644 --- a/icu4c/source/common/filterednormalizer2.cpp +++ b/icu4c/source/common/filterednormalizer2.cpp @@ -346,15 +346,15 @@ U_NAMESPACE_USE U_CAPI UNormalizer2 * U_EXPORT2 unorm2_openFiltered(const UNormalizer2 *norm2, const USet *filterSet, UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if(filterSet==NULL) { + if(filterSet==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } Normalizer2 *fn2=new FilteredNormalizer2(*(Normalizer2 *)norm2, *UnicodeSet::fromUSet(filterSet)); - if(fn2==NULL) { + if(fn2==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; } return (UNormalizer2 *)fn2; diff --git a/icu4c/source/common/hash.h b/icu4c/source/common/hash.h index c9afeaf562e..01471a8f29f 100644 --- a/icu4c/source/common/hash.h +++ b/icu4c/source/common/hash.h @@ -159,7 +159,7 @@ inline Hashtable::Hashtable(UBool ignoreKeyCase, UErrorCode& status) : uhash_hashUnicodeString, ignoreKeyCase ? uhash_compareCaselessUnicodeString : uhash_compareUnicodeString, - NULL, + nullptr, status); } @@ -170,25 +170,25 @@ inline Hashtable::Hashtable(UBool ignoreKeyCase, int32_t size, UErrorCode& statu : uhash_hashUnicodeString, ignoreKeyCase ? uhash_compareCaselessUnicodeString : uhash_compareUnicodeString, - NULL, size, + nullptr, size, status); } inline Hashtable::Hashtable(UErrorCode& status) : hash(0) { - init(uhash_hashUnicodeString, uhash_compareUnicodeString, NULL, status); + init(uhash_hashUnicodeString, uhash_compareUnicodeString, nullptr, status); } inline Hashtable::Hashtable() : hash(0) { UErrorCode status = U_ZERO_ERROR; - init(uhash_hashUnicodeString, uhash_compareUnicodeString, NULL, status); + init(uhash_hashUnicodeString, uhash_compareUnicodeString, nullptr, status); } inline Hashtable::~Hashtable() { - if (hash != NULL) { + if (hash != nullptr) { uhash_close(hash); } } diff --git a/icu4c/source/common/icudataver.cpp b/icu4c/source/common/icudataver.cpp index d3144113741..809d080512f 100644 --- a/icu4c/source/common/icudataver.cpp +++ b/icu4c/source/common/icudataver.cpp @@ -15,14 +15,14 @@ #include "uresimp.h" /* for ures_getVersionByKey */ U_CAPI void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status) { - UResourceBundle *icudatares = NULL; + UResourceBundle *icudatares = nullptr; if (U_FAILURE(*status)) { return; } - if (dataVersionFillin != NULL) { - icudatares = ures_openDirect(NULL, U_ICU_VERSION_BUNDLE , status); + if (dataVersionFillin != nullptr) { + icudatares = ures_openDirect(nullptr, U_ICU_VERSION_BUNDLE , status); if (U_SUCCESS(*status)) { ures_getVersionByKey(icudatares, U_ICU_DATA_KEY, dataVersionFillin, status); } diff --git a/icu4c/source/common/icuplug.cpp b/icu4c/source/common/icuplug.cpp index 72b5d271755..bde83f7e25c 100644 --- a/icu4c/source/common/icuplug.cpp +++ b/icu4c/source/common/icuplug.cpp @@ -52,9 +52,9 @@ struct UPlugData { UPlugEntrypoint *entrypoint; /**< plugin entrypoint */ uint32_t structSize; /**< initialized to the size of this structure */ uint32_t token; /**< must be U_PLUG_TOKEN */ - void *lib; /**< plugin library, or NULL */ + void *lib; /**< plugin library, or nullptr */ char libName[UPLUG_NAME_MAX]; /**< library name */ - char sym[UPLUG_NAME_MAX]; /**< plugin symbol, or NULL */ + char sym[UPLUG_NAME_MAX]; /**< plugin symbol, or nullptr */ char config[UPLUG_NAME_MAX]; /**< configuration data */ void *context; /**< user context data */ char name[UPLUG_NAME_MAX]; /**< name of plugin */ @@ -148,9 +148,9 @@ static int32_t searchForLibrary(void *lib) { U_CAPI char * U_EXPORT2 uplug_findLibrary(void *lib, UErrorCode *status) { int32_t libEnt; - char *ret = NULL; + char *ret = nullptr; if(U_FAILURE(*status)) { - return NULL; + return nullptr; } libEnt = searchForLibrary(lib); if(libEnt!=-1) { @@ -164,9 +164,9 @@ uplug_findLibrary(void *lib, UErrorCode *status) { U_CAPI void * U_EXPORT2 uplug_openLibrary(const char *libName, UErrorCode *status) { int32_t libEntry = -1; - void *lib = NULL; + void *lib = nullptr; - if(U_FAILURE(*status)) return NULL; + if(U_FAILURE(*status)) return nullptr; libEntry = searchForLibraryName(libName); if(libEntry == -1) { @@ -177,7 +177,7 @@ uplug_openLibrary(const char *libName, UErrorCode *status) { #if UPLUG_TRACE DBG((stderr, "uplug_openLibrary() - out of library slots (max %d)\n", libraryMax)); #endif - return NULL; + return nullptr; } /* Some operating systems don't want DL operations from multiple threads. */ @@ -186,9 +186,9 @@ uplug_openLibrary(const char *libName, UErrorCode *status) { DBG((stderr, "uplug_openLibrary(%s,%s) libEntry %d, lib %p\n", libName, u_errorName(*status), libEntry, lib)); #endif - if(libraryList[libEntry].lib == NULL || U_FAILURE(*status)) { + if(libraryList[libEntry].lib == nullptr || U_FAILURE(*status)) { /* cleanup. */ - libraryList[libEntry].lib = NULL; /* failure with open */ + libraryList[libEntry].lib = nullptr; /* failure with open */ libraryList[libEntry].name[0] = 0; #if UPLUG_TRACE DBG((stderr, "uplug_openLibrary(%s,%s) libEntry %d, lib %p\n", libName, u_errorName(*status), libEntry, lib)); @@ -252,14 +252,14 @@ static int32_t uplug_pluginNumber(UPlugData* d) { U_CAPI UPlugData * U_EXPORT2 uplug_nextPlug(UPlugData *prior) { - if(prior==NULL) { + if(prior==nullptr) { return pluginList; } else { UPlugData *nextPlug = &prior[1]; UPlugData *pastPlug = &pluginList[pluginCount]; if(nextPlug>=pastPlug) { - return NULL; + return nullptr; } else { return nextPlug; } @@ -273,7 +273,7 @@ uplug_nextPlug(UPlugData *prior) { */ static void uplug_callPlug(UPlugData *plug, UPlugReason reason, UErrorCode *status) { UPlugTokenReturn token; - if(plug==NULL||U_FAILURE(*status)) { + if(plug==nullptr||U_FAILURE(*status)) { return; } token = (*(plug->entrypoint))(plug, reason, status); @@ -330,15 +330,15 @@ static void uplug_loadPlug(UPlugData *plug, UErrorCode *status) { static UPlugData *uplug_allocateEmptyPlug(UErrorCode *status) { - UPlugData *plug = NULL; + UPlugData *plug = nullptr; if(U_FAILURE(*status)) { - return NULL; + return nullptr; } if(pluginCount == UPLUG_PLUGIN_INITIAL_COUNT) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } plug = &pluginList[pluginCount++]; @@ -353,8 +353,8 @@ static UPlugData *uplug_allocateEmptyPlug(UErrorCode *status) plug->libName[0] = 0; plug->config[0]=0; plug->sym[0]=0; - plug->lib=NULL; - plug->entrypoint=NULL; + plug->lib=nullptr; + plug->entrypoint=nullptr; return plug; @@ -364,16 +364,16 @@ static UPlugData *uplug_allocatePlug(UPlugEntrypoint *entrypoint, const char *co UErrorCode *status) { UPlugData *plug = uplug_allocateEmptyPlug(status); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } - if(config!=NULL) { + if(config!=nullptr) { uprv_strncpy(plug->config, config, UPLUG_NAME_MAX); } else { plug->config[0] = 0; } - if(symName!=NULL) { + if(symName!=nullptr) { uprv_strncpy(plug->sym, symName, UPLUG_NAME_MAX); } else { plug->sym[0] = 0; @@ -393,7 +393,7 @@ static void uplug_deallocatePlug(UPlugData *plug, UErrorCode *status) { uplug_closeLibrary(plug->lib, &subStatus); #endif } - plug->lib = NULL; + plug->lib = nullptr; if(U_SUCCESS(*status) && U_FAILURE(subStatus)) { *status = subStatus; } @@ -410,7 +410,7 @@ static void uplug_deallocatePlug(UPlugData *plug, UErrorCode *status) { } static void uplug_doUnloadPlug(UPlugData *plugToRemove, UErrorCode *status) { - if(plugToRemove != NULL) { + if(plugToRemove != nullptr) { uplug_unloadPlug(plugToRemove, status); uplug_deallocatePlug(plugToRemove, status); } @@ -418,14 +418,14 @@ static void uplug_doUnloadPlug(UPlugData *plugToRemove, UErrorCode *status) { U_CAPI void U_EXPORT2 uplug_removePlug(UPlugData *plug, UErrorCode *status) { - UPlugData *cursor = NULL; - UPlugData *plugToRemove = NULL; + UPlugData *cursor = nullptr; + UPlugData *plugToRemove = nullptr; if(U_FAILURE(*status)) return; - for(cursor=pluginList;cursor!=NULL;) { + for(cursor=pluginList;cursor!=nullptr;) { if(cursor==plug) { plugToRemove = plug; - cursor=NULL; + cursor=nullptr; } else { cursor = uplug_nextPlug(cursor); } @@ -481,7 +481,7 @@ uplug_getLibraryName(UPlugData *data, UErrorCode *status) { #if U_ENABLE_DYLOAD return uplug_findLibrary(data->lib, status); #else - return NULL; + return nullptr; #endif } } @@ -510,7 +510,7 @@ uplug_getConfiguration(UPlugData *data) { U_CAPI UPlugData* U_EXPORT2 uplug_getPlugInternal(int32_t n) { if(n <0 || n >= pluginCount) { - return NULL; + return nullptr; } else { return &(pluginList[n]); } @@ -530,7 +530,7 @@ uplug_getPlugLoadStatus(UPlugData *plug) { */ static UPlugData* uplug_initPlugFromEntrypointAndLibrary(UPlugEntrypoint *entrypoint, const char *config, void *lib, const char *sym, UErrorCode *status) { - UPlugData *plug = NULL; + UPlugData *plug = nullptr; plug = uplug_allocatePlug(entrypoint, config, lib, sym, status); @@ -538,13 +538,13 @@ static UPlugData* uplug_initPlugFromEntrypointAndLibrary(UPlugEntrypoint *entryp return plug; } else { uplug_deallocatePlug(plug, status); - return NULL; + return nullptr; } } U_CAPI UPlugData* U_EXPORT2 uplug_loadPlugFromEntrypoint(UPlugEntrypoint *entrypoint, const char *config, UErrorCode *status) { - UPlugData* plug = uplug_initPlugFromEntrypointAndLibrary(entrypoint, config, NULL, NULL, status); + UPlugData* plug = uplug_initPlugFromEntrypointAndLibrary(entrypoint, config, nullptr, nullptr, status); uplug_loadPlug(plug, status); return plug; } @@ -555,25 +555,25 @@ static UPlugData* uplug_initErrorPlug(const char *libName, const char *sym, const char *config, const char *nameOrError, UErrorCode loadStatus, UErrorCode *status) { UPlugData *plug = uplug_allocateEmptyPlug(status); - if(U_FAILURE(*status)) return NULL; + if(U_FAILURE(*status)) return nullptr; plug->pluginStatus = loadStatus; plug->awaitingLoad = false; /* Won't load. */ plug->dontUnload = true; /* cannot unload. */ - if(sym!=NULL) { + if(sym!=nullptr) { uprv_strncpy(plug->sym, sym, UPLUG_NAME_MAX); } - if(libName!=NULL) { + if(libName!=nullptr) { uprv_strncpy(plug->libName, libName, UPLUG_NAME_MAX); } - if(nameOrError!=NULL) { + if(nameOrError!=nullptr) { uprv_strncpy(plug->name, nameOrError, UPLUG_NAME_MAX); } - if(config!=NULL) { + if(config!=nullptr) { uprv_strncpy(plug->config, config, UPLUG_NAME_MAX); } @@ -585,39 +585,39 @@ uplug_initErrorPlug(const char *libName, const char *sym, const char *config, co */ static UPlugData* uplug_initPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status) { - void *lib = NULL; - UPlugData *plug = NULL; - if(U_FAILURE(*status)) { return NULL; } + void *lib = nullptr; + UPlugData *plug = nullptr; + if(U_FAILURE(*status)) { return nullptr; } lib = uplug_openLibrary(libName, status); - if(lib!=NULL && U_SUCCESS(*status)) { - UPlugEntrypoint *entrypoint = NULL; + if(lib!=nullptr && U_SUCCESS(*status)) { + UPlugEntrypoint *entrypoint = nullptr; entrypoint = (UPlugEntrypoint*)uprv_dlsym_func(lib, sym, status); - if(entrypoint!=NULL&&U_SUCCESS(*status)) { + if(entrypoint!=nullptr&&U_SUCCESS(*status)) { plug = uplug_initPlugFromEntrypointAndLibrary(entrypoint, config, lib, sym, status); - if(plug!=NULL&&U_SUCCESS(*status)) { + if(plug!=nullptr&&U_SUCCESS(*status)) { plug->lib = lib; /* plug takes ownership of library */ - lib = NULL; /* library is now owned by plugin. */ + lib = nullptr; /* library is now owned by plugin. */ } } else { UErrorCode subStatus = U_ZERO_ERROR; - plug = uplug_initErrorPlug(libName,sym,config,"ERROR: Could not load entrypoint",(lib==NULL)?U_MISSING_RESOURCE_ERROR:*status,&subStatus); + plug = uplug_initErrorPlug(libName,sym,config,"ERROR: Could not load entrypoint",(lib==nullptr)?U_MISSING_RESOURCE_ERROR:*status,&subStatus); } - if(lib!=NULL) { /* still need to close the lib */ + if(lib!=nullptr) { /* still need to close the lib */ UErrorCode subStatus = U_ZERO_ERROR; uplug_closeLibrary(lib, &subStatus); /* don't care here */ } } else { UErrorCode subStatus = U_ZERO_ERROR; - plug = uplug_initErrorPlug(libName,sym,config,"ERROR: could not load library",(lib==NULL)?U_MISSING_RESOURCE_ERROR:*status,&subStatus); + plug = uplug_initErrorPlug(libName,sym,config,"ERROR: could not load library",(lib==nullptr)?U_MISSING_RESOURCE_ERROR:*status,&subStatus); } return plug; } U_CAPI UPlugData* U_EXPORT2 uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *config, UErrorCode *status) { - UPlugData *plug = NULL; - if(U_FAILURE(*status)) { return NULL; } + UPlugData *plug = nullptr; + if(U_FAILURE(*status)) { return nullptr; } plug = uplug_initPlugFromLibrary(libName, sym, config, status); uplug_loadPlug(plug, status); @@ -712,7 +712,7 @@ uplug_getPluginFile() { #if U_ENABLE_DYLOAD && !UCONFIG_NO_FILE_IO return plugin_file; #else - return NULL; + return nullptr; #endif } @@ -728,7 +728,7 @@ uplug_init(UErrorCode *status) { const char *env = getenv("ICU_PLUGINS"); if(U_FAILURE(*status)) return; - if(env != NULL) { + if(env != nullptr) { plugin_dir.append(env, -1, *status); } if(U_FAILURE(*status)) return; @@ -791,7 +791,7 @@ uplug_init(UErrorCode *status) { #ifdef __MVS__ if (iscics()) /* 12 Nov 2011 JAM */ { - f = NULL; + f = nullptr; } else #endif @@ -799,9 +799,9 @@ uplug_init(UErrorCode *status) { f = fopen(pluginFile.data(), "r"); } - if(f != NULL) { + if(f != nullptr) { char linebuf[1024]; - char *p, *libName=NULL, *symName=NULL, *config=NULL; + char *p, *libName=nullptr, *symName=nullptr, *config=nullptr; int32_t line = 0; @@ -843,7 +843,7 @@ uplug_init(UErrorCode *status) { } /* chop whitespace at the end of the config */ - if(config!=NULL&&*config!=0) { + if(config!=nullptr&&*config!=0) { p = config+strlen(config); while(p>config&&isspace((int)*(--p))) { *p=0; diff --git a/icu4c/source/common/loadednormalizer2impl.cpp b/icu4c/source/common/loadednormalizer2impl.cpp index 24ff629f84f..768564edc89 100644 --- a/icu4c/source/common/loadednormalizer2impl.cpp +++ b/icu4c/source/common/loadednormalizer2impl.cpp @@ -33,7 +33,7 @@ U_NAMESPACE_BEGIN class LoadedNormalizer2Impl : public Normalizer2Impl { public: - LoadedNormalizer2Impl() : memory(NULL), ownedTrie(NULL) {} + LoadedNormalizer2Impl() : memory(nullptr), ownedTrie(nullptr) {} virtual ~LoadedNormalizer2Impl(); void load(const char *packageName, const char *name, UErrorCode &errorCode); @@ -93,7 +93,7 @@ LoadedNormalizer2Impl::load(const char *packageName, const char *name, UErrorCod int32_t offset=inIndexes[IX_NORM_TRIE_OFFSET]; int32_t nextOffset=inIndexes[IX_EXTRA_DATA_OFFSET]; ownedTrie=ucptrie_openFromBinary(UCPTRIE_TYPE_FAST, UCPTRIE_VALUE_BITS_16, - inBytes+offset, nextOffset-offset, NULL, + inBytes+offset, nextOffset-offset, nullptr, &errorCode); if(U_FAILURE(errorCode)) { return; @@ -117,12 +117,12 @@ Norm2AllModes::createInstance(const char *packageName, const char *name, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } LoadedNormalizer2Impl *impl=new LoadedNormalizer2Impl; - if(impl==NULL) { + if(impl==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } impl->load(packageName, name, errorCode); return createInstance(impl, errorCode); @@ -143,19 +143,19 @@ static icu::UInitOnce nfkcInitOnce {}; static Norm2AllModes *nfkc_cfSingleton; static icu::UInitOnce nfkc_cfInitOnce {}; -static UHashtable *cache=NULL; +static UHashtable *cache=nullptr; // UInitOnce singleton initialization function static void U_CALLCONV initSingletons(const char *what, UErrorCode &errorCode) { #if !NORM2_HARDCODE_NFC_DATA if (uprv_strcmp(what, "nfc") == 0) { - nfcSingleton = Norm2AllModes::createInstance(NULL, "nfc", errorCode); + nfcSingleton = Norm2AllModes::createInstance(nullptr, "nfc", errorCode); } else #endif if (uprv_strcmp(what, "nfkc") == 0) { - nfkcSingleton = Norm2AllModes::createInstance(NULL, "nfkc", errorCode); + nfkcSingleton = Norm2AllModes::createInstance(nullptr, "nfkc", errorCode); } else if (uprv_strcmp(what, "nfkc_cf") == 0) { - nfkc_cfSingleton = Norm2AllModes::createInstance(NULL, "nfkc_cf", errorCode); + nfkc_cfSingleton = Norm2AllModes::createInstance(nullptr, "nfkc_cf", errorCode); } else { UPRV_UNREACHABLE_EXIT; // Unknown singleton } @@ -171,20 +171,20 @@ static void U_CALLCONV deleteNorm2AllModes(void *allModes) { static UBool U_CALLCONV uprv_loaded_normalizer2_cleanup() { #if !NORM2_HARDCODE_NFC_DATA delete nfcSingleton; - nfcSingleton = NULL; + nfcSingleton = nullptr; nfcInitOnce.reset(); #endif delete nfkcSingleton; - nfkcSingleton = NULL; + nfkcSingleton = nullptr; nfkcInitOnce.reset(); delete nfkc_cfSingleton; - nfkc_cfSingleton = NULL; + nfkc_cfSingleton = nullptr; nfkc_cfInitOnce.reset(); uhash_close(cache); - cache=NULL; + cache=nullptr; return true; } @@ -193,7 +193,7 @@ U_CDECL_END #if !NORM2_HARDCODE_NFC_DATA const Norm2AllModes * Norm2AllModes::getNFCInstance(UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } umtx_initOnce(nfcInitOnce, &initSingletons, "nfc", errorCode); return nfcSingleton; } @@ -201,14 +201,14 @@ Norm2AllModes::getNFCInstance(UErrorCode &errorCode) { const Norm2AllModes * Norm2AllModes::getNFKCInstance(UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } umtx_initOnce(nfkcInitOnce, &initSingletons, "nfkc", errorCode); return nfkcSingleton; } const Norm2AllModes * Norm2AllModes::getNFKC_CFInstance(UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } umtx_initOnce(nfkc_cfInitOnce, &initSingletons, "nfkc_cf", errorCode); return nfkc_cfSingleton; } @@ -217,48 +217,48 @@ Norm2AllModes::getNFKC_CFInstance(UErrorCode &errorCode) { const Normalizer2 * Normalizer2::getNFCInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->comp : NULL; + return allModes!=nullptr ? &allModes->comp : nullptr; } const Normalizer2 * Normalizer2::getNFDInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->decomp : NULL; + return allModes!=nullptr ? &allModes->decomp : nullptr; } const Normalizer2 *Normalizer2Factory::getFCDInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->fcd : NULL; + return allModes!=nullptr ? &allModes->fcd : nullptr; } const Normalizer2 *Normalizer2Factory::getFCCInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->fcc : NULL; + return allModes!=nullptr ? &allModes->fcc : nullptr; } const Normalizer2Impl * Normalizer2Factory::getNFCImpl(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? allModes->impl : NULL; + return allModes!=nullptr ? allModes->impl : nullptr; } #endif const Normalizer2 * Normalizer2::getNFKCInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFKCInstance(errorCode); - return allModes!=NULL ? &allModes->comp : NULL; + return allModes!=nullptr ? &allModes->comp : nullptr; } const Normalizer2 * Normalizer2::getNFKDInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFKCInstance(errorCode); - return allModes!=NULL ? &allModes->decomp : NULL; + return allModes!=nullptr ? &allModes->decomp : nullptr; } const Normalizer2 * Normalizer2::getNFKCCasefoldInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFKC_CFInstance(errorCode); - return allModes!=NULL ? &allModes->comp : NULL; + return allModes!=nullptr ? &allModes->comp : nullptr; } const Normalizer2 * @@ -267,14 +267,14 @@ Normalizer2::getInstance(const char *packageName, UNormalization2Mode mode, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } - if(name==NULL || *name==0) { + if(name==nullptr || *name==0) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - const Norm2AllModes *allModes=NULL; - if(packageName==NULL) { + const Norm2AllModes *allModes=nullptr; + if(packageName==nullptr) { if(0==uprv_strcmp(name, "nfc")) { allModes=Norm2AllModes::getNFCInstance(errorCode); } else if(0==uprv_strcmp(name, "nfkc")) { @@ -283,34 +283,34 @@ Normalizer2::getInstance(const char *packageName, allModes=Norm2AllModes::getNFKC_CFInstance(errorCode); } } - if(allModes==NULL && U_SUCCESS(errorCode)) { + if(allModes==nullptr && U_SUCCESS(errorCode)) { { Mutex lock; - if(cache!=NULL) { + if(cache!=nullptr) { allModes=(Norm2AllModes *)uhash_get(cache, name); } } - if(allModes==NULL) { + if(allModes==nullptr) { ucln_common_registerCleanup(UCLN_COMMON_LOADED_NORMALIZER2, uprv_loaded_normalizer2_cleanup); LocalPointer localAllModes( Norm2AllModes::createInstance(packageName, name, errorCode)); if(U_SUCCESS(errorCode)) { Mutex lock; - if(cache==NULL) { - cache=uhash_open(uhash_hashChars, uhash_compareChars, NULL, &errorCode); + if(cache==nullptr) { + cache=uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &errorCode); if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } uhash_setKeyDeleter(cache, uprv_free); uhash_setValueDeleter(cache, deleteNorm2AllModes); } void *temp=uhash_get(cache, name); - if(temp==NULL) { + if(temp==nullptr) { int32_t keyLength= static_cast(uprv_strlen(name)+1); char *nameCopy=(char *)uprv_malloc(keyLength); - if(nameCopy==NULL) { + if(nameCopy==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(nameCopy, name, keyLength); allModes=localAllModes.getAlias(); @@ -322,7 +322,7 @@ Normalizer2::getInstance(const char *packageName, } } } - if(allModes!=NULL && U_SUCCESS(errorCode)) { + if(allModes!=nullptr && U_SUCCESS(errorCode)) { switch(mode) { case UNORM2_COMPOSE: return &allModes->comp; @@ -336,13 +336,13 @@ Normalizer2::getInstance(const char *packageName, break; // do nothing } } - return NULL; + return nullptr; } const Normalizer2 * Normalizer2Factory::getInstance(UNormalizationMode mode, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } switch(mode) { case UNORM_NFD: @@ -363,13 +363,13 @@ Normalizer2Factory::getInstance(UNormalizationMode mode, UErrorCode &errorCode) const Normalizer2Impl * Normalizer2Factory::getNFKCImpl(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFKCInstance(errorCode); - return allModes!=NULL ? allModes->impl : NULL; + return allModes!=nullptr ? allModes->impl : nullptr; } const Normalizer2Impl * Normalizer2Factory::getNFKC_CFImpl(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFKC_CFInstance(errorCode); - return allModes!=NULL ? allModes->impl : NULL; + return allModes!=nullptr ? allModes->impl : nullptr; } U_NAMESPACE_END diff --git a/icu4c/source/common/locavailable.cpp b/icu4c/source/common/locavailable.cpp index cf341e1f74c..374f1a3b8e7 100644 --- a/icu4c/source/common/locavailable.cpp +++ b/icu4c/source/common/locavailable.cpp @@ -35,7 +35,7 @@ U_NAMESPACE_BEGIN -static icu::Locale* availableLocaleList = NULL; +static icu::Locale* availableLocaleList = nullptr; static int32_t availableLocaleListCount; static icu::UInitOnce gInitOnceLocale {}; @@ -49,7 +49,7 @@ static UBool U_CALLCONV locale_available_cleanup(void) if (availableLocaleList) { delete []availableLocaleList; - availableLocaleList = NULL; + availableLocaleList = nullptr; } availableLocaleListCount = 0; gInitOnceLocale.reset(); @@ -71,7 +71,7 @@ void U_CALLCONV locale_available_init() { if(availableLocaleListCount) { availableLocaleList = new Locale[availableLocaleListCount]; } - if (availableLocaleList == NULL) { + if (availableLocaleList == nullptr) { availableLocaleListCount= 0; } for (int32_t locCount=availableLocaleListCount-1; locCount>=0; --locCount) { @@ -212,7 +212,7 @@ static UBool U_CALLCONV uloc_cleanup(void) { static void U_CALLCONV loadInstalledLocales(UErrorCode& status) { ucln_common_registerCleanup(UCLN_COMMON_ULOC, uloc_cleanup); - icu::LocalUResourceBundlePointer rb(ures_openDirect(NULL, "res_index", &status)); + icu::LocalUResourceBundlePointer rb(ures_openDirect(nullptr, "res_index", &status)); AvailableLocalesSink sink; ures_getAllItemsWithFallback(rb.getAlias(), "", sink, status); } diff --git a/icu4c/source/common/locbased.cpp b/icu4c/source/common/locbased.cpp index ff378b4cc78..adcf2f843c0 100644 --- a/icu4c/source/common/locbased.cpp +++ b/icu4c/source/common/locbased.cpp @@ -22,7 +22,7 @@ Locale LocaleBased::getLocale(ULocDataLocaleType type, UErrorCode& status) const const char* LocaleBased::getLocaleID(ULocDataLocaleType type, UErrorCode& status) const { if (U_FAILURE(status)) { - return NULL; + return nullptr; } switch(type) { @@ -32,7 +32,7 @@ const char* LocaleBased::getLocaleID(ULocDataLocaleType type, UErrorCode& status return actual; default: status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } } diff --git a/icu4c/source/common/locdispnames.cpp b/icu4c/source/common/locdispnames.cpp index 637556cc71d..38ca475e997 100644 --- a/icu4c/source/common/locdispnames.cpp +++ b/icu4c/source/common/locdispnames.cpp @@ -304,10 +304,10 @@ _getStringOrCopyKey(const char *path, const char *locale, const char *substitute, UChar *dest, int32_t destCapacity, UErrorCode *pErrorCode) { - const UChar *s = NULL; + const UChar *s = nullptr; int32_t length = 0; - if(itemKey==NULL) { + if(itemKey==nullptr) { /* top-level item: normal resource bundle access */ icu::LocalUResourceBundlePointer rb(ures_open(path, locale, pErrorCode)); @@ -318,7 +318,7 @@ _getStringOrCopyKey(const char *path, const char *locale, } else { bool isLanguageCode = (uprv_strncmp(tableKey, _kLanguages, 9) == 0); /* Language code should not be a number. If it is, set the error code. */ - if (isLanguageCode && uprv_strtol(itemKey, NULL, 10)) { + if (isLanguageCode && uprv_strtol(itemKey, nullptr, 10)) { *pErrorCode = U_MISSING_RESOURCE_ERROR; } else { /* second-level item, use special fallback */ @@ -344,7 +344,7 @@ _getStringOrCopyKey(const char *path, const char *locale, if(U_SUCCESS(*pErrorCode)) { int32_t copyLength=uprv_min(length, destCapacity); - if(copyLength>0 && s != NULL) { + if(copyLength>0 && s != nullptr) { u_memcpy(dest, s, copyLength); } } else { @@ -369,14 +369,14 @@ _getDisplayNameForComponent(const char *locale, char localeBuffer[ULOC_FULLNAME_CAPACITY*4]; int32_t length; UErrorCode localStatus; - const char* root = NULL; + const char* root = nullptr; /* argument checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (destCapacity>0 && dest==NULL)) { + if(destCapacity<0 || (destCapacity>0 && dest==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -399,7 +399,7 @@ _getDisplayNameForComponent(const char *locale, root = tag == _kCountries ? U_ICUDATA_REGION : U_ICUDATA_LANG; return _getStringOrCopyKey(root, displayLocale, - tag, NULL, localeBuffer, + tag, nullptr, localeBuffer, localeBuffer, dest, destCapacity, pErrorCode); @@ -522,11 +522,11 @@ uloc_getDisplayName(const char *locale, int32_t langi = 0; /* index of the language substitution (0 or 1), virtually always 0 */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (destCapacity>0 && dest==NULL)) { + if(destCapacity<0 || (destCapacity>0 && dest==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -537,7 +537,7 @@ uloc_getDisplayName(const char *locale, icu::LocalUResourceBundlePointer locbundle( ures_open(U_ICUDATA_LANG, displayLocale, &status)); icu::LocalUResourceBundlePointer dspbundle( - ures_getByKeyWithFallback(locbundle.getAlias(), _kLocaleDisplayPattern, NULL, &status)); + ures_getByKeyWithFallback(locbundle.getAlias(), _kLocaleDisplayPattern, nullptr, &status)); separator=ures_getStringByKeyWithFallback(dspbundle.getAlias(), _kSeparator, &sepLen, &status); pattern=ures_getStringByKeyWithFallback(dspbundle.getAlias(), _kPattern, &patLen, &status); @@ -559,7 +559,7 @@ uloc_getDisplayName(const char *locale, { UChar *p0=u_strstr(separator, sub0); UChar *p1=u_strstr(separator, sub1); - if (p0==NULL || p1==NULL || p10 && dest==NULL)) { + if(destCapacity<0 || (destCapacity>0 && dest==nullptr)) { *status=U_ILLEGAL_ARGUMENT_ERROR; return 0; } - /* pass itemKey=NULL to look for a top-level item */ + /* pass itemKey=nullptr to look for a top-level item */ return _getStringOrCopyKey(U_ICUDATA_LANG, displayLocale, - _kKeys, NULL, + _kKeys, nullptr, keyword, keyword, dest, destCapacity, @@ -826,11 +826,11 @@ uloc_getDisplayKeywordValue( const char* locale, /* argument checking */ - if(status==NULL || U_FAILURE(*status)) { + if(status==nullptr || U_FAILURE(*status)) { return 0; } - if(destCapacity<0 || (destCapacity>0 && dest==NULL)) { + if(destCapacity<0 || (destCapacity>0 && dest==nullptr)) { *status=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -849,14 +849,14 @@ uloc_getDisplayKeywordValue( const char* locale, if(uprv_stricmp(keyword, _kCurrency)==0){ int32_t dispNameLen = 0; - const UChar *dispName = NULL; + const UChar *dispName = nullptr; icu::LocalUResourceBundlePointer bundle( ures_open(U_ICUDATA_CURR, displayLocale, status)); icu::LocalUResourceBundlePointer currencies( - ures_getByKey(bundle.getAlias(), _kCurrencies, NULL, status)); + ures_getByKey(bundle.getAlias(), _kCurrencies, nullptr, status)); icu::LocalUResourceBundlePointer currency( - ures_getByKeyWithFallback(currencies.getAlias(), keywordValue.data(), NULL, status)); + ures_getByKeyWithFallback(currencies.getAlias(), keywordValue.data(), nullptr, status)); dispName = ures_getStringByIndex(currency.getAlias(), UCURRENCY_DISPLAY_NAME_INDEX, &dispNameLen, status); @@ -869,8 +869,8 @@ uloc_getDisplayKeywordValue( const char* locale, } } - /* now copy the dispName over if not NULL */ - if(dispName != NULL){ + /* now copy the dispName over if not nullptr */ + if(dispName != nullptr){ if(dispNameLen <= destCapacity){ u_memcpy(dest, dispName, dispNameLen); return u_terminateUChars(dest, destCapacity, dispNameLen, status); diff --git a/icu4c/source/common/locdspnm.cpp b/icu4c/source/common/locdspnm.cpp index 401f1fecbff..87aa19b16b8 100644 --- a/icu4c/source/common/locdspnm.cpp +++ b/icu4c/source/common/locdspnm.cpp @@ -40,7 +40,7 @@ static int32_t ncat(char *buffer, uint32_t buflen, ...) { char *p = buffer; const char* e = buffer + buflen - 1; - if (buffer == NULL || buflen < 1) { + if (buffer == nullptr || buflen < 1) { return -1; } @@ -86,16 +86,16 @@ public: inline UnicodeString & ICUDataTable::get(const char* tableKey, const char* itemKey, UnicodeString& result) const { - return get(tableKey, NULL, itemKey, result); + return get(tableKey, nullptr, itemKey, result); } inline UnicodeString & ICUDataTable::getNoFallback(const char* tableKey, const char* itemKey, UnicodeString& result) const { - return getNoFallback(tableKey, NULL, itemKey, result); + return getNoFallback(tableKey, nullptr, itemKey, result); } ICUDataTable::ICUDataTable(const char* path, const Locale& locale) - : path(NULL), locale(Locale::getRoot()) + : path(nullptr), locale(Locale::getRoot()) { if (path) { int32_t len = static_cast(uprv_strlen(path)); @@ -110,7 +110,7 @@ ICUDataTable::ICUDataTable(const char* path, const Locale& locale) ICUDataTable::~ICUDataTable() { if (path) { uprv_free((void*) path); - path = NULL; + path = nullptr; } } @@ -358,7 +358,7 @@ LocaleDisplayNamesImpl::LocaleDisplayNamesImpl(const Locale& locale, , langData(U_ICUDATA_LANG, locale) , regionData(U_ICUDATA_REGION, locale) , capitalizationContext(UDISPCTX_CAPITALIZATION_NONE) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) , nameLength(UDISPCTX_LENGTH_FULL) , substitute(UDISPCTX_SUBSTITUTE) { @@ -371,7 +371,7 @@ LocaleDisplayNamesImpl::LocaleDisplayNamesImpl(const Locale& locale, , langData(U_ICUDATA_LANG, locale) , regionData(U_ICUDATA_REGION, locale) , capitalizationContext(UDISPCTX_CAPITALIZATION_NONE) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) , nameLength(UDISPCTX_LENGTH_FULL) , substitute(UDISPCTX_SUBSTITUTE) { @@ -492,7 +492,7 @@ LocaleDisplayNamesImpl::initialize(void) { // Also check whether we will need a break iterator (depends on the data) UBool needBrkIter = false; if (capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU || capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_STANDALONE) { - LocalUResourceBundlePointer resource(ures_open(NULL, locale.getName(), &status)); + LocalUResourceBundlePointer resource(ures_open(nullptr, locale.getName(), &status)); if (U_FAILURE(status)) { return; } CapitalizationContextSink sink(*this); ures_getAllItemsWithFallback(resource.getAlias(), "contextTransforms", sink, status); @@ -510,7 +510,7 @@ LocaleDisplayNamesImpl::initialize(void) { capitalizationBrkIter = BreakIterator::createSentenceInstance(locale, status); if (U_FAILURE(status)) { delete capitalizationBrkIter; - capitalizationBrkIter = NULL; + capitalizationBrkIter = nullptr; } } #endif @@ -554,7 +554,7 @@ LocaleDisplayNamesImpl::adjustForUsageAndContext(CapContextUsage usage, UnicodeString& result) const { #if !UCONFIG_NO_BREAK_ITERATION // check to see whether we need to titlecase result - if ( result.length() > 0 && u_islower(result.char32At(0)) && capitalizationBrkIter!= NULL && + if ( result.length() > 0 && u_islower(result.char32At(0)) && capitalizationBrkIter!= nullptr && ( capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || fCapitalization[usage] ) ) { // note fCapitalization[usage] won't be set unless capitalizationContext is UI_LIST_OR_MENU or STANDALONE static UMutex capitalizationBrkIterLock; @@ -660,7 +660,7 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, UnicodeString temp2; char value[ULOC_KEYWORD_AND_VALUES_CAPACITY]; // sigh, no ULOC_VALUE_CAPACITY const char* key; - while ((key = e->next((int32_t *)0, status)) != NULL) { + while ((key = e->next((int32_t *)0, status)) != nullptr) { value[0] = 0; loc.getKeywordValue(key, value, ULOC_KEYWORD_AND_VALUES_CAPACITY, status); if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING) { @@ -702,7 +702,7 @@ LocaleDisplayNamesImpl::appendWithSep(UnicodeString& buffer, const UnicodeString } else { const UnicodeString *values[2] = { &buffer, &src }; UErrorCode status = U_ZERO_ERROR; - separatorFormat.formatAndReplace(values, 2, buffer, NULL, 0, status); + separatorFormat.formatAndReplace(values, 2, buffer, nullptr, 0, status); } return buffer; } @@ -724,7 +724,7 @@ LocaleDisplayNamesImpl::localeIdName(const char* localeId, } } langData.getNoFallback("Languages", localeId, result); - if (result.isBogus() && uprv_strchr(localeId, '_') == NULL) { + if (result.isBogus() && uprv_strchr(localeId, '_') == nullptr) { // Canonicalize lang and try again, ICU-20870 // (only for language codes without script or region) Locale canonLocale = Locale::createCanonical(localeId); @@ -747,7 +747,7 @@ LocaleDisplayNamesImpl::localeIdName(const char* localeId, UnicodeString& LocaleDisplayNamesImpl::languageDisplayName(const char* lang, UnicodeString& result) const { - if (uprv_strcmp("root", lang) == 0 || uprv_strchr(lang, '_') != NULL) { + if (uprv_strcmp("root", lang) == 0 || uprv_strchr(lang, '_') != nullptr) { return result = UnicodeString(lang, -1, US_INV); } if (nameLength == UDISPCTX_LENGTH_SHORT) { @@ -922,7 +922,7 @@ LocaleDisplayNames::createInstance(const Locale& locale, LocaleDisplayNames* LocaleDisplayNames::createInstance(const Locale& locale, UDisplayContext *contexts, int32_t length) { - if (contexts == NULL) { + if (contexts == nullptr) { length = 0; } return new LocaleDisplayNamesImpl(locale, contexts, length); @@ -941,7 +941,7 @@ uldn_open(const char * locale, if (U_FAILURE(*pErrorCode)) { return 0; } - if (locale == NULL) { + if (locale == nullptr) { locale = uloc_getDefault(); } return (ULocaleDisplayNames *)LocaleDisplayNames::createInstance(Locale(locale), dialectHandling); @@ -954,7 +954,7 @@ uldn_openForContext(const char * locale, if (U_FAILURE(*pErrorCode)) { return 0; } - if (locale == NULL) { + if (locale == nullptr) { locale = uloc_getDefault(); } return (ULocaleDisplayNames *)LocaleDisplayNames::createInstance(Locale(locale), contexts, length); @@ -971,7 +971,7 @@ uldn_getLocale(const ULocaleDisplayNames *ldn) { if (ldn) { return ((const LocaleDisplayNames *)ldn)->getLocale().getName(); } - return NULL; + return nullptr; } U_CAPI UDialectHandling U_EXPORT2 @@ -1001,7 +1001,7 @@ uldn_localeDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || locale == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || locale == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1023,7 +1023,7 @@ uldn_languageDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || lang == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || lang == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1041,7 +1041,7 @@ uldn_scriptDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || script == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || script == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1068,7 +1068,7 @@ uldn_regionDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || region == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || region == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1086,7 +1086,7 @@ uldn_variantDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || variant == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || variant == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1104,7 +1104,7 @@ uldn_keyDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || key == NULL || (result == NULL && maxResultSize > 0) || maxResultSize < 0) { + if (ldn == nullptr || key == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1123,7 +1123,7 @@ uldn_keyValueDisplayName(const ULocaleDisplayNames *ldn, if (U_FAILURE(*pErrorCode)) { return 0; } - if (ldn == NULL || key == NULL || value == NULL || (result == NULL && maxResultSize > 0) + if (ldn == nullptr || key == nullptr || value == nullptr || (result == nullptr && maxResultSize > 0) || maxResultSize < 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index 5cd083866c7..26ee5259067 100644 --- a/icu4c/source/common/locid.cpp +++ b/icu4c/source/common/locid.cpp @@ -63,13 +63,13 @@ U_CDECL_END U_NAMESPACE_BEGIN -static Locale *gLocaleCache = NULL; +static Locale *gLocaleCache = nullptr; static UInitOnce gLocaleCacheInitOnce {}; // gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and gDefaultLocale. static UMutex gDefaultLocaleMutex; -static UHashtable *gDefaultLocalesHashT = NULL; -static Locale *gDefaultLocale = NULL; +static UHashtable *gDefaultLocalesHashT = nullptr; +static Locale *gDefaultLocale = nullptr; /** * \def ULOC_STRING_LIMIT @@ -120,14 +120,14 @@ static UBool U_CALLCONV locale_cleanup(void) U_NAMESPACE_USE delete [] gLocaleCache; - gLocaleCache = NULL; + gLocaleCache = nullptr; gLocaleCacheInitOnce.reset(); if (gDefaultLocalesHashT) { uhash_close(gDefaultLocalesHashT); // Automatically deletes all elements, using deleter func. - gDefaultLocalesHashT = NULL; + gDefaultLocalesHashT = nullptr; } - gDefaultLocale = NULL; + gDefaultLocale = nullptr; return true; } @@ -135,9 +135,9 @@ static UBool U_CALLCONV locale_cleanup(void) static void U_CALLCONV locale_init(UErrorCode &status) { U_NAMESPACE_USE - U_ASSERT(gLocaleCache == NULL); + U_ASSERT(gLocaleCache == nullptr); gLocaleCache = new Locale[(int)eMAX_LOCALES]; - if (gLocaleCache == NULL) { + if (gLocaleCache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -173,11 +173,11 @@ Locale *locale_set_default_internal(const char *id, UErrorCode& status) { UBool canonicalize = false; - // If given a NULL string for the locale id, grab the default + // If given a nullptr string for the locale id, grab the default // name from the system. // (Different from most other locale APIs, where a null name means use // the current ICU default locale.) - if (id == NULL) { + if (id == nullptr) { id = uprv_getDefaultLocaleID(); // This function not thread safe? TODO: verify. canonicalize = true; // always canonicalize host ID } @@ -196,8 +196,8 @@ Locale *locale_set_default_internal(const char *id, UErrorCode& status) { return gDefaultLocale; } - if (gDefaultLocalesHashT == NULL) { - gDefaultLocalesHashT = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &status); + if (gDefaultLocalesHashT == nullptr) { + gDefaultLocalesHashT = uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &status); if (U_FAILURE(status)) { return gDefaultLocale; } @@ -206,9 +206,9 @@ Locale *locale_set_default_internal(const char *id, UErrorCode& status) { } Locale *newDefault = (Locale *)uhash_get(gDefaultLocalesHashT, localeNameBuf.data()); - if (newDefault == NULL) { + if (newDefault == nullptr) { newDefault = new Locale(Locale::eBOGUS); - if (newDefault == NULL) { + if (newDefault == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return gDefaultLocale; } @@ -257,19 +257,19 @@ Locale::~Locale() if ((baseName != fullName) && (baseName != fullNameBuffer)) { uprv_free(baseName); } - baseName = NULL; + baseName = nullptr; /*if fullName is on the heap, we free it*/ if (fullName != fullNameBuffer) { uprv_free(fullName); - fullName = NULL; + fullName = nullptr; } } Locale::Locale() - : UObject(), fullName(fullNameBuffer), baseName(NULL) + : UObject(), fullName(fullNameBuffer), baseName(nullptr) { - init(NULL, false); + init(nullptr, false); } /* @@ -278,7 +278,7 @@ Locale::Locale() * the default locale.) */ Locale::Locale(Locale::ELocaleType) - : UObject(), fullName(fullNameBuffer), baseName(NULL) + : UObject(), fullName(fullNameBuffer), baseName(nullptr) { setToBogus(); } @@ -288,11 +288,11 @@ Locale::Locale( const char * newLanguage, const char * newCountry, const char * newVariant, const char * newKeywords) - : UObject(), fullName(fullNameBuffer), baseName(NULL) + : UObject(), fullName(fullNameBuffer), baseName(nullptr) { - if( (newLanguage==NULL) && (newCountry == NULL) && (newVariant == NULL) ) + if( (newLanguage==nullptr) && (newCountry == nullptr) && (newVariant == nullptr) ) { - init(NULL, false); /* shortcut */ + init(nullptr, false); /* shortcut */ } else { @@ -305,7 +305,7 @@ Locale::Locale( const char * newLanguage, // Check the sizes of the input strings. // Language - if ( newLanguage != NULL ) + if ( newLanguage != nullptr ) { lsize = (int32_t)uprv_strlen(newLanguage); if ( lsize < 0 || lsize > ULOC_STRING_LIMIT ) { // int32 wrap @@ -317,7 +317,7 @@ Locale::Locale( const char * newLanguage, CharString togo(newLanguage, lsize, status); // start with newLanguage // _Country - if ( newCountry != NULL ) + if ( newCountry != nullptr ) { csize = (int32_t)uprv_strlen(newCountry); if ( csize < 0 || csize > ULOC_STRING_LIMIT ) { // int32 wrap @@ -327,7 +327,7 @@ Locale::Locale( const char * newLanguage, } // _Variant - if ( newVariant != NULL ) + if ( newVariant != nullptr ) { // remove leading _'s while(newVariant[0] == SEP_CHAR) @@ -347,7 +347,7 @@ Locale::Locale( const char * newLanguage, } } - if ( newKeywords != NULL) + if ( newKeywords != nullptr) { ksize = (int32_t)uprv_strlen(newKeywords); if ( ksize < 0 || ksize > ULOC_STRING_LIMIT ) { @@ -402,7 +402,7 @@ Locale::Locale( const char * newLanguage, } Locale::Locale(const Locale &other) - : UObject(other), fullName(fullNameBuffer), baseName(NULL) + : UObject(other), fullName(fullNameBuffer), baseName(nullptr) { *this = other; } @@ -1513,7 +1513,7 @@ AliasReplacer::replaceTransformedExtensions( CharString& transformedExtensions, CharString& output, UErrorCode& status) { // The content of the transformedExtensions will be modified in this - // function to NULL-terminating (tkey-tvalue) pairs. + // function to NUL-terminating (tkey-tvalue) pairs. if (U_FAILURE(status)) { return false; } @@ -1548,7 +1548,7 @@ AliasReplacer::replaceTransformedExtensions( } const char* nextTKey = ultag_getTKeyStart(tvalue); if (nextTKey != nullptr) { - *((char*)(nextTKey-1)) = '\0'; // NULL terminate tvalue + *((char*)(nextTKey-1)) = '\0'; // NUL terminate tvalue } tfields.insertElementAt((void*)tkey, tfields.size(), status); if (U_FAILURE(status)) { @@ -1570,7 +1570,7 @@ AliasReplacer::replaceTransformedExtensions( return false; } // Split the "tkey-tvalue" pair string so that we can canonicalize the tvalue. - *((char*)tvalue++) = '\0'; // NULL terminate tkey + *((char*)tvalue++) = '\0'; // NUL terminate tkey output.append(tfield, status).append('-', status); const char* bcpTValue = ulocimp_toBcpType(tfield, tvalue, nullptr, nullptr); output.append((bcpTValue == nullptr) ? tvalue : bcpTValue, status); @@ -1822,7 +1822,7 @@ Locale& Locale::init(const char* localeID, UBool canonicalize) if ((baseName != fullName) && (baseName != fullNameBuffer)) { uprv_free(baseName); } - baseName = NULL; + baseName = nullptr; if(fullName != fullNameBuffer) { uprv_free(fullName); fullName = fullNameBuffer; @@ -1840,7 +1840,7 @@ Locale& Locale::init(const char* localeID, UBool canonicalize) int32_t length; UErrorCode err; - if(localeID == NULL) { + if(localeID == nullptr) { // not an error, just set the default locale return *this = getDefault(); } @@ -1889,8 +1889,8 @@ Locale& Locale::init(const char* localeID, UBool canonicalize) // variant may contain @foo or .foo POSIX cruft; remove it separator = uprv_strchr(field[fieldIdx-1], '@'); char* sep2 = uprv_strchr(field[fieldIdx-1], '.'); - if (separator!=NULL || sep2!=NULL) { - if (separator==NULL || (sep2!=NULL && separator > sep2)) { + if (separator!=nullptr || sep2!=nullptr) { + if (separator==nullptr || (sep2!=nullptr && separator > sep2)) { separator = sep2; } fieldLen[fieldIdx-1] = (int32_t)(separator - field[fieldIdx-1]); @@ -1974,14 +1974,14 @@ Locale::initBaseName(UErrorCode &status) { if (U_FAILURE(status)) { return; } - U_ASSERT(baseName==NULL || baseName==fullName); + U_ASSERT(baseName==nullptr || baseName==fullName); const char *atPtr = uprv_strchr(fullName, '@'); const char *eqPtr = uprv_strchr(fullName, '='); if (atPtr && eqPtr && atPtr < eqPtr) { // Key words exist. int32_t baseNameLength = (int32_t)(atPtr - fullName); baseName = (char *)uprv_malloc(baseNameLength + 1); - if (baseName == NULL) { + if (baseName == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -2012,7 +2012,7 @@ Locale::setToBogus() { if((baseName != fullName) && (baseName != fullNameBuffer)) { uprv_free(baseName); } - baseName = NULL; + baseName = nullptr; if(fullName != fullNameBuffer) { uprv_free(fullName); fullName = fullNameBuffer; @@ -2030,12 +2030,12 @@ Locale::getDefault() { { Mutex lock(&gDefaultLocaleMutex); - if (gDefaultLocale != NULL) { + if (gDefaultLocale != nullptr) { return *gDefaultLocale; } } UErrorCode status = U_ZERO_ERROR; - return *locale_set_default_internal(NULL, status); + return *locale_set_default_internal(nullptr, status); } @@ -2381,12 +2381,12 @@ Locale::getLocale(int locid) { Locale *localeCache = getLocaleCache(); U_ASSERT((locid < eMAX_LOCALES)&&(locid>=0)); - if (localeCache == NULL) { + if (localeCache == nullptr) { // Failure allocating the locale cache. - // The best we can do is return a NULL reference. + // The best we can do is return a nullptr reference. locid = 0; } - return localeCache[locid]; /*operating on NULL*/ + return localeCache[locid]; /*operating on nullptr*/ } /* @@ -2416,11 +2416,11 @@ public: KeywordEnumeration(const char *keys, int32_t keywordLen, int32_t currentIndex, UErrorCode &status) : keywords((char *)&fgClassID), current((char *)&fgClassID), length(0) { if(U_SUCCESS(status) && keywordLen != 0) { - if(keys == NULL || keywordLen < 0) { + if(keys == nullptr || keywordLen < 0) { status = U_ILLEGAL_ARGUMENT_ERROR; } else { keywords = (char *)uprv_malloc(keywordLen+1); - if (keywords == NULL) { + if (keywords == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } else { @@ -2458,14 +2458,14 @@ public: result = current; len = (int32_t)uprv_strlen(current); current += len+1; - if(resultLength != NULL) { + if(resultLength != nullptr) { *resultLength = len; } } else { - if(resultLength != NULL) { + if(resultLength != nullptr) { *resultLength = 0; } - result = NULL; + result = nullptr; } return result; } @@ -2518,7 +2518,7 @@ UnicodeKeywordEnumeration::~UnicodeKeywordEnumeration() = default; StringEnumeration * Locale::createKeywords(UErrorCode &status) const { - StringEnumeration *result = NULL; + StringEnumeration *result = nullptr; if (U_FAILURE(status)) { return result; @@ -2547,7 +2547,7 @@ Locale::createKeywords(UErrorCode &status) const StringEnumeration * Locale::createUnicodeKeywords(UErrorCode &status) const { - StringEnumeration *result = NULL; + StringEnumeration *result = nullptr; if (U_FAILURE(status)) { return result; diff --git a/icu4c/source/common/loclikely.cpp b/icu4c/source/common/loclikely.cpp index ec0dca28a45..7806952af76 100644 --- a/icu4c/source/common/loclikely.cpp +++ b/icu4c/source/common/loclikely.cpp @@ -54,23 +54,23 @@ findLikelySubtags(const char* localeID, char* buffer, int32_t bufferLength, UErrorCode* err) { - const char* result = NULL; + const char* result = nullptr; if (!U_FAILURE(*err)) { int32_t resLen = 0; - const UChar* s = NULL; + const UChar* s = nullptr; UErrorCode tmpErr = U_ZERO_ERROR; - icu::LocalUResourceBundlePointer subtags(ures_openDirect(NULL, "likelySubtags", &tmpErr)); + icu::LocalUResourceBundlePointer subtags(ures_openDirect(nullptr, "likelySubtags", &tmpErr)); if (U_SUCCESS(tmpErr)) { icu::CharString und; - if (localeID != NULL) { + if (localeID != nullptr) { if (*localeID == '\0') { localeID = unknownLanguage; } else if (*localeID == '_') { und.append(unknownLanguage, *err); und.append(localeID, *err); if (U_FAILURE(*err)) { - return NULL; + return nullptr; } localeID = und.data(); } @@ -140,12 +140,12 @@ appendTag( /** * Create a tag string from the supplied parameters. The lang, script and region - * parameters may be NULL pointers. If they are, their corresponding length parameters + * parameters may be nullptr pointers. If they are, their corresponding length parameters * must be less than or equal to 0. * * If any of the language, script or region parameters are empty, and the alternateTags - * parameter is not NULL, it will be parsed for potential language, script and region tags - * to be used when constructing the new tag. If the alternateTags parameter is NULL, or + * parameter is not nullptr, it will be parsed for potential language, script and region tags + * to be used when constructing the new tag. If the alternateTags parameter is nullptr, or * it contains no language tag, the default tag for the unknown language is used. * * If the length of the new string exceeds the capacity of the output buffer, @@ -211,7 +211,7 @@ createTagStringWithAlternates( &tagLength, /*withSeparator=*/false); } - else if (alternateTags == NULL) { + else if (alternateTags == nullptr) { /* * Use the empty string for an unknown language, if * we found no language. @@ -258,7 +258,7 @@ createTagStringWithAlternates( &tagLength, /*withSeparator=*/true); } - else if (alternateTags != NULL) { + else if (alternateTags != nullptr) { /* * Parse the alternateTags string for the script. */ @@ -295,7 +295,7 @@ createTagStringWithAlternates( regionAppended = true; } - else if (alternateTags != NULL) { + else if (alternateTags != nullptr) { /* * Parse the alternateTags string for the region. */ @@ -362,7 +362,7 @@ error: /** * Create a tag string from the supplied parameters. The lang, script and region - * parameters may be NULL pointers. If they are, their corresponding length parameters + * parameters may be nullptr pointers. If they are, their corresponding length parameters * must be less than or equal to 0. If the lang parameter is an empty string, the * default value for an unknown language is written to the output buffer. * @@ -406,7 +406,7 @@ createTagString( regionLength, trailing, trailingLength, - NULL, + nullptr, sink, err); } @@ -454,13 +454,13 @@ parseTagString( int32_t subtagLength = 0; if(U_FAILURE(*err) || - localeID == NULL || - lang == NULL || - langLength == NULL || - script == NULL || - scriptLength == NULL || - region == NULL || - regionLength == NULL) { + localeID == nullptr || + lang == nullptr || + langLength == nullptr || + script == nullptr || + scriptLength == nullptr || + region == nullptr || + regionLength == nullptr) { goto error; } @@ -575,7 +575,7 @@ createLikelySubtagsString( **/ if (scriptLength > 0 && regionLength > 0) { - const char* likelySubtags = NULL; + const char* likelySubtags = nullptr; icu::CharString tagBuffer; { @@ -587,7 +587,7 @@ createLikelySubtagsString( scriptLength, region, regionLength, - NULL, + nullptr, 0, sink, err); @@ -606,16 +606,16 @@ createLikelySubtagsString( goto error; } - if (likelySubtags != NULL) { + if (likelySubtags != nullptr) { /* Always use the language tag from the maximal string, since it may be more specific than the one provided. */ createTagStringWithAlternates( - NULL, + nullptr, 0, - NULL, + nullptr, 0, - NULL, + nullptr, 0, variants, variantsLength, @@ -631,7 +631,7 @@ createLikelySubtagsString( **/ if (scriptLength > 0) { - const char* likelySubtags = NULL; + const char* likelySubtags = nullptr; icu::CharString tagBuffer; { @@ -641,9 +641,9 @@ createLikelySubtagsString( langLength, script, scriptLength, - NULL, + nullptr, 0, - NULL, + nullptr, 0, sink, err); @@ -662,14 +662,14 @@ createLikelySubtagsString( goto error; } - if (likelySubtags != NULL) { + if (likelySubtags != nullptr) { /* Always use the language tag from the maximal string, since it may be more specific than the one provided. */ createTagStringWithAlternates( - NULL, + nullptr, 0, - NULL, + nullptr, 0, region, regionLength, @@ -687,7 +687,7 @@ createLikelySubtagsString( **/ if (regionLength > 0) { - const char* likelySubtags = NULL; + const char* likelySubtags = nullptr; icu::CharString tagBuffer; { @@ -695,11 +695,11 @@ createLikelySubtagsString( createTagString( lang, langLength, - NULL, + nullptr, 0, region, regionLength, - NULL, + nullptr, 0, sink, err); @@ -718,16 +718,16 @@ createLikelySubtagsString( goto error; } - if (likelySubtags != NULL) { + if (likelySubtags != nullptr) { /* Always use the language tag from the maximal string, since it may be more specific than the one provided. */ createTagStringWithAlternates( - NULL, + nullptr, 0, script, scriptLength, - NULL, + nullptr, 0, variants, variantsLength, @@ -742,7 +742,7 @@ createLikelySubtagsString( * Finally, try just the language. **/ { - const char* likelySubtags = NULL; + const char* likelySubtags = nullptr; icu::CharString tagBuffer; { @@ -750,11 +750,11 @@ createLikelySubtagsString( createTagString( lang, langLength, - NULL, + nullptr, 0, - NULL, + nullptr, 0, - NULL, + nullptr, 0, sink, err); @@ -773,12 +773,12 @@ createLikelySubtagsString( goto error; } - if (likelySubtags != NULL) { + if (likelySubtags != nullptr) { /* Always use the language tag from the maximal string, since it may be more specific than the one provided. */ createTagStringWithAlternates( - NULL, + nullptr, 0, script, scriptLength, @@ -841,7 +841,7 @@ _uloc_addLikelySubtags(const char* localeID, if(U_FAILURE(*err)) { goto error; } - if (localeID == NULL) { + if (localeID == nullptr) { goto error; } @@ -930,7 +930,7 @@ _uloc_minimizeSubtags(const char* localeID, if(U_FAILURE(*err)) { goto error; } - else if (localeID == NULL) { + else if (localeID == nullptr) { goto error; } @@ -974,7 +974,7 @@ _uloc_minimizeSubtags(const char* localeID, scriptLength, region, regionLength, - NULL, + nullptr, 0, baseSink, err); @@ -1031,11 +1031,11 @@ _uloc_minimizeSubtags(const char* localeID, createLikelySubtagsString( lang, langLength, - NULL, + nullptr, 0, - NULL, + nullptr, 0, - NULL, + nullptr, 0, tagSink, err); @@ -1053,9 +1053,9 @@ _uloc_minimizeSubtags(const char* localeID, createTagString( lang, langLength, - NULL, + nullptr, 0, - NULL, + nullptr, 0, trailing, trailingLength, @@ -1076,11 +1076,11 @@ _uloc_minimizeSubtags(const char* localeID, createLikelySubtagsString( lang, langLength, - NULL, + nullptr, 0, region, regionLength, - NULL, + nullptr, 0, tagSink, err); @@ -1098,7 +1098,7 @@ _uloc_minimizeSubtags(const char* localeID, createTagString( lang, langLength, - NULL, + nullptr, 0, region, regionLength, @@ -1124,9 +1124,9 @@ _uloc_minimizeSubtags(const char* localeID, langLength, script, scriptLength, - NULL, + nullptr, 0, - NULL, + nullptr, 0, tagSink, err); @@ -1146,7 +1146,7 @@ _uloc_minimizeSubtags(const char* localeID, langLength, script, scriptLength, - NULL, + nullptr, 0, trailing, trailingLength, @@ -1324,7 +1324,7 @@ uloc_isRightToLeft(const char *locale) { } if (langLength > 0) { const char* langPtr = uprv_strstr(LANG_DIR_STRING, lang); - if (langPtr != NULL) { + if (langPtr != nullptr) { switch (langPtr[langLength]) { case '-': return false; case '+': return true; diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp index 78cfd1ca86b..7a0e90e8bd9 100644 --- a/icu4c/source/common/locmap.cpp +++ b/icu4c/source/common/locmap.cpp @@ -1054,7 +1054,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr uint16_t langID; uint32_t localeIndex; UBool bLookup = true; - const char *pPosixID = NULL; + const char *pPosixID = nullptr; #if U_PLATFORM_HAS_WIN32_API && UCONFIG_USE_WINDOWS_LCID_MAPPING_API static_assert(ULOC_FULLNAME_CAPACITY > LOCALE_NAME_MAX_LENGTH, "Windows locale names have smaller length than ICU locale names."); @@ -1110,7 +1110,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr #endif if (bLookup) { - const char *pCandidate = NULL; + const char *pCandidate = nullptr; langID = LANGUAGE_LCID(hostid); for (localeIndex = 0; localeIndex < gLocaleCount; localeIndex++) { @@ -1123,7 +1123,7 @@ uprv_convertToPosix(uint32_t hostid, char *posixID, int32_t posixIDCapacity, UEr /* On Windows, when locale name has a variant, we still look up the hardcoded table. If a match in the hardcoded table is longer than the Windows locale name without variant, we use the one as the result */ - if (pCandidate && (pPosixID == NULL || uprv_strlen(pCandidate) > uprv_strlen(pPosixID))) { + if (pCandidate && (pPosixID == nullptr || uprv_strlen(pCandidate) > uprv_strlen(pPosixID))) { pPosixID = pCandidate; } } diff --git a/icu4c/source/common/locresdata.cpp b/icu4c/source/common/locresdata.cpp index d1d9a4729f1..018c7000404 100644 --- a/icu4c/source/common/locresdata.cpp +++ b/icu4c/source/common/locresdata.cpp @@ -49,7 +49,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, UErrorCode *pErrorCode) { /* char localeBuffer[ULOC_FULLNAME_CAPACITY*4];*/ - const UChar *item=NULL; + const UChar *item=nullptr; UErrorCode errorCode; char explicitFallbackName[ULOC_FULLNAME_CAPACITY] = {0}; @@ -63,7 +63,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, if(U_FAILURE(errorCode)) { /* total failure, not even root could be opened */ *pErrorCode=errorCode; - return NULL; + return nullptr; } else if(errorCode==U_USING_DEFAULT_WARNING || (errorCode==U_USING_FALLBACK_WARNING && *pErrorCode!=U_USING_DEFAULT_WARNING) ) { @@ -76,7 +76,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, icu::StackUResourceBundle subTable; ures_getByKeyWithFallback(rb.getAlias(), tableKey, table.getAlias(), &errorCode); - if (subTableKey != NULL) { + if (subTableKey != nullptr) { /* ures_getByKeyWithFallback(table.getAlias(), subTableKey, subTable.getAlias(), &errorCode); item = ures_getStringByKeyWithFallback(subTable.getAlias(), itemKey, pLength, &errorCode); @@ -91,7 +91,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, if(U_SUCCESS(errorCode)){ item = ures_getStringByKeyWithFallback(table.getAlias(), itemKey, pLength, &errorCode); if(U_FAILURE(errorCode)){ - const char* replacement = NULL; + const char* replacement = nullptr; *pErrorCode = errorCode; /*save the errorCode*/ errorCode = U_ZERO_ERROR; /* may be a deprecated code */ @@ -101,7 +101,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, replacement = uloc_getCurrentLanguageID(itemKey); } /*pointer comparison is ok since uloc_getCurrentCountryID & uloc_getCurrentLanguageID return the key itself is replacement is not found*/ - if(replacement!=NULL && itemKey != replacement){ + if(replacement!=nullptr && itemKey != replacement){ item = ures_getStringByKeyWithFallback(table.getAlias(), replacement, pLength, &errorCode); if(U_SUCCESS(errorCode)){ *pErrorCode = errorCode; @@ -117,7 +117,7 @@ uloc_getTableStringWithFallback(const char *path, const char *locale, /* still can't figure out ?.. try the fallback mechanism */ int32_t len = 0; - const UChar* fallbackLocale = NULL; + const UChar* fallbackLocale = nullptr; *pErrorCode = errorCode; errorCode = U_ZERO_ERROR; @@ -164,10 +164,10 @@ _uloc_getOrientationHelper(const char* localeId, if (!U_FAILURE(*status)) { const UChar* const value = uloc_getTableStringWithFallback( - NULL, + nullptr, localeBuffer, "layout", - NULL, + nullptr, key, &length, status); diff --git a/icu4c/source/common/locutil.cpp b/icu4c/source/common/locutil.cpp index 6e2bd497f81..690221a003b 100644 --- a/icu4c/source/common/locutil.cpp +++ b/icu4c/source/common/locutil.cpp @@ -22,7 +22,7 @@ // see LocaleUtility::getAvailableLocaleNames static icu::UInitOnce LocaleUtilityInitOnce {}; -static icu::Hashtable * LocaleUtility_cache = NULL; +static icu::Hashtable * LocaleUtility_cache = nullptr; #define UNDERSCORE_CHAR ((UChar)0x005f) #define AT_SIGN_CHAR ((UChar)64) @@ -39,7 +39,7 @@ U_CDECL_BEGIN static UBool U_CALLCONV service_cleanup(void) { if (LocaleUtility_cache) { delete LocaleUtility_cache; - LocaleUtility_cache = NULL; + LocaleUtility_cache = nullptr; } return true; } @@ -47,15 +47,15 @@ static UBool U_CALLCONV service_cleanup(void) { static void U_CALLCONV locale_utility_init(UErrorCode &status) { using namespace icu; - U_ASSERT(LocaleUtility_cache == NULL); + U_ASSERT(LocaleUtility_cache == nullptr); ucln_common_registerCleanup(UCLN_COMMON_SERVICE, service_cleanup); LocaleUtility_cache = new Hashtable(status); if (U_FAILURE(status)) { delete LocaleUtility_cache; - LocaleUtility_cache = NULL; + LocaleUtility_cache = nullptr; return; } - if (LocaleUtility_cache == NULL) { + if (LocaleUtility_cache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -69,7 +69,7 @@ U_NAMESPACE_BEGIN UnicodeString& LocaleUtility::canonicalLocaleString(const UnicodeString* id, UnicodeString& result) { - if (id == NULL) { + if (id == nullptr) { result.setToBogus(); } else { // Fix case only (no other changes) up to the first '@' or '.' or @@ -214,45 +214,45 @@ LocaleUtility::getAvailableLocaleNames(const UnicodeString& bundleID) UErrorCode status = U_ZERO_ERROR; umtx_initOnce(LocaleUtilityInitOnce, locale_utility_init, status); Hashtable *cache = LocaleUtility_cache; - if (cache == NULL) { + if (cache == nullptr) { // Catastrophic failure. - return NULL; + return nullptr; } Hashtable* htp; - umtx_lock(NULL); + umtx_lock(nullptr); htp = (Hashtable*) cache->get(bundleID); - umtx_unlock(NULL); + umtx_unlock(nullptr); - if (htp == NULL) { + if (htp == nullptr) { htp = new Hashtable(status); if (htp && U_SUCCESS(status)) { CharString cbundleID; cbundleID.appendInvariantChars(bundleID, status); - const char* path = cbundleID.isEmpty() ? NULL : cbundleID.data(); + const char* path = cbundleID.isEmpty() ? nullptr : cbundleID.data(); icu::LocalUEnumerationPointer uenum(ures_openAvailableLocales(path, &status)); for (;;) { - const UChar* id = uenum_unext(uenum.getAlias(), NULL, &status); - if (id == NULL) { + const UChar* id = uenum_unext(uenum.getAlias(), nullptr, &status); + if (id == nullptr) { break; } htp->put(UnicodeString(id), (void*)htp, status); } if (U_FAILURE(status)) { delete htp; - return NULL; + return nullptr; } - umtx_lock(NULL); + umtx_lock(nullptr); Hashtable *t = static_cast(cache->get(bundleID)); - if (t != NULL) { + if (t != nullptr) { // Another thread raced through this code, creating the cache entry first. // Discard ours and return theirs. - umtx_unlock(NULL); + umtx_unlock(nullptr); delete htp; htp = t; } else { cache->put(bundleID, (void*)htp, status); - umtx_unlock(NULL); + umtx_unlock(nullptr); } } } diff --git a/icu4c/source/common/messagepattern.cpp b/icu4c/source/common/messagepattern.cpp index 52afab5f026..dd4f5f8ccc9 100644 --- a/icu4c/source/common/messagepattern.cpp +++ b/icu4c/source/common/messagepattern.cpp @@ -112,7 +112,7 @@ MessagePatternList::copyFrom( int32_t length, UErrorCode &errorCode) { if(U_SUCCESS(errorCode) && length>0) { - if(length>a.getCapacity() && NULL==a.resize(length)) { + if(length>a.getCapacity() && nullptr==a.resize(length)) { errorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -126,7 +126,7 @@ MessagePatternList::ensureCapacityForOneMore(int32_t oldLength if(U_FAILURE(errorCode)) { return false; } - if(a.getCapacity()>oldLength || a.resize(2*oldLength, oldLength)!=NULL) { + if(a.getCapacity()>oldLength || a.resize(2*oldLength, oldLength)!=nullptr) { return true; } errorCode=U_MEMORY_ALLOCATION_ERROR; @@ -145,24 +145,24 @@ class MessagePatternPartsList : public MessagePatternList0) { - if(numericValuesList==NULL) { + if(numericValuesList==nullptr) { numericValuesList=new MessagePatternDoubleList(); - if(numericValuesList==NULL) { + if(numericValuesList==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return false; } @@ -407,7 +407,7 @@ MessagePattern::preParse(const UnicodeString &pattern, UParseError *parseError, if(U_FAILURE(errorCode)) { return; } - if(parseError!=NULL) { + if(parseError!=nullptr) { parseError->line=0; parseError->offset=0; parseError->preContext[0]=0; @@ -422,10 +422,10 @@ MessagePattern::preParse(const UnicodeString &pattern, UParseError *parseError, void MessagePattern::postParse() { - if(partsList!=NULL) { + if(partsList!=nullptr) { parts=partsList->a.getAlias(); } - if(numericValuesList!=NULL) { + if(numericValuesList!=nullptr) { numericValues=numericValuesList->a.getAlias(); } } @@ -1127,9 +1127,9 @@ MessagePattern::addArgDoublePart(double numericValue, int32_t start, int32_t len return; } int32_t numericIndex=numericValuesLength; - if(numericValuesList==NULL) { + if(numericValuesList==nullptr) { numericValuesList=new MessagePatternDoubleList(); - if(numericValuesList==NULL) { + if(numericValuesList==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -1147,7 +1147,7 @@ MessagePattern::addArgDoublePart(double numericValue, int32_t start, int32_t len void MessagePattern::setParseError(UParseError *parseError, int32_t index) { - if(parseError==NULL) { + if(parseError==nullptr) { return; } parseError->offset=index; diff --git a/icu4c/source/common/norm2allmodes.h b/icu4c/source/common/norm2allmodes.h index 584835da57b..c07f6b71ae9 100644 --- a/icu4c/source/common/norm2allmodes.h +++ b/icu4c/source/common/norm2allmodes.h @@ -44,7 +44,7 @@ public: return dest; } const UChar *sArray=src.getBuffer(); - if(&dest==&src || sArray==NULL) { + if(&dest==&src || sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; dest.setToBogus(); return dest; @@ -83,7 +83,7 @@ public: return first; } const UChar *secondArray=second.getBuffer(); - if(&first==&second || secondArray==NULL) { + if(&first==&second || secondArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return first; } @@ -111,7 +111,7 @@ public: UChar buffer[4]; int32_t length; const UChar *d=impl.getDecomposition(c, buffer, length); - if(d==NULL) { + if(d==nullptr) { return false; } if(d==buffer) { @@ -126,7 +126,7 @@ public: UChar buffer[30]; int32_t length; const UChar *d=impl.getRawDecomposition(c, buffer, length); - if(d==NULL) { + if(d==nullptr) { return false; } if(d==buffer) { @@ -153,7 +153,7 @@ public: return false; } const UChar *sArray=s.getBuffer(); - if(sArray==NULL) { + if(sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return false; } @@ -170,7 +170,7 @@ public: return 0; } const UChar *sArray=s.getBuffer(); - if(sArray==NULL) { + if(sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -230,7 +230,7 @@ private: virtual const UChar * spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const U_OVERRIDE { - return impl.decompose(src, limit, NULL, errorCode); + return impl.decompose(src, limit, nullptr, errorCode); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const U_OVERRIDE { @@ -289,7 +289,7 @@ private: return false; } const UChar *sArray=s.getBuffer(); - if(sArray==NULL) { + if(sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return false; } @@ -314,7 +314,7 @@ private: return UNORM_MAYBE; } const UChar *sArray=s.getBuffer(); - if(sArray==NULL) { + if(sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return UNORM_MAYBE; } @@ -324,7 +324,7 @@ private: } virtual const UChar * spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const U_OVERRIDE { - return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); + return impl.composeQuickCheck(src, limit, onlyContiguous, nullptr); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const U_OVERRIDE { @@ -363,7 +363,7 @@ private: } virtual const UChar * spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const U_OVERRIDE { - return impl.makeFCD(src, limit, NULL, errorCode); + return impl.makeFCD(src, limit, nullptr, errorCode); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. virtual UBool hasBoundaryBefore(UChar32 c) const U_OVERRIDE { diff --git a/icu4c/source/common/normalizer2.cpp b/icu4c/source/common/normalizer2.cpp index 3617264490e..22e1ed6711b 100644 --- a/icu4c/source/common/normalizer2.cpp +++ b/icu4c/source/common/normalizer2.cpp @@ -190,7 +190,7 @@ static void U_CALLCONV initNoopSingleton(UErrorCode &errorCode) { return; } noopSingleton=new NoopNormalizer2; - if(noopSingleton==NULL) { + if(noopSingleton==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -198,7 +198,7 @@ static void U_CALLCONV initNoopSingleton(UErrorCode &errorCode) { } const Normalizer2 *Normalizer2Factory::getNoopInstance(UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } umtx_initOnce(noopInitOnce, &initNoopSingleton, errorCode); return noopSingleton; } @@ -216,13 +216,13 @@ Norm2AllModes * Norm2AllModes::createInstance(Normalizer2Impl *impl, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { delete impl; - return NULL; + return nullptr; } Norm2AllModes *allModes=new Norm2AllModes(impl); - if(allModes==NULL) { + if(allModes==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; delete impl; - return NULL; + return nullptr; } return allModes; } @@ -231,12 +231,12 @@ Norm2AllModes::createInstance(Normalizer2Impl *impl, UErrorCode &errorCode) { Norm2AllModes * Norm2AllModes::createNFCInstance(UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } Normalizer2Impl *impl=new Normalizer2Impl; - if(impl==NULL) { + if(impl==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } impl->init(norm2_nfc_data_indexes, &norm2_nfc_data_trie, norm2_nfc_data_extraData, norm2_nfc_data_smallFCD); @@ -254,7 +254,7 @@ static void U_CALLCONV initNFCSingleton(UErrorCode &errorCode) { const Norm2AllModes * Norm2AllModes::getNFCInstance(UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } umtx_initOnce(nfcInitOnce, &initNFCSingleton, errorCode); return nfcSingleton; } @@ -262,29 +262,29 @@ Norm2AllModes::getNFCInstance(UErrorCode &errorCode) { const Normalizer2 * Normalizer2::getNFCInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->comp : NULL; + return allModes!=nullptr ? &allModes->comp : nullptr; } const Normalizer2 * Normalizer2::getNFDInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->decomp : NULL; + return allModes!=nullptr ? &allModes->decomp : nullptr; } const Normalizer2 *Normalizer2Factory::getFCDInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->fcd : NULL; + return allModes!=nullptr ? &allModes->fcd : nullptr; } const Normalizer2 *Normalizer2Factory::getFCCInstance(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? &allModes->fcc : NULL; + return allModes!=nullptr ? &allModes->fcc : nullptr; } const Normalizer2Impl * Normalizer2Factory::getNFCImpl(UErrorCode &errorCode) { const Norm2AllModes *allModes=Norm2AllModes::getNFCInstance(errorCode); - return allModes!=NULL ? allModes->impl : NULL; + return allModes!=nullptr ? allModes->impl : nullptr; } #endif // NORM2_HARDCODE_NFC_DATA @@ -292,11 +292,11 @@ U_CDECL_BEGIN static UBool U_CALLCONV uprv_normalizer2_cleanup() { delete noopSingleton; - noopSingleton = NULL; + noopSingleton = nullptr; noopInitOnce.reset(); #if NORM2_HARDCODE_NFC_DATA delete nfcSingleton; - nfcSingleton = NULL; + nfcSingleton = nullptr; nfcInitOnce.reset(); #endif return true; @@ -333,23 +333,23 @@ unorm2_normalize(const UNormalizer2 *norm2, if(U_FAILURE(*pErrorCode)) { return 0; } - if( (src==NULL ? length!=0 : length<-1) || - (dest==NULL ? capacity!=0 : capacity<0) || - (src==dest && src!=NULL) + if( (src==nullptr ? length!=0 : length<-1) || + (dest==nullptr ? capacity!=0 : capacity<0) || + (src==dest && src!=nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } UnicodeString destString(dest, 0, capacity); - // length==0: Nothing to do, and n2wi->normalize(NULL, NULL, buffer, ...) would crash. + // length==0: Nothing to do, and n2wi->normalize(nullptr, nullptr, buffer, ...) would crash. if(length!=0) { const Normalizer2 *n2=(const Normalizer2 *)norm2; const Normalizer2WithImpl *n2wi=dynamic_cast(n2); - if(n2wi!=NULL) { + if(n2wi!=nullptr) { // Avoid duplicate argument checking and support NUL-terminated src. ReorderingBuffer buffer(n2wi->impl, destString); if(buffer.init(length, *pErrorCode)) { - n2wi->normalize(src, length>=0 ? src+length : NULL, buffer, *pErrorCode); + n2wi->normalize(src, length>=0 ? src+length : nullptr, buffer, *pErrorCode); } } else { UnicodeString srcString(length<0, src, length); @@ -368,27 +368,27 @@ normalizeSecondAndAppend(const UNormalizer2 *norm2, if(U_FAILURE(*pErrorCode)) { return 0; } - if( (second==NULL ? secondLength!=0 : secondLength<-1) || - (first==NULL ? (firstCapacity!=0 || firstLength!=0) : + if( (second==nullptr ? secondLength!=0 : secondLength<-1) || + (first==nullptr ? (firstCapacity!=0 || firstLength!=0) : (firstCapacity<0 || firstLength<-1)) || - (first==second && first!=NULL) + (first==second && first!=nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } UnicodeString firstString(first, firstLength, firstCapacity); firstLength=firstString.length(); // In case it was -1. - // secondLength==0: Nothing to do, and n2wi->normalizeAndAppend(NULL, NULL, buffer, ...) would crash. + // secondLength==0: Nothing to do, and n2wi->normalizeAndAppend(nullptr, nullptr, buffer, ...) would crash. if(secondLength!=0) { const Normalizer2 *n2=(const Normalizer2 *)norm2; const Normalizer2WithImpl *n2wi=dynamic_cast(n2); - if(n2wi!=NULL) { + if(n2wi!=nullptr) { // Avoid duplicate argument checking and support NUL-terminated src. UnicodeString safeMiddle; { ReorderingBuffer buffer(n2wi->impl, firstString); if(buffer.init(firstLength+secondLength+1, *pErrorCode)) { // destCapacity>=-1 - n2wi->normalizeAndAppend(second, secondLength>=0 ? second+secondLength : NULL, + n2wi->normalizeAndAppend(second, secondLength>=0 ? second+secondLength : nullptr, doNormalize, safeMiddle, buffer, *pErrorCode); } } // The ReorderingBuffer destructor finalizes firstString. @@ -396,7 +396,7 @@ normalizeSecondAndAppend(const UNormalizer2 *norm2, // Restore the modified suffix of the first string. // This does not restore first[] array contents between firstLength and firstCapacity. // (That might be uninitialized memory, as far as we know.) - if(first!=NULL) { /* don't dereference NULL */ + if(first!=nullptr) { /* don't dereference nullptr */ safeMiddle.extract(0, 0x7fffffff, first+firstLength-safeMiddle.length()); if(firstLengthappendZeroCC(prevSrc, src, errorCode); } } @@ -555,7 +555,7 @@ Normalizer2Impl::decompose(const UnicodeString &src, UnicodeString &dest, return dest; } const UChar *sArray=src.getBuffer(); - if(&dest==&src || sArray==NULL) { + if(&dest==&src || sArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; dest.setToBogus(); return dest; @@ -569,7 +569,7 @@ Normalizer2Impl::decompose(const UChar *src, const UChar *limit, UnicodeString &dest, int32_t destLengthEstimate, UErrorCode &errorCode) const { - if(destLengthEstimate<0 && limit!=NULL) { + if(destLengthEstimate<0 && limit!=nullptr) { destLengthEstimate=(int32_t)(limit-src); } dest.remove(); @@ -580,14 +580,14 @@ Normalizer2Impl::decompose(const UChar *src, const UChar *limit, } // Dual functionality: -// buffer!=NULL: normalize -// buffer==NULL: isNormalized/spanQuickCheckYes +// buffer!=nullptr: normalize +// buffer==nullptr: isNormalized/spanQuickCheckYes const UChar * Normalizer2Impl::decompose(const UChar *src, const UChar *limit, ReorderingBuffer *buffer, UErrorCode &errorCode) const { UChar32 minNoCP=minDecompNoCP; - if(limit==NULL) { + if(limit==nullptr) { src=copyLowPrefixFromNulTerminated(src, minNoCP, buffer, errorCode); if(U_FAILURE(errorCode)) { return src; @@ -629,7 +629,7 @@ Normalizer2Impl::decompose(const UChar *src, const UChar *limit, } // copy these code units all at once if(src!=prevSrc) { - if(buffer!=NULL) { + if(buffer!=nullptr) { if(!buffer->appendZeroCC(prevSrc, src, errorCode)) { break; } @@ -644,7 +644,7 @@ Normalizer2Impl::decompose(const UChar *src, const UChar *limit, // Check one above-minimum, relevant code point. src+=U16_LENGTH(c); - if(buffer!=NULL) { + if(buffer!=nullptr) { if(!decompose(c, norm16, *buffer, errorCode)) { break; } @@ -982,7 +982,7 @@ Normalizer2Impl::getRawDecomposition(UChar32 c, UChar buffer[30], int32_t &lengt uint16_t norm16; if(c=0) { // The starter and the combining mark (c) do combine. @@ -1346,7 +1346,7 @@ void Normalizer2Impl::recompose(ReorderingBuffer &buffer, int32_t recomposeStart compositionsList= getCompositionsListForComposite(getRawNorm16(composite)); } else { - compositionsList=NULL; + compositionsList=nullptr; } // We combined; continue with looking for compositions. @@ -1363,7 +1363,7 @@ void Normalizer2Impl::recompose(ReorderingBuffer &buffer, int32_t recomposeStart // If c did not combine, then check if it is a starter. if(cc==0) { // Found a new starter. - if((compositionsList=getCompositionsListForDecompYes(norm16))!=NULL) { + if((compositionsList=getCompositionsListForDecompYes(norm16))!=nullptr) { // It may combine with something, prepare for it. if(U_IS_BMP(c)) { starterIsSupplementary=false; @@ -1375,7 +1375,7 @@ void Normalizer2Impl::recompose(ReorderingBuffer &buffer, int32_t recomposeStart } } else if(onlyContiguous) { // FCC: no discontiguous compositions; any intervening character blocks. - compositionsList=NULL; + compositionsList=nullptr; } } buffer.setReorderingLimit(limit); @@ -1442,9 +1442,9 @@ Normalizer2Impl::compose(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { const UChar *prevBoundary=src; UChar32 minNoMaybeCP=minCompNoMaybeCP; - if(limit==NULL) { + if(limit==nullptr) { src=copyLowPrefixFromNulTerminated(src, minNoMaybeCP, - doCompose ? &buffer : NULL, + doCompose ? &buffer : nullptr, errorCode); if(U_FAILURE(errorCode)) { return false; @@ -1703,17 +1703,17 @@ Normalizer2Impl::compose(const UChar *src, const UChar *limit, } // Very similar to compose(): Make the same changes in both places if relevant. -// pQCResult==NULL: spanQuickCheckYes -// pQCResult!=NULL: quickCheck (*pQCResult must be UNORM_YES) +// pQCResult==nullptr: spanQuickCheckYes +// pQCResult!=nullptr: quickCheck (*pQCResult must be UNORM_YES) const UChar * Normalizer2Impl::composeQuickCheck(const UChar *src, const UChar *limit, UBool onlyContiguous, UNormalizationCheckResult *pQCResult) const { const UChar *prevBoundary=src; UChar32 minNoMaybeCP=minCompNoMaybeCP; - if(limit==NULL) { + if(limit==nullptr) { UErrorCode errorCode=U_ZERO_ERROR; - src=copyLowPrefixFromNulTerminated(src, minNoMaybeCP, NULL, errorCode); + src=copyLowPrefixFromNulTerminated(src, minNoMaybeCP, nullptr, errorCode); limit=u_strchr(src, 0); if (prevBoundary != src) { if (hasCompBoundaryAfter(*(src-1), onlyContiguous)) { @@ -1821,7 +1821,7 @@ Normalizer2Impl::composeQuickCheck(const UChar *src, const UChar *limit, } } } - if(pQCResult!=NULL) { + if(pQCResult!=nullptr) { *pQCResult=UNORM_NO; } return prevBoundary; @@ -1856,7 +1856,7 @@ void Normalizer2Impl::composeAndAppend(const UChar *src, const UChar *limit, if(doCompose) { compose(src, limit, onlyContiguous, true, buffer, errorCode); } else { - if(limit==NULL) { // appendZeroCC() needs limit!=NULL + if(limit==nullptr) { // appendZeroCC() needs limit!=nullptr limit=u_strchr(src, 0); } buffer.appendZeroCC(src, limit, errorCode); @@ -2267,8 +2267,8 @@ uint16_t Normalizer2Impl::getFCD16FromNormData(UChar32 c) const { #endif // Dual functionality: -// buffer!=NULL: normalize -// buffer==NULL: isNormalized/quickCheck/spanQuickCheckYes +// buffer!=nullptr: normalize +// buffer==nullptr: isNormalized/quickCheck/spanQuickCheckYes const UChar * Normalizer2Impl::makeFCD(const UChar *src, const UChar *limit, ReorderingBuffer *buffer, @@ -2277,7 +2277,7 @@ Normalizer2Impl::makeFCD(const UChar *src, const UChar *limit, // Similar to the prevBoundary in the compose() implementation. const UChar *prevBoundary=src; int32_t prevFCD16=0; - if(limit==NULL) { + if(limit==nullptr) { src=copyLowPrefixFromNulTerminated(src, minLcccCP, buffer, errorCode); if(U_FAILURE(errorCode)) { return src; @@ -2330,7 +2330,7 @@ Normalizer2Impl::makeFCD(const UChar *src, const UChar *limit, } // copy these code units all at once if(src!=prevSrc) { - if(buffer!=NULL && !buffer->appendZeroCC(prevSrc, src, errorCode)) { + if(buffer!=nullptr && !buffer->appendZeroCC(prevSrc, src, errorCode)) { break; } if(src==limit) { @@ -2376,12 +2376,12 @@ Normalizer2Impl::makeFCD(const UChar *src, const UChar *limit, if((fcd16&0xff)<=1) { prevBoundary=src; } - if(buffer!=NULL && !buffer->appendZeroCC(c, errorCode)) { + if(buffer!=nullptr && !buffer->appendZeroCC(c, errorCode)) { break; } prevFCD16=fcd16; continue; - } else if(buffer==NULL) { + } else if(buffer==nullptr) { return prevBoundary; // quick check "no" } else { /* @@ -2436,7 +2436,7 @@ void Normalizer2Impl::makeFCDAndAppend(const UChar *src, const UChar *limit, if(doMakeFCD) { makeFCD(src, limit, &buffer, errorCode); } else { - if(limit==NULL) { // appendZeroCC() needs limit!=NULL + if(limit==nullptr) { // appendZeroCC() needs limit!=nullptr limit=u_strchr(src, 0); } buffer.appendZeroCC(src, limit, errorCode); @@ -2479,7 +2479,7 @@ const UChar *Normalizer2Impl::findNextFCDBoundary(const UChar *p, const UChar *l CanonIterData::CanonIterData(UErrorCode &errorCode) : mutableTrie(umutablecptrie_open(0, 0, &errorCode)), trie(nullptr), - canonStartSets(uprv_deleteUObject, NULL, errorCode) {} + canonStartSets(uprv_deleteUObject, nullptr, errorCode) {} CanonIterData::~CanonIterData() { umutablecptrie_close(mutableTrie); @@ -2535,9 +2535,9 @@ initCanonIterData(Normalizer2Impl *impl, UErrorCode &errorCode) { U_CDECL_END void InitCanonIterData::doInit(Normalizer2Impl *impl, UErrorCode &errorCode) { - U_ASSERT(impl->fCanonIterData == NULL); + U_ASSERT(impl->fCanonIterData == nullptr); impl->fCanonIterData = new CanonIterData(errorCode); - if (impl->fCanonIterData == NULL) { + if (impl->fCanonIterData == nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } if (U_SUCCESS(errorCode)) { @@ -2562,7 +2562,7 @@ void InitCanonIterData::doInit(Normalizer2Impl *impl, UErrorCode &errorCode) { } if (U_FAILURE(errorCode)) { delete impl->fCanonIterData; - impl->fCanonIterData = NULL; + impl->fCanonIterData = nullptr; } } @@ -2710,7 +2710,7 @@ unorm2_swap(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } diff --git a/icu4c/source/common/normlzr.cpp b/icu4c/source/common/normlzr.cpp index 58de61591f8..52b9ffd54a3 100644 --- a/icu4c/source/common/normlzr.cpp +++ b/icu4c/source/common/normlzr.cpp @@ -38,7 +38,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Normalizer) //------------------------------------------------------------------------- Normalizer::Normalizer(const UnicodeString& str, UNormalizationMode mode) : - UObject(), fFilteredNorm2(NULL), fNorm2(NULL), fUMode(mode), fOptions(0), + UObject(), fFilteredNorm2(nullptr), fNorm2(nullptr), fUMode(mode), fOptions(0), text(new StringCharacterIterator(str)), currentIndex(0), nextIndex(0), buffer(), bufferPos(0) @@ -47,7 +47,7 @@ Normalizer::Normalizer(const UnicodeString& str, UNormalizationMode mode) : } Normalizer::Normalizer(ConstChar16Ptr str, int32_t length, UNormalizationMode mode) : - UObject(), fFilteredNorm2(NULL), fNorm2(NULL), fUMode(mode), fOptions(0), + UObject(), fFilteredNorm2(nullptr), fNorm2(nullptr), fUMode(mode), fOptions(0), text(new UCharCharacterIterator(str, length)), currentIndex(0), nextIndex(0), buffer(), bufferPos(0) @@ -56,7 +56,7 @@ Normalizer::Normalizer(ConstChar16Ptr str, int32_t length, UNormalizationMode mo } Normalizer::Normalizer(const CharacterIterator& iter, UNormalizationMode mode) : - UObject(), fFilteredNorm2(NULL), fNorm2(NULL), fUMode(mode), fOptions(0), + UObject(), fFilteredNorm2(nullptr), fNorm2(nullptr), fUMode(mode), fOptions(0), text(iter.clone()), currentIndex(0), nextIndex(0), buffer(), bufferPos(0) @@ -65,7 +65,7 @@ Normalizer::Normalizer(const CharacterIterator& iter, UNormalizationMode mode) : } Normalizer::Normalizer(const Normalizer ©) : - UObject(copy), fFilteredNorm2(NULL), fNorm2(NULL), fUMode(copy.fUMode), fOptions(copy.fOptions), + UObject(copy), fFilteredNorm2(nullptr), fNorm2(nullptr), fUMode(copy.fUMode), fOptions(copy.fOptions), text(copy.text->clone()), currentIndex(copy.currentIndex), nextIndex(copy.nextIndex), buffer(copy.buffer), bufferPos(copy.bufferPos) @@ -410,7 +410,7 @@ Normalizer::setText(const UnicodeString& newText, return; } CharacterIterator *newIter = new StringCharacterIterator(newText); - if (newIter == NULL) { + if (newIter == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -431,7 +431,7 @@ Normalizer::setText(const CharacterIterator& newText, return; } CharacterIterator *newIter = newText.clone(); - if (newIter == NULL) { + if (newIter == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -449,7 +449,7 @@ Normalizer::setText(ConstChar16Ptr newText, return; } CharacterIterator *newIter = new UCharCharacterIterator(newText, length); - if (newIter == NULL) { + if (newIter == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } diff --git a/icu4c/source/common/pluralmap.cpp b/icu4c/source/common/pluralmap.cpp index ec87f0198e1..7e6156de89c 100644 --- a/icu4c/source/common/pluralmap.cpp +++ b/icu4c/source/common/pluralmap.cpp @@ -36,7 +36,7 @@ PluralMapBase::toCategory(const UnicodeString &pluralForm) { const char *PluralMapBase::getCategoryName(Category c) { int32_t index = c; return (index < 0 || index >= UPRV_LENGTHOF(gPluralForms)) ? - NULL : gPluralForms[index]; + nullptr : gPluralForms[index]; } diff --git a/icu4c/source/common/pluralmap.h b/icu4c/source/common/pluralmap.h index 4988fd2699f..11683599edd 100644 --- a/icu4c/source/common/pluralmap.h +++ b/icu4c/source/common/pluralmap.h @@ -53,7 +53,7 @@ public: /** * Converts a category to a name. - * Passing NONE or CATEGORY_COUNT for category returns NULL. + * Passing NONE or CATEGORY_COUNT for category returns nullptr. */ static const char *getCategoryName(Category category); }; @@ -89,7 +89,7 @@ public: fVariants[0] = &fOtherVariant; for (int32_t i = 1; i < UPRV_LENGTHOF(fVariants); ++i) { fVariants[i] = other.fVariants[i] ? - new T(*other.fVariants[i]) : NULL; + new T(*other.fVariants[i]) : nullptr; } } @@ -98,12 +98,12 @@ public: return *this; } for (int32_t i = 0; i < UPRV_LENGTHOF(fVariants); ++i) { - if (fVariants[i] != NULL && other.fVariants[i] != NULL) { + if (fVariants[i] != nullptr && other.fVariants[i] != nullptr) { *fVariants[i] = *other.fVariants[i]; - } else if (fVariants[i] != NULL) { + } else if (fVariants[i] != nullptr) { delete fVariants[i]; - fVariants[i] = NULL; - } else if (other.fVariants[i] != NULL) { + fVariants[i] = nullptr; + } else if (other.fVariants[i] != nullptr) { fVariants[i] = new T(*other.fVariants[i]); } else { // do nothing @@ -125,28 +125,28 @@ public: *fVariants[0] = T(); for (int32_t i = 1; i < UPRV_LENGTHOF(fVariants); ++i) { delete fVariants[i]; - fVariants[i] = NULL; + fVariants[i] = nullptr; } } /** * Iterates through the mappings in this instance, set index to NONE * prior to using. Call next repeatedly to get the values until it - * returns NULL. Each time next returns, caller may pass index + * returns nullptr. Each time next returns, caller may pass index * to getCategoryName() to get the name of the plural category. - * When this function returns NULL, index is CATEGORY_COUNT + * When this function returns nullptr, index is CATEGORY_COUNT */ const T *next(Category &index) const { int32_t idx = index; ++idx; for (; idx < UPRV_LENGTHOF(fVariants); ++idx) { - if (fVariants[idx] != NULL) { + if (fVariants[idx] != nullptr) { index = static_cast(idx); return fVariants[idx]; } } index = static_cast(idx); - return NULL; + return nullptr; } /** @@ -172,7 +172,7 @@ public: */ const T &get(Category v) const { int32_t index = v; - if (index < 0 || index >= UPRV_LENGTHOF(fVariants) || fVariants[index] == NULL) { + if (index < 0 || index >= UPRV_LENGTHOF(fVariants) || fVariants[index] == nullptr) { return *fVariants[0]; } return *fVariants[index]; @@ -207,7 +207,7 @@ public: T *getMutable( Category category, UErrorCode &status) { - return getMutable(category, NULL, status); + return getMutable(category, nullptr, status); } /** @@ -218,7 +218,7 @@ public: T *getMutable( const char *category, UErrorCode &status) { - return getMutable(toCategory(category), NULL, status); + return getMutable(toCategory(category), nullptr, status); } /** @@ -243,7 +243,7 @@ public: if (fVariants[i] == rhs.fVariants[i]) { continue; } - if (fVariants[i] == NULL || rhs.fVariants[i] == NULL) { + if (fVariants[i] == nullptr || rhs.fVariants[i] == nullptr) { return false; } if (!eqFunc(*fVariants[i], *rhs.fVariants[i])) { @@ -262,15 +262,15 @@ private: const T *defaultValue, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } int32_t index = category; if (index < 0 || index >= UPRV_LENGTHOF(fVariants)) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if (fVariants[index] == NULL) { - fVariants[index] = defaultValue == NULL ? + if (fVariants[index] == nullptr) { + fVariants[index] = defaultValue == nullptr ? new T() : new T(*defaultValue); } if (!fVariants[index]) { @@ -282,7 +282,7 @@ private: void initializeNew() { fVariants[0] = &fOtherVariant; for (int32_t i = 1; i < UPRV_LENGTHOF(fVariants); ++i) { - fVariants[i] = NULL; + fVariants[i] = nullptr; } } }; diff --git a/icu4c/source/common/propname.cpp b/icu4c/source/common/propname.cpp index 8f0045fdac5..89ce2ff8f49 100644 --- a/icu4c/source/common/propname.cpp +++ b/icu4c/source/common/propname.cpp @@ -204,20 +204,20 @@ int32_t PropNameData::findPropertyValueNameGroup(int32_t valueMapIndex, int32_t const char *PropNameData::getName(const char *nameGroup, int32_t nameIndex) { int32_t numNames=*nameGroup++; if(nameIndex<0 || numNames<=nameIndex) { - return NULL; + return nullptr; } // Skip nameIndex names. for(; nameIndex>0; --nameIndex) { nameGroup=uprv_strchr(nameGroup, 0)+1; } if(*nameGroup==0) { - return NULL; // no name (Property[Value]Aliases.txt has "n/a") + return nullptr; // no name (Property[Value]Aliases.txt has "n/a") } return nameGroup; } UBool PropNameData::containsName(BytesTrie &trie, const char *name) { - if(name==NULL) { + if(name==nullptr) { return false; } UStringTrieResult result=USTRINGTRIE_NO_VALUE; @@ -239,7 +239,7 @@ UBool PropNameData::containsName(BytesTrie &trie, const char *name) { const char *PropNameData::getPropertyName(int32_t property, int32_t nameChoice) { int32_t valueMapIndex=findProperty(property); if(valueMapIndex==0) { - return NULL; // Not a known property. + return nullptr; // Not a known property. } return getName(nameGroups+valueMaps[valueMapIndex], nameChoice); } @@ -247,11 +247,11 @@ const char *PropNameData::getPropertyName(int32_t property, int32_t nameChoice) const char *PropNameData::getPropertyValueName(int32_t property, int32_t value, int32_t nameChoice) { int32_t valueMapIndex=findProperty(property); if(valueMapIndex==0) { - return NULL; // Not a known property. + return nullptr; // Not a known property. } int32_t nameGroupOffset=findPropertyValueNameGroup(valueMaps[valueMapIndex+1], value); if(nameGroupOffset==0) { - return NULL; + return nullptr; } return getName(nameGroups+nameGroupOffset, nameChoice); } diff --git a/icu4c/source/common/propsvec.cpp b/icu4c/source/common/propsvec.cpp index e5caa4b9d2c..18cc3e8cd8e 100644 --- a/icu4c/source/common/propsvec.cpp +++ b/icu4c/source/common/propsvec.cpp @@ -47,21 +47,21 @@ upvec_open(int32_t columns, UErrorCode *pErrorCode) { uint32_t cp; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } if(columns<1) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } columns+=2; /* count range start and limit columns */ pv=(UPropsVectors *)uprv_malloc(sizeof(UPropsVectors)); v=(uint32_t *)uprv_malloc(UPVEC_INITIAL_ROWS*columns*4); - if(pv==NULL || v==NULL) { + if(pv==nullptr || v==nullptr) { uprv_free(pv); uprv_free(v); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(pv, 0, sizeof(UPropsVectors)); pv->v=v; @@ -85,7 +85,7 @@ upvec_open(int32_t columns, UErrorCode *pErrorCode) { U_CAPI void U_EXPORT2 upvec_close(UPropsVectors *pv) { - if(pv!=NULL) { + if(pv!=nullptr) { uprv_free(pv->v); uprv_free(pv); } @@ -165,7 +165,7 @@ upvec_setValue(UPropsVectors *pv, if(U_FAILURE(*pErrorCode)) { return; } - if( pv==NULL || + if( pv==nullptr || start<0 || start>end || end>UPVEC_MAX_CP || column<0 || column>=(pv->columns-2) ) { @@ -216,7 +216,7 @@ upvec_setValue(UPropsVectors *pv, return; } newVectors=(uint32_t *)uprv_malloc(newMaxRows*columns*4); - if(newVectors==NULL) { + if(newVectors==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -296,15 +296,15 @@ upvec_getRow(const UPropsVectors *pv, int32_t rowIndex, int32_t columns; if(pv->isCompacted || rowIndex<0 || rowIndex>=pv->rows) { - return NULL; + return nullptr; } columns=pv->columns; row=pv->v+rowIndex*columns; - if(pRangeStart!=NULL) { + if(pRangeStart!=nullptr) { *pRangeStart=(UChar32)row[0]; } - if(pRangeEnd!=NULL) { + if(pRangeEnd!=nullptr) { *pRangeEnd=(UChar32)row[1]-1; } return row+2; @@ -342,7 +342,7 @@ upvec_compact(UPropsVectors *pv, UPVecCompactHandler *handler, void *context, UE if(U_FAILURE(*pErrorCode)) { return; } - if(handler==NULL) { + if(handler==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -437,12 +437,12 @@ upvec_compact(UPropsVectors *pv, UPVecCompactHandler *handler, void *context, UE U_CAPI const uint32_t * U_EXPORT2 upvec_getArray(const UPropsVectors *pv, int32_t *pRows, int32_t *pColumns) { if(!pv->isCompacted) { - return NULL; + return nullptr; } - if(pRows!=NULL) { + if(pRows!=nullptr) { *pRows=pv->rows; } - if(pColumns!=NULL) { + if(pColumns!=nullptr) { *pColumns=pv->columns-2; } return pv->v; @@ -455,23 +455,23 @@ upvec_cloneArray(const UPropsVectors *pv, int32_t byteLength; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } if(!pv->isCompacted) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } byteLength=pv->rows*(pv->columns-2)*4; clonedArray=(uint32_t *)uprv_malloc(byteLength); - if(clonedArray==NULL) { + if(clonedArray==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(clonedArray, pv->v, byteLength); - if(pRows!=NULL) { + if(pRows!=nullptr) { *pRows=pv->rows; } - if(pColumns!=NULL) { + if(pColumns!=nullptr) { *pColumns=pv->columns-2; } return clonedArray; @@ -479,12 +479,12 @@ upvec_cloneArray(const UPropsVectors *pv, U_CAPI UTrie2 * U_EXPORT2 upvec_compactToUTrie2WithRowIndexes(UPropsVectors *pv, UErrorCode *pErrorCode) { - UPVecToUTrie2Context toUTrie2={ NULL, 0, 0, 0 }; + UPVecToUTrie2Context toUTrie2={ nullptr, 0, 0, 0 }; upvec_compact(pv, upvec_compactToUTrie2Handler, &toUTrie2, pErrorCode); utrie2_freeze(toUTrie2.trie, UTRIE2_16_VALUE_BITS, pErrorCode); if(U_FAILURE(*pErrorCode)) { utrie2_close(toUTrie2.trie); - toUTrie2.trie=NULL; + toUTrie2.trie=nullptr; } return toUTrie2.trie; } diff --git a/icu4c/source/common/punycode.cpp b/icu4c/source/common/punycode.cpp index f95722da27d..7e2a870200d 100644 --- a/icu4c/source/common/punycode.cpp +++ b/icu4c/source/common/punycode.cpp @@ -189,11 +189,11 @@ u_strToPunycode(const UChar *src, int32_t srcLength, UChar c, c2; /* argument checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(src==NULL || srcLength<-1 || (dest==NULL && destCapacity!=0)) { + if(src==nullptr || srcLength<-1 || (dest==nullptr && destCapacity!=0)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -221,13 +221,13 @@ u_strToPunycode(const UChar *src, int32_t srcLength, cpBuffer[srcCPCount++]=0; if(destLength /* Needed to search through system timezone files */ #endif static char gTimeZoneBuffer[PATH_MAX]; -static char *gTimeZoneBufferPtr = NULL; +static char *gTimeZoneBufferPtr = nullptr; #endif #if !U_PLATFORM_USES_ONLY_WIN32_API @@ -879,7 +879,7 @@ static const char* remapShortTimeZone(const char *stdID, const char *dstID, int3 return OFFSET_ZONE_MAPPINGS[idx].olsonID; } } - return NULL; + return nullptr; } #endif @@ -907,14 +907,14 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil char bufferFile[MAX_READ_SIZE]; UBool result = true; - if (tzInfo->defaultTZFilePtr == NULL) { + if (tzInfo->defaultTZFilePtr == nullptr) { tzInfo->defaultTZFilePtr = fopen(defaultTZFileName, "r"); } file = fopen(TZFileName, "r"); tzInfo->defaultTZPosition = 0; /* reset position to begin search */ - if (file != NULL && tzInfo->defaultTZFilePtr != NULL) { + if (file != nullptr && tzInfo->defaultTZFilePtr != nullptr) { /* First check that the file size are equal. */ if (tzInfo->defaultTZFileSize == 0) { fseek(tzInfo->defaultTZFilePtr, 0, SEEK_END); @@ -930,7 +930,7 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil /* Store the data from the files in separate buffers and * compare each byte to determine equality. */ - if (tzInfo->defaultTZBuffer == NULL) { + if (tzInfo->defaultTZBuffer == nullptr) { rewind(tzInfo->defaultTZFilePtr); tzInfo->defaultTZBuffer = (char*)uprv_malloc(sizeof(char) * tzInfo->defaultTZFileSize); sizeFileRead = fread(tzInfo->defaultTZBuffer, 1, tzInfo->defaultTZFileSize, tzInfo->defaultTZFilePtr); @@ -953,7 +953,7 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil result = false; } - if (file != NULL) { + if (file != nullptr) { fclose(file); } @@ -965,16 +965,16 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil #define SKIP1 "." #define SKIP2 ".." static UBool U_CALLCONV putil_cleanup(void); -static CharString *gSearchTZFileResult = NULL; +static CharString *gSearchTZFileResult = nullptr; /* * This method recursively traverses the directory given for a matching TZ file and returns the first match. * This function is not thread safe - it uses a global, gSearchTZFileResult, to hold its results. */ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) { - DIR* dirp = NULL; - struct dirent* dirEntry = NULL; - char* result = NULL; + DIR* dirp = nullptr; + struct dirent* dirEntry = nullptr; + char* result = nullptr; UErrorCode status = U_ZERO_ERROR; /* Save the current path */ @@ -984,20 +984,20 @@ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) { } dirp = opendir(path); - if (dirp == NULL) { + if (dirp == nullptr) { goto cleanupAndReturn; } - if (gSearchTZFileResult == NULL) { + if (gSearchTZFileResult == nullptr) { gSearchTZFileResult = new CharString; - if (gSearchTZFileResult == NULL) { + if (gSearchTZFileResult == nullptr) { goto cleanupAndReturn; } ucln_common_registerCleanup(UCLN_COMMON_PUTIL, putil_cleanup); } /* Check each entry in the directory. */ - while((dirEntry = readdir(dirp)) != NULL) { + while((dirEntry = readdir(dirp)) != nullptr) { const char* dirName = dirEntry->d_name; if (uprv_strcmp(dirName, SKIP1) != 0 && uprv_strcmp(dirName, SKIP2) != 0 && uprv_strcmp(TZFILE_SKIP, dirName) != 0 && uprv_strcmp(TZFILE_SKIP2, dirName) != 0) { @@ -1008,8 +1008,8 @@ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) { break; } - DIR* subDirp = NULL; - if ((subDirp = opendir(newpath.data())) != NULL) { + DIR* subDirp = nullptr; + if ((subDirp = opendir(newpath.data())) != nullptr) { /* If this new path is a directory, make a recursive call with the newpath. */ closedir(subDirp); newpath.append('/', status); @@ -1021,11 +1021,11 @@ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) { Have to get out here. Otherwise, we'd keep looking and return the first match in the top-level directory if there's a match in the top-level. If not, this function - would return NULL and set gTimeZoneBufferPtr to NULL in initDefault(). + would return nullptr and set gTimeZoneBufferPtr to nullptr in initDefault(). It worked without this in most cases because we have a fallback of calling localtime_r to figure out the default timezone. */ - if (result != NULL) + if (result != nullptr) break; } else { if(compareBinaryFiles(TZDEFAULT, newpath.data(), tzInfo)) { @@ -1104,7 +1104,7 @@ uprv_tzname_clear_cache(void) #endif #if defined(CHECK_LOCALTIME_LINK) && !defined(DEBUG_SKIP_LOCALTIME_LINK) - gTimeZoneBufferPtr = NULL; + gTimeZoneBufferPtr = nullptr; #endif } @@ -1112,11 +1112,11 @@ U_CAPI const char* U_EXPORT2 uprv_tzname(int n) { (void)n; // Avoid unreferenced parameter warning. - const char *tzid = NULL; + const char *tzid = nullptr; #if U_PLATFORM_USES_ONLY_WIN32_API tzid = uprv_detectWindowsTimeZone(); - if (tzid != NULL) { + if (tzid != nullptr) { return tzid; } @@ -1134,7 +1134,7 @@ uprv_tzname(int n) int ret; tzid = getenv("TZFILE"); - if (tzid != NULL) { + if (tzid != nullptr) { return tzid; } #endif*/ @@ -1146,7 +1146,7 @@ uprv_tzname(int n) #else tzid = getenv("TZ"); #endif - if (tzid != NULL && isValidOlsonID(tzid) + if (tzid != nullptr && isValidOlsonID(tzid) #if U_PLATFORM == U_PF_SOLARIS /* Don't misinterpret TZ "localtime" on Solaris as a time zone name. */ && uprv_strcmp(tzid, TZ_ENV_CHECK) != 0 @@ -1165,7 +1165,7 @@ uprv_tzname(int n) #if defined(CHECK_LOCALTIME_LINK) && !defined(DEBUG_SKIP_LOCALTIME_LINK) /* Caller must handle threading issues */ - if (gTimeZoneBufferPtr == NULL) { + if (gTimeZoneBufferPtr == nullptr) { /* This is a trick to look at the name of the link to get the Olson ID because the tzfile contents is underspecified. @@ -1177,7 +1177,7 @@ uprv_tzname(int n) gTimeZoneBuffer[ret] = 0; char * tzZoneInfoTailPtr = uprv_strstr(gTimeZoneBuffer, TZZONEINFOTAIL); - if (tzZoneInfoTailPtr != NULL + if (tzZoneInfoTailPtr != nullptr && isValidOlsonID(tzZoneInfoTailPtr + tzZoneInfoTailLen)) { return (gTimeZoneBufferPtr = tzZoneInfoTailPtr + tzZoneInfoTailLen); @@ -1185,26 +1185,26 @@ uprv_tzname(int n) } else { #if defined(SEARCH_TZFILE) DefaultTZInfo* tzInfo = (DefaultTZInfo*)uprv_malloc(sizeof(DefaultTZInfo)); - if (tzInfo != NULL) { - tzInfo->defaultTZBuffer = NULL; + if (tzInfo != nullptr) { + tzInfo->defaultTZBuffer = nullptr; tzInfo->defaultTZFileSize = 0; - tzInfo->defaultTZFilePtr = NULL; + tzInfo->defaultTZFilePtr = nullptr; tzInfo->defaultTZstatus = false; tzInfo->defaultTZPosition = 0; gTimeZoneBufferPtr = searchForTZFile(TZZONEINFO, tzInfo); /* Free previously allocated memory */ - if (tzInfo->defaultTZBuffer != NULL) { + if (tzInfo->defaultTZBuffer != nullptr) { uprv_free(tzInfo->defaultTZBuffer); } - if (tzInfo->defaultTZFilePtr != NULL) { + if (tzInfo->defaultTZFilePtr != nullptr) { fclose(tzInfo->defaultTZFilePtr); } uprv_free(tzInfo); } - if (gTimeZoneBufferPtr != NULL && isValidOlsonID(gTimeZoneBufferPtr)) { + if (gTimeZoneBufferPtr != nullptr && isValidOlsonID(gTimeZoneBufferPtr)) { return gTimeZoneBufferPtr; } #endif @@ -1247,7 +1247,7 @@ uprv_tzname(int n) daylightType = U_DAYLIGHT_NONE; } tzid = remapShortTimeZone(U_TZNAME[0], U_TZNAME[1], daylightType, uprv_timezone()); - if (tzid != NULL) { + if (tzid != nullptr) { return tzid; } } @@ -1261,13 +1261,13 @@ uprv_tzname(int n) /* Get and set the ICU data directory --------------------------------------- */ static icu::UInitOnce gDataDirInitOnce {}; -static char *gDataDirectory = NULL; +static char *gDataDirectory = nullptr; UInitOnce gTimeZoneFilesInitOnce {}; -static CharString *gTimeZoneFilesDirectory = NULL; +static CharString *gTimeZoneFilesDirectory = nullptr; #if U_POSIX_LOCALE || U_PLATFORM_USES_ONLY_WIN32_API - static const char *gCorrectedPOSIXLocale = NULL; /* Sometimes heap allocated */ + static const char *gCorrectedPOSIXLocale = nullptr; /* Sometimes heap allocated */ static bool gCorrectedPOSIXLocaleHeapAllocated = false; #endif @@ -1276,22 +1276,22 @@ static UBool U_CALLCONV putil_cleanup(void) if (gDataDirectory && *gDataDirectory) { uprv_free(gDataDirectory); } - gDataDirectory = NULL; + gDataDirectory = nullptr; gDataDirInitOnce.reset(); delete gTimeZoneFilesDirectory; - gTimeZoneFilesDirectory = NULL; + gTimeZoneFilesDirectory = nullptr; gTimeZoneFilesInitOnce.reset(); #ifdef SEARCH_TZFILE delete gSearchTZFileResult; - gSearchTZFileResult = NULL; + gSearchTZFileResult = nullptr; #endif #if U_POSIX_LOCALE || U_PLATFORM_USES_ONLY_WIN32_API if (gCorrectedPOSIXLocale && gCorrectedPOSIXLocaleHeapAllocated) { uprv_free(const_cast(gCorrectedPOSIXLocale)); - gCorrectedPOSIXLocale = NULL; + gCorrectedPOSIXLocale = nullptr; gCorrectedPOSIXLocaleHeapAllocated = false; } #endif @@ -1307,9 +1307,9 @@ u_setDataDirectory(const char *directory) { char *newDataDir; int32_t length; - if(directory==NULL || *directory==0) { + if(directory==nullptr || *directory==0) { /* A small optimization to prevent the malloc and copy when the - shared library is used, and this is a way to make sure that NULL + shared library is used, and this is a way to make sure that nullptr is never returned. */ newDataDir = (char *)""; @@ -1318,7 +1318,7 @@ u_setDataDirectory(const char *directory) { length=(int32_t)uprv_strlen(directory); newDataDir = (char *)uprv_malloc(length + 2); /* Exit out if newDataDir could not be created. */ - if (newDataDir == NULL) { + if (newDataDir == nullptr) { return; } uprv_strcpy(newDataDir, directory); @@ -1326,7 +1326,7 @@ u_setDataDirectory(const char *directory) { #if (U_FILE_SEP_CHAR != U_FILE_ALT_SEP_CHAR) { char *p; - while((p = uprv_strchr(newDataDir, U_FILE_ALT_SEP_CHAR)) != NULL) { + while((p = uprv_strchr(newDataDir, U_FILE_ALT_SEP_CHAR)) != nullptr) { *p = U_FILE_SEP_CHAR; } } @@ -1419,7 +1419,7 @@ static void U_CALLCONV dataDirectoryInitFn() { return; } - const char *path = NULL; + const char *path = nullptr; #if defined(ICU_DATA_DIR_PREFIX_ENV_VAR) char datadir_path_buffer[PATH_MAX]; #endif @@ -1452,7 +1452,7 @@ static void U_CALLCONV dataDirectoryInitFn() { * set their own path. */ #if defined(ICU_DATA_DIR) || defined(U_ICU_DATA_DEFAULT_DIR) - if(path==NULL || *path==0) { + if(path==nullptr || *path==0) { # if defined(ICU_DATA_DIR_PREFIX_ENV_VAR) const char *prefix = getenv(ICU_DATA_DIR_PREFIX_ENV_VAR); # endif @@ -1462,7 +1462,7 @@ static void U_CALLCONV dataDirectoryInitFn() { path=U_ICU_DATA_DEFAULT_DIR; # endif # if defined(ICU_DATA_DIR_PREFIX_ENV_VAR) - if (prefix != NULL) { + if (prefix != nullptr) { snprintf(datadir_path_buffer, sizeof(datadir_path_buffer), "%s%s", prefix, path); path=datadir_path_buffer; } @@ -1477,7 +1477,7 @@ static void U_CALLCONV dataDirectoryInitFn() { } #endif - if(path==NULL) { + if(path==nullptr) { /* It looks really bad, set it to something. */ path = ""; } @@ -1500,7 +1500,7 @@ static void setTimeZoneFilesDir(const char *path, UErrorCode &status) { gTimeZoneFilesDirectory->append(path, status); #if (U_FILE_SEP_CHAR != U_FILE_ALT_SEP_CHAR) char *p = gTimeZoneFilesDirectory->data(); - while ((p = uprv_strchr(p, U_FILE_ALT_SEP_CHAR)) != NULL) { + while ((p = uprv_strchr(p, U_FILE_ALT_SEP_CHAR)) != nullptr) { *p = U_FILE_SEP_CHAR; } #endif @@ -1510,10 +1510,10 @@ static void setTimeZoneFilesDir(const char *path, UErrorCode &status) { #define TO_STRING_2(x) #x static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) { - U_ASSERT(gTimeZoneFilesDirectory == NULL); + U_ASSERT(gTimeZoneFilesDirectory == nullptr); ucln_common_registerCleanup(UCLN_COMMON_PUTIL, putil_cleanup); gTimeZoneFilesDirectory = new CharString(); - if (gTimeZoneFilesDirectory == NULL) { + if (gTimeZoneFilesDirectory == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1541,18 +1541,18 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) { #endif // U_PLATFORM_HAS_WINUWP_API #if defined(U_TIMEZONE_FILES_DIR) - if (dir == NULL) { + if (dir == nullptr) { // Build time configuration setting. dir = TO_STRING(U_TIMEZONE_FILES_DIR); } #endif - if (dir == NULL) { + if (dir == nullptr) { dir = ""; } #if defined(ICU_TIMEZONE_FILES_DIR_PREFIX_ENV_VAR) - if (prefix != NULL) { + if (prefix != nullptr) { snprintf(timezonefilesdir_path_buffer, sizeof(timezonefilesdir_path_buffer), "%s%s", prefix, dir); dir = timezonefilesdir_path_buffer; } @@ -1586,7 +1586,7 @@ u_setTimeZoneFilesDirectory(const char *path, UErrorCode *status) { */ static const char *uprv_getPOSIXIDForCategory(int category) { - const char* posixID = NULL; + const char* posixID = nullptr; if (category == LC_MESSAGES || category == LC_CTYPE) { /* * On Solaris two different calls to setlocale can result in @@ -1596,7 +1596,7 @@ static const char *uprv_getPOSIXIDForCategory(int category) * * LC_ALL can't be used because it's platform dependent. The LANG * environment variable seems to affect LC_CTYPE variable by default. - * Here is what setlocale(LC_ALL, NULL) can return. + * Here is what setlocale(LC_ALL, nullptr) can return. * HPUX can return 'C C C C C C C' * Solaris can return /en_US/C/C/C/C/C on the second try. * Linux can return LC_CTYPE=C;LC_NUMERIC=C;... @@ -1604,9 +1604,9 @@ static const char *uprv_getPOSIXIDForCategory(int category) * The default codepage detection also needs to use LC_CTYPE. * * Do not call setlocale(LC_*, "")! Using an empty string instead - * of NULL, will modify the libc behavior. + * of nullptr, will modify the libc behavior. */ - posixID = setlocale(category, NULL); + posixID = setlocale(category, nullptr); if ((posixID == 0) || (uprv_strcmp("C", posixID) == 0) || (uprv_strcmp("POSIX", posixID) == 0)) @@ -1649,7 +1649,7 @@ static const char *uprv_getPOSIXIDForCategory(int category) */ static const char *uprv_getPOSIXIDForDefaultLocale(void) { - static const char* posixID = NULL; + static const char* posixID = nullptr; if (posixID == 0) { posixID = uprv_getPOSIXIDForCategory(LC_MESSAGES); } @@ -1662,7 +1662,7 @@ static const char *uprv_getPOSIXIDForDefaultLocale(void) */ static const char *uprv_getPOSIXIDForDefaultCodepage(void) { - static const char* posixID = NULL; + static const char* posixID = nullptr; if (posixID == 0) { posixID = uprv_getPOSIXIDForCategory(LC_CTYPE); } @@ -1861,16 +1861,16 @@ The leftmost codepage (.xxx) wins. const char *localeID = getenv("LC_ALL"); char *p; - if (localeID == NULL) + if (localeID == nullptr) localeID = getenv("LANG"); - if (localeID == NULL) - localeID = setlocale(LC_ALL, NULL); + if (localeID == nullptr) + localeID = setlocale(LC_ALL, nullptr); /* Make sure we have something... */ - if (localeID == NULL) + if (localeID == nullptr) return "en_US_POSIX"; /* Extract the locale name from the path. */ - if((p = uprv_strrchr(localeID, '/')) != NULL) + if((p = uprv_strrchr(localeID, '/')) != nullptr) { /* Increment p to start of locale name. */ p++; @@ -1881,7 +1881,7 @@ The leftmost codepage (.xxx) wins. uprv_strcpy(correctedLocale, localeID); /* Strip off the '.locale' extension. */ - if((p = uprv_strchr(correctedLocale, '.')) != NULL) { + if((p = uprv_strchr(correctedLocale, '.')) != nullptr) { *p = 0; } @@ -1961,12 +1961,12 @@ names to the ICU alias table in the data directory. */ static const char* remapPlatformDependentCodepage(const char *locale, const char *name) { - if (locale != NULL && *locale == 0) { + if (locale != nullptr && *locale == 0) { /* Make sure that an empty locale is handled the same way. */ - locale = NULL; + locale = nullptr; } - if (name == NULL) { - return NULL; + if (name == nullptr) { + return nullptr; } #if U_PLATFORM == U_PF_AIX if (uprv_strcmp(name, "IBM-943") == 0) { @@ -1978,7 +1978,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { name = "IBM-5348"; } #elif U_PLATFORM == U_PF_SOLARIS - if (locale != NULL && uprv_strcmp(name, "EUC") == 0) { + if (locale != nullptr && uprv_strcmp(name, "EUC") == 0) { /* Solaris underspecifies the "EUC" name. */ if (uprv_strcmp(locale, "zh_CN") == 0) { name = "EUC-CN"; @@ -2005,7 +2005,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { name = "ISO-8859-1"; } #elif U_PLATFORM_IS_DARWIN_BASED - if (locale == NULL && *name == 0) { + if (locale == nullptr && *name == 0) { /* No locale was specified, and an empty name was passed in. This usually indicates that nl_langinfo didn't return valid information. @@ -2017,7 +2017,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { /* Remap CP949 to a similar codepage to avoid issues with backslash and won symbol. */ name = "EUC-KR"; } - else if (locale != NULL && uprv_strcmp(locale, "en_US_POSIX") != 0 && uprv_strcmp(name, "US-ASCII") == 0) { + else if (locale != nullptr && uprv_strcmp(locale, "en_US_POSIX") != 0 && uprv_strcmp(name, "US-ASCII") == 0) { /* * For non C/POSIX locale, default the code page to UTF-8 instead of US-ASCII. */ @@ -2029,7 +2029,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { name = "EUC-KR"; } #elif U_PLATFORM == U_PF_HPUX - if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) { + if (locale != nullptr && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) { /* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */ /* zh_TW.big5 is not the same charset as zh_HK.big5! */ name = "hkbig5"; @@ -2043,7 +2043,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { name = "eucjis"; } #elif U_PLATFORM == U_PF_LINUX - if (locale != NULL && uprv_strcmp(name, "euc") == 0) { + if (locale != nullptr && uprv_strcmp(name, "euc") == 0) { /* Linux underspecifies the "EUC" name. */ if (uprv_strcmp(locale, "korean") == 0) { name = "EUC-KR"; @@ -2061,7 +2061,7 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { */ name = "eucjis"; } - else if (locale != NULL && uprv_strcmp(locale, "en_US_POSIX") != 0 && + else if (locale != nullptr && uprv_strcmp(locale, "en_US_POSIX") != 0 && (uprv_strcmp(name, "ANSI_X3.4-1968") == 0 || uprv_strcmp(name, "US-ASCII") == 0)) { /* * For non C/POSIX locale, default the code page to UTF-8 instead of US-ASCII. @@ -2070,13 +2070,13 @@ remapPlatformDependentCodepage(const char *locale, const char *name) { } /* * Linux returns ANSI_X3.4-1968 for C/POSIX, but the call site takes care of - * it by falling back to 'US-ASCII' when NULL is returned from this + * it by falling back to 'US-ASCII' when nullptr is returned from this * function. So, we don't have to worry about it here. */ #endif - /* return NULL when "" is passed in */ + /* return nullptr when "" is passed in */ if (*name == 0) { - name = NULL; + name = nullptr; } return name; } @@ -2085,16 +2085,16 @@ static const char* getCodepageFromPOSIXID(const char *localeName, char * buffer, int32_t buffCapacity) { char localeBuf[100]; - const char *name = NULL; - char *variant = NULL; + const char *name = nullptr; + char *variant = nullptr; - if (localeName != NULL && (name = (uprv_strchr(localeName, '.'))) != NULL) { + if (localeName != nullptr && (name = (uprv_strchr(localeName, '.'))) != nullptr) { size_t localeCapacity = uprv_min(sizeof(localeBuf), (name-localeName)+1); uprv_strncpy(localeBuf, localeName, localeCapacity); - localeBuf[localeCapacity-1] = 0; /* ensure NULL termination */ + localeBuf[localeCapacity-1] = 0; /* ensure NUL termination */ name = uprv_strncpy(buffer, name+1, buffCapacity); - buffer[buffCapacity-1] = 0; /* ensure NULL termination */ - if ((variant = const_cast(uprv_strchr(name, '@'))) != NULL) { + buffer[buffCapacity-1] = 0; /* ensure NUL termination */ + if ((variant = const_cast(uprv_strchr(name, '@'))) != nullptr) { *variant = 0; } name = remapPlatformDependentCodepage(localeBuf, name); @@ -2132,7 +2132,7 @@ int_getDefaultCodepage() strncpy(codepage, nl_langinfo(CODESET),63-strlen(UCNV_SWAP_LFNL_OPTION_STRING)); strcat(codepage,UCNV_SWAP_LFNL_OPTION_STRING); - codepage[63] = 0; /* NULL terminate */ + codepage[63] = 0; /* NUL terminate */ return codepage; @@ -2169,8 +2169,8 @@ int_getDefaultCodepage() #elif U_POSIX_LOCALE static char codesetName[100]; - const char *localeName = NULL; - const char *name = NULL; + const char *localeName = nullptr; + const char *name = nullptr; localeName = uprv_getPOSIXIDForDefaultCodepage(); uprv_memset(codesetName, 0, sizeof(codesetName)); @@ -2193,10 +2193,10 @@ int_getDefaultCodepage() } else #endif { - codeset = remapPlatformDependentCodepage(NULL, codeset); + codeset = remapPlatformDependentCodepage(nullptr, codeset); } - if (codeset != NULL) { + if (codeset != nullptr) { uprv_strncpy(codesetName, codeset, sizeof(codesetName)); codesetName[sizeof(codesetName)-1] = 0; return codesetName; @@ -2229,12 +2229,12 @@ int_getDefaultCodepage() U_CAPI const char* U_EXPORT2 uprv_getDefaultCodepage() { - static char const *name = NULL; - umtx_lock(NULL); - if (name == NULL) { + static char const *name = nullptr; + umtx_lock(nullptr); + if (name == nullptr) { name = int_getDefaultCodepage(); } - umtx_unlock(NULL); + umtx_unlock(nullptr); return name; } #endif /* !U_CHARSET_IS_UTF8 */ @@ -2249,11 +2249,11 @@ u_versionFromString(UVersionInfo versionArray, const char *versionString) { char *end; uint16_t part=0; - if(versionArray==NULL) { + if(versionArray==nullptr) { return; } - if(versionString!=NULL) { + if(versionString!=nullptr) { for(;;) { versionArray[part]=(uint8_t)uprv_strtoul(versionString, &end, 10); if(end==versionString || ++part==U_MAX_VERSION_LENGTH || *end!=U_VERSION_DELIMITER) { @@ -2270,7 +2270,7 @@ u_versionFromString(UVersionInfo versionArray, const char *versionString) { U_CAPI void U_EXPORT2 u_versionFromUString(UVersionInfo versionArray, const UChar *versionString) { - if(versionArray!=NULL && versionString!=NULL) { + if(versionArray!=nullptr && versionString!=nullptr) { char versionChars[U_MAX_VERSION_STRING_LENGTH+1]; int32_t len = u_strlen(versionString); if(len>U_MAX_VERSION_STRING_LENGTH) { @@ -2287,11 +2287,11 @@ u_versionToString(const UVersionInfo versionArray, char *versionString) { uint16_t count, part; uint8_t field; - if(versionString==NULL) { + if(versionString==nullptr) { return; } - if(versionArray==NULL) { + if(versionArray==nullptr) { versionString[0]=0; return; } @@ -2362,10 +2362,10 @@ u_getVersion(UVersionInfo versionArray) { U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { - void *ret = NULL; + void *ret = nullptr; if(U_FAILURE(*status)) return ret; ret = dlopen(libName, RTLD_NOW|RTLD_GLOBAL); - if(ret==NULL) { + if(ret==nullptr) { #ifdef U_TRACE_DYLOAD printf("dlerror on dlopen(%s): %s\n", libName, dlerror()); #endif @@ -2386,10 +2386,10 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { UVoidFunction *fp; void *vp; } uret; - uret.fp = NULL; + uret.fp = nullptr; if(U_FAILURE(*status)) return uret.fp; uret.vp = dlsym(lib, sym); - if(uret.vp == NULL) { + if(uret.vp == nullptr) { #ifdef U_TRACE_DYLOAD printf("dlerror on dlsym(%p,%s): %s\n", lib,sym, dlerror()); #endif @@ -2405,13 +2405,13 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { - HMODULE lib = NULL; + HMODULE lib = nullptr; - if(U_FAILURE(*status)) return NULL; + if(U_FAILURE(*status)) return nullptr; lib = LoadLibraryA(libName); - if(lib==NULL) { + if(lib==nullptr) { *status = U_MISSING_RESOURCE_ERROR; } @@ -2431,13 +2431,13 @@ uprv_dl_close(void *lib, UErrorCode *status) { U_CAPI UVoidFunction* U_EXPORT2 uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { HMODULE handle = (HMODULE)lib; - UVoidFunction* addr = NULL; + UVoidFunction* addr = nullptr; - if(U_FAILURE(*status) || lib==NULL) return NULL; + if(U_FAILURE(*status) || lib==nullptr) return nullptr; addr = (UVoidFunction*)GetProcAddress(handle, sym); - if(addr==NULL) { + if(addr==nullptr) { DWORD lastError = GetLastError(); if(lastError == ERROR_PROC_NOT_FOUND) { *status = U_MISSING_RESOURCE_ERROR; @@ -2456,9 +2456,9 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { U_CAPI void * U_EXPORT2 uprv_dl_open(const char *libName, UErrorCode *status) { (void)libName; - if(U_FAILURE(*status)) return NULL; + if(U_FAILURE(*status)) return nullptr; *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } U_CAPI void U_EXPORT2 @@ -2476,7 +2476,7 @@ uprv_dlsym_func(void *lib, const char* sym, UErrorCode *status) { if(U_SUCCESS(*status)) { *status = U_UNSUPPORTED_ERROR; } - return (UVoidFunction*)NULL; + return (UVoidFunction*)nullptr; } #endif diff --git a/icu4c/source/common/resbund.cpp b/icu4c/source/common/resbund.cpp index 8591a625f95..0bec7bd916d 100644 --- a/icu4c/source/common/resbund.cpp +++ b/icu4c/source/common/resbund.cpp @@ -177,13 +177,13 @@ U_NAMESPACE_BEGIN UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ResourceBundle) ResourceBundle::ResourceBundle(UErrorCode &err) - :UObject(), fLocale(NULL) + :UObject(), fLocale(nullptr) { fResource = ures_open(0, Locale::getDefault().getName(), &err); } ResourceBundle::ResourceBundle(const ResourceBundle &other) - :UObject(other), fLocale(NULL) + :UObject(other), fLocale(nullptr) { UErrorCode status = U_ZERO_ERROR; @@ -191,23 +191,23 @@ ResourceBundle::ResourceBundle(const ResourceBundle &other) fResource = ures_copyResb(0, other.fResource, &status); } else { /* Copying a bad resource bundle */ - fResource = NULL; + fResource = nullptr; } } ResourceBundle::ResourceBundle(UResourceBundle *res, UErrorCode& err) - :UObject(), fLocale(NULL) + :UObject(), fLocale(nullptr) { if (res) { fResource = ures_copyResb(0, res, &err); } else { /* Copying a bad resource bundle */ - fResource = NULL; + fResource = nullptr; } } ResourceBundle::ResourceBundle(const char* path, const Locale& locale, UErrorCode& err) - :UObject(), fLocale(NULL) + :UObject(), fLocale(nullptr) { fResource = ures_open(path, locale.getName(), &err); } @@ -220,18 +220,18 @@ ResourceBundle& ResourceBundle::operator=(const ResourceBundle& other) } if(fResource != 0) { ures_close(fResource); - fResource = NULL; + fResource = nullptr; } - if (fLocale != NULL) { + if (fLocale != nullptr) { delete fLocale; - fLocale = NULL; + fLocale = nullptr; } UErrorCode status = U_ZERO_ERROR; if (other.fResource) { fResource = ures_copyResb(0, other.fResource, &status); } else { /* Copying a bad resource bundle */ - fResource = NULL; + fResource = nullptr; } return *this; } @@ -241,7 +241,7 @@ ResourceBundle::~ResourceBundle() if(fResource != 0) { ures_close(fResource); } - if(fLocale != NULL) { + if(fLocale != nullptr) { delete(fLocale); } } @@ -380,14 +380,14 @@ void ResourceBundle::getVersion(UVersionInfo versionInfo) const { const Locale &ResourceBundle::getLocale(void) const { static UMutex gLocaleLock; Mutex lock(&gLocaleLock); - if (fLocale != NULL) { + if (fLocale != nullptr) { return *fLocale; } UErrorCode status = U_ZERO_ERROR; const char *localeName = ures_getLocaleInternal(fResource, &status); ResourceBundle *ncThis = const_cast(this); ncThis->fLocale = new Locale(localeName); - return ncThis->fLocale != NULL ? *ncThis->fLocale : Locale::getDefault(); + return ncThis->fLocale != nullptr ? *ncThis->fLocale : Locale::getDefault(); } const Locale ResourceBundle::getLocale(ULocDataLocaleType type, UErrorCode &status) const diff --git a/icu4c/source/common/resbund_cnv.cpp b/icu4c/source/common/resbund_cnv.cpp index 45c0b399bff..9c752e194a6 100644 --- a/icu4c/source/common/resbund_cnv.cpp +++ b/icu4c/source/common/resbund_cnv.cpp @@ -27,14 +27,14 @@ U_NAMESPACE_BEGIN ResourceBundle::ResourceBundle( const UnicodeString& path, const Locale& locale, UErrorCode& error) - :UObject(), fLocale(NULL) + :UObject(), fLocale(nullptr) { constructForLocale(path, locale, error); } ResourceBundle::ResourceBundle( const UnicodeString& path, UErrorCode& error) - :UObject(), fLocale(NULL) + :UObject(), fLocale(nullptr) { constructForLocale(path, Locale::getDefault(), error); } @@ -45,7 +45,7 @@ ResourceBundle::constructForLocale(const UnicodeString& path, UErrorCode& error) { if (path.isEmpty()) { - fResource = ures_open(NULL, locale.getName(), &error); + fResource = ures_open(nullptr, locale.getName(), &error); } else { UnicodeString nullTerminatedPath(path); diff --git a/icu4c/source/common/resource.h b/icu4c/source/common/resource.h index 1483f7d6bcc..3ac7c3dc61a 100644 --- a/icu4c/source/common/resource.h +++ b/icu4c/source/common/resource.h @@ -45,7 +45,7 @@ class ResourceValue; class U_COMMON_API ResourceArray { public: /** Constructs an empty array object. */ - ResourceArray() : items16(NULL), items32(NULL), length(0) {} + ResourceArray() : items16(nullptr), items32(nullptr), length(0) {} /** Only for implementation use. @internal */ ResourceArray(const uint16_t *i16, const uint32_t *i32, int32_t len, @@ -80,7 +80,7 @@ private: class U_COMMON_API ResourceTable { public: /** Constructs an empty table object. */ - ResourceTable() : keys16(NULL), keys32(NULL), items16(NULL), items32(NULL), length(0) {} + ResourceTable() : keys16(nullptr), keys32(nullptr), items16(nullptr), items32(nullptr), length(0) {} /** Only for implementation use. @internal */ ResourceTable(const uint16_t *k16, const int32_t *k32, diff --git a/icu4c/source/common/serv.cpp b/icu4c/source/common/serv.cpp index 9d8c04149ce..22262e06f6a 100644 --- a/icu4c/source/common/serv.cpp +++ b/icu4c/source/common/serv.cpp @@ -144,7 +144,7 @@ SimpleFactory::create(const ICUServiceKey& key, const ICUService* service, UErro return service->cloneInstance(_instance); } } - return NULL; + return nullptr; } void @@ -243,7 +243,7 @@ public: CacheEntry* unref() { if ((--refcount) == 0) { delete this; - return NULL; + return nullptr; } return this; } @@ -294,14 +294,14 @@ StringPair::create(const UnicodeString& displayName, { if (U_SUCCESS(status)) { StringPair* sp = new StringPair(displayName, id); - if (sp == NULL || sp->isBogus()) { + if (sp == nullptr || sp->isBogus()) { status = U_MEMORY_ALLOCATION_ERROR; delete sp; - return NULL; + return nullptr; } return sp; } - return NULL; + return nullptr; } UBool @@ -332,20 +332,20 @@ static UMutex lock; ICUService::ICUService() : name() , timestamp(0) -, factories(NULL) -, serviceCache(NULL) -, idCache(NULL) -, dnCache(NULL) +, factories(nullptr) +, serviceCache(nullptr) +, idCache(nullptr) +, dnCache(nullptr) { } ICUService::ICUService(const UnicodeString& newName) : name(newName) , timestamp(0) -, factories(NULL) -, serviceCache(NULL) -, idCache(NULL) -, dnCache(NULL) +, factories(nullptr) +, serviceCache(nullptr) +, idCache(nullptr) +, dnCache(nullptr) { } @@ -355,20 +355,20 @@ ICUService::~ICUService() Mutex mutex(&lock); clearCaches(); delete factories; - factories = NULL; + factories = nullptr; } } UObject* ICUService::get(const UnicodeString& descriptor, UErrorCode& status) const { - return get(descriptor, NULL, status); + return get(descriptor, nullptr, status); } UObject* ICUService::get(const UnicodeString& descriptor, UnicodeString* actualReturn, UErrorCode& status) const { - UObject* result = NULL; + UObject* result = nullptr; ICUServiceKey* key = createKey(&descriptor, status); if (key) { result = getKey(*key, actualReturn, status); @@ -380,7 +380,7 @@ ICUService::get(const UnicodeString& descriptor, UnicodeString* actualReturn, UE UObject* ICUService::getKey(ICUServiceKey& key, UErrorCode& status) const { - return getKey(key, NULL, status); + return getKey(key, nullptr, status); } // this is a vector that subclasses of ICUService can override to further customize the result object @@ -389,7 +389,7 @@ ICUService::getKey(ICUServiceKey& key, UErrorCode& status) const UObject* ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode& status) const { - return getKey(key, actualReturn, NULL, status); + return getKey(key, actualReturn, nullptr, status); } // make it possible to call reentrantly on systems that don't have reentrant mutexes. @@ -417,7 +417,7 @@ UObject* ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUServiceFactory* factory, UErrorCode& status) const { if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (isDefault()) { @@ -426,7 +426,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer ICUService* ncthis = (ICUService*)this; // cast away semantic const - CacheEntry* result = NULL; + CacheEntry* result = nullptr; { // The factory list can't be modified until we're done, // otherwise we might update the cache with an invalid result. @@ -437,17 +437,17 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer // if factory is not null, we're calling from within the mutex, // and since some unix machines don't have reentrant mutexes we // need to make sure not to try to lock it again. - XMutex mutex(&lock, factory != NULL); + XMutex mutex(&lock, factory != nullptr); - if (serviceCache == NULL) { + if (serviceCache == nullptr) { ncthis->serviceCache = new Hashtable(status); - if (ncthis->serviceCache == NULL) { + if (ncthis->serviceCache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } if (U_FAILURE(status)) { delete serviceCache; - return NULL; + return nullptr; } serviceCache->setValueDeleter(cacheDeleter); } @@ -460,7 +460,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer int32_t limit = factories->size(); UBool cacheResult = true; - if (factory != NULL) { + if (factory != nullptr) { for (int32_t i = 0; i < limit; ++i) { if (factory == (const ICUServiceFactory*)factories->elementAt(i)) { startIndex = i + 1; @@ -470,7 +470,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer if (startIndex == 0) { // throw new InternalError("Factory " + factory + "not registered with service: " + this); status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } cacheResult = false; } @@ -479,7 +479,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer currentDescriptor.remove(); key.currentDescriptor(currentDescriptor); result = (CacheEntry*)serviceCache->get(currentDescriptor); - if (result != NULL) { + if (result != nullptr) { break; } @@ -493,13 +493,13 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer ICUServiceFactory* f = (ICUServiceFactory*)factories->elementAt(index++); LocalPointer service(f->create(key, this, status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (service.isValid()) { result = new CacheEntry(currentDescriptor, service.getAlias()); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } service.orphan(); // result now owns service. @@ -513,32 +513,32 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer // fallback to the one that succeeded, we want to hit the // cache the first time next goaround. if (cacheDescriptorList.isNull()) { - cacheDescriptorList.adoptInsteadAndCheckErrorCode(new UVector(uprv_deleteUObject, NULL, 5, status), status); + cacheDescriptorList.adoptInsteadAndCheckErrorCode(new UVector(uprv_deleteUObject, nullptr, 5, status), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } } LocalPointer idToCache(new UnicodeString(currentDescriptor), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (idToCache->isBogus()) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } cacheDescriptorList->adoptElement(idToCache.orphan(), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } } while (key.fallback()); outerEnd: - if (result != NULL) { + if (result != nullptr) { if (putInCache && cacheResult) { serviceCache->put(result->actualDescriptor, result, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (cacheDescriptorList.isValid()) { @@ -547,7 +547,7 @@ outerEnd: serviceCache->put(*desc, result, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } result->ref(); @@ -556,7 +556,7 @@ outerEnd: } } - if (actualReturn != NULL) { + if (actualReturn != nullptr) { // strip null prefix if (result->actualDescriptor.indexOf((UChar)0x2f) == 0) { // U+002f=slash (/) actualReturn->remove(); @@ -570,7 +570,7 @@ outerEnd: if (actualReturn->isBogus()) { status = U_MEMORY_ALLOCATION_ERROR; delete result; - return NULL; + return nullptr; } } @@ -588,12 +588,12 @@ outerEnd: UObject* ICUService::handleDefault(const ICUServiceKey& /* key */, UnicodeString* /* actualIDReturn */, UErrorCode& /* status */) const { - return NULL; + return nullptr; } UVector& ICUService::getVisibleIDs(UVector& result, UErrorCode& status) const { - return getVisibleIDs(result, NULL, status); + return getVisibleIDs(result, nullptr, status); } UVector& @@ -609,17 +609,17 @@ ICUService::getVisibleIDs(UVector& result, const UnicodeString* matchID, UErrorC { Mutex mutex(&lock); const Hashtable* map = getVisibleIDMap(status); - if (map != NULL) { + if (map != nullptr) { ICUServiceKey* fallbackKey = createKey(matchID, status); for (int32_t pos = UHASH_FIRST; U_SUCCESS(status); ) { const UHashElement* e = map->nextElement(pos); - if (e == NULL) { + if (e == nullptr) { break; } const UnicodeString* id = (const UnicodeString*)e->key.pointer; - if (fallbackKey != NULL) { + if (fallbackKey != nullptr) { if (!fallbackKey->isFallbackOf(*id)) { continue; } @@ -640,23 +640,23 @@ ICUService::getVisibleIDs(UVector& result, const UnicodeString* matchID, UErrorC const Hashtable* ICUService::getVisibleIDMap(UErrorCode& status) const { - if (U_FAILURE(status)) return NULL; + if (U_FAILURE(status)) return nullptr; // must only be called when lock is already held ICUService* ncthis = (ICUService*)this; // cast away semantic const - if (idCache == NULL) { + if (idCache == nullptr) { ncthis->idCache = new Hashtable(status); - if (idCache == NULL) { + if (idCache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - } else if (factories != NULL) { + } else if (factories != nullptr) { for (int32_t pos = factories->size(); --pos >= 0;) { ICUServiceFactory* f = (ICUServiceFactory*)factories->elementAt(pos); f->updateVisibleIDs(*idCache, status); } if (U_FAILURE(status)) { delete idCache; - ncthis->idCache = NULL; + ncthis->idCache = nullptr; } } } @@ -678,9 +678,9 @@ ICUService::getDisplayName(const UnicodeString& id, UnicodeString& result, const UErrorCode status = U_ZERO_ERROR; Mutex mutex(&lock); const Hashtable* map = getVisibleIDMap(status); - if (map != NULL) { + if (map != nullptr) { ICUServiceFactory* f = (ICUServiceFactory*)map->get(id); - if (f != NULL) { + if (f != nullptr) { f->getDisplayName(id, locale, result); return result; } @@ -688,11 +688,11 @@ ICUService::getDisplayName(const UnicodeString& id, UnicodeString& result, const // fallback status = U_ZERO_ERROR; ICUServiceKey* fallbackKey = createKey(&id, status); - while (fallbackKey != NULL && fallbackKey->fallback()) { + while (fallbackKey != nullptr && fallbackKey->fallback()) { UnicodeString us; fallbackKey->currentID(us); f = (ICUServiceFactory*)map->get(us); - if (f != NULL) { + if (f != nullptr) { f->getDisplayName(id, locale, result); delete fallbackKey; return result; @@ -708,14 +708,14 @@ ICUService::getDisplayName(const UnicodeString& id, UnicodeString& result, const UVector& ICUService::getDisplayNames(UVector& result, UErrorCode& status) const { - return getDisplayNames(result, Locale::getDefault(), NULL, status); + return getDisplayNames(result, Locale::getDefault(), nullptr, status); } UVector& ICUService::getDisplayNames(UVector& result, const Locale& locale, UErrorCode& status) const { - return getDisplayNames(result, locale, NULL, status); + return getDisplayNames(result, locale, nullptr, status); } UVector& @@ -730,25 +730,25 @@ ICUService::getDisplayNames(UVector& result, ICUService* ncthis = (ICUService*)this; // cast away semantic const Mutex mutex(&lock); - if (dnCache != NULL && dnCache->locale != locale) { + if (dnCache != nullptr && dnCache->locale != locale) { delete dnCache; - ncthis->dnCache = NULL; + ncthis->dnCache = nullptr; } - if (dnCache == NULL) { + if (dnCache == nullptr) { const Hashtable* m = getVisibleIDMap(status); if (U_FAILURE(status)) { return result; } ncthis->dnCache = new DNCache(locale); - if (dnCache == NULL) { + if (dnCache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return result; } int32_t pos = UHASH_FIRST; - const UHashElement* entry = NULL; - while ((entry = m->nextElement(pos)) != NULL) { + const UHashElement* entry = nullptr; + while ((entry = m->nextElement(pos)) != nullptr) { const UnicodeString* id = (const UnicodeString*)entry->key.pointer; ICUServiceFactory* f = (ICUServiceFactory*)entry->value.pointer; UnicodeString dname; @@ -762,7 +762,7 @@ ICUService::getDisplayNames(UVector& result, } } delete dnCache; - ncthis->dnCache = NULL; + ncthis->dnCache = nullptr; return result; } } @@ -774,10 +774,10 @@ ICUService::getDisplayNames(UVector& result, * at the next position, which in this case will be 0. */ int32_t pos = UHASH_FIRST; - const UHashElement *entry = NULL; - while ((entry = dnCache->cache.nextElement(pos)) != NULL) { + const UHashElement *entry = nullptr; + while ((entry = dnCache->cache.nextElement(pos)) != nullptr) { const UnicodeString* id = (const UnicodeString*)entry->value.pointer; - if (matchKey != NULL && !matchKey->isFallbackOf(*id)) { + if (matchKey != nullptr && !matchKey->isFallbackOf(*id)) { continue; } const UnicodeString* dn = (const UnicodeString*)entry->key.pointer; @@ -803,30 +803,30 @@ URegistryKey ICUService::registerInstance(UObject* objToAdopt, const UnicodeString& id, UBool visible, UErrorCode& status) { ICUServiceKey* key = createKey(&id, status); - if (key != NULL) { + if (key != nullptr) { UnicodeString canonicalID; key->canonicalID(canonicalID); delete key; ICUServiceFactory* f = createSimpleFactory(objToAdopt, canonicalID, visible, status); - if (f != NULL) { + if (f != nullptr) { return registerFactory(f, status); } } delete objToAdopt; - return NULL; + return nullptr; } ICUServiceFactory* ICUService::createSimpleFactory(UObject* objToAdopt, const UnicodeString& id, UBool visible, UErrorCode& status) { if (U_SUCCESS(status)) { - if ((objToAdopt != NULL) && (!id.isBogus())) { + if ((objToAdopt != nullptr) && (!id.isBogus())) { return new SimpleFactory(objToAdopt, id, visible); } status = U_ILLEGAL_ARGUMENT_ERROR; } - return NULL; + return nullptr; } URegistryKey @@ -865,7 +865,7 @@ ICUService::unregister(URegistryKey rkey, UErrorCode& status) { ICUServiceFactory *factory = (ICUServiceFactory*)rkey; UBool result = false; - if (factory != NULL && factories != NULL) { + if (factory != nullptr && factories != nullptr) { Mutex mutex(&lock); if (factories->removeElement(factory)) { @@ -896,7 +896,7 @@ ICUService::reset() void ICUService::reInitializeFactories() { - if (factories != NULL) { + if (factories != nullptr) { factories->removeAllElements(); } } @@ -910,7 +910,7 @@ ICUService::isDefault() const ICUServiceKey* ICUService::createKey(const UnicodeString* id, UErrorCode& status) const { - return (U_FAILURE(status) || id == NULL) ? NULL : new ICUServiceKey(*id); + return (U_FAILURE(status) || id == nullptr) ? nullptr : new ICUServiceKey(*id); } void @@ -919,23 +919,23 @@ ICUService::clearCaches() // callers synchronize before use ++timestamp; delete dnCache; - dnCache = NULL; + dnCache = nullptr; delete idCache; - idCache = NULL; - delete serviceCache; serviceCache = NULL; + idCache = nullptr; + delete serviceCache; serviceCache = nullptr; } void ICUService::clearServiceCache() { // callers synchronize before use - delete serviceCache; serviceCache = NULL; + delete serviceCache; serviceCache = nullptr; } UBool ICUService::acceptsListener(const EventListener& l) const { - return dynamic_cast(&l) != NULL; + return dynamic_cast(&l) != nullptr; } void @@ -953,7 +953,7 @@ ICUService::getName(UnicodeString& result) const int32_t ICUService::countFactories() const { - return factories == NULL ? 0 : factories->size(); + return factories == nullptr ? 0 : factories->size(); } int32_t diff --git a/icu4c/source/common/serv.h b/icu4c/source/common/serv.h index 3bd3d9a9b9e..65f05053922 100644 --- a/icu4c/source/common/serv.h +++ b/icu4c/source/common/serv.h @@ -217,7 +217,7 @@ class U_COMMON_API ICUServiceFactory : public UObject { /** *

Create a service object from the key, if this factory - * supports the key. Otherwise, return NULL.

+ * supports the key. Otherwise, return nullptr.

* *

If the factory supports the key, then it can call * the service's getKey(ICUServiceKey, String[], ICUServiceFactory) method @@ -230,7 +230,7 @@ class U_COMMON_API ICUServiceFactory : public UObject { * @param key the service key. * @param service the service with which this factory is registered. * @param status the error code status. - * @return the service object, or NULL if the factory does not support the key. + * @return the service object, or nullptr if the factory does not support the key. */ virtual UObject* create(const ICUServiceKey& key, const ICUService* service, UErrorCode& status) const = 0; @@ -292,7 +292,7 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory { /** *

Construct a SimpleFactory that maps a single ID to a single * service instance. If visible is true, the ID will be visible. - * The instance must not be NULL. The SimpleFactory will adopt + * The instance must not be nullptr. The SimpleFactory will adopt * the instance, which must not be changed subsequent to this call.

* * @param instanceToAdopt the service instance to adopt. @@ -313,7 +313,7 @@ class U_COMMON_API SimpleFactory : public ICUServiceFactory { * @param key the service key. * @param service the service with which this factory is registered. * @param status the error code status. - * @return the service object, or NULL if the factory does not support the key. + * @return the service object, or nullptr if the factory does not support the key. */ virtual UObject* create(const ICUServiceKey& key, const ICUService* service, UErrorCode& status) const override; @@ -420,7 +420,7 @@ public: * @param displayName the displayName. * @param id the ID. * @param status the error code status. - * @return a StringPair if the creation was successful, otherwise NULL. + * @return a StringPair if the creation was successful, otherwise nullptr. */ static StringPair* create(const UnicodeString& displayName, const UnicodeString& id, @@ -593,7 +593,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param descriptor the descriptor. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ UObject* get(const UnicodeString& descriptor, UErrorCode& status) const; @@ -602,9 +602,9 @@ class U_COMMON_API ICUService : public ICUNotifier { * createKey to create a key from the provided descriptor.

* * @param descriptor the descriptor. - * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or NULL. + * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or nullptr. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ UObject* get(const UnicodeString& descriptor, UnicodeString* actualReturn, UErrorCode& status) const; @@ -613,15 +613,15 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param key the key. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ UObject* getKey(ICUServiceKey& key, UErrorCode& status) const; /** *

Given a key, return a service object, and, if actualReturn - * is not NULL, the descriptor with which it was found in the + * is not nullptr, the descriptor with which it was found in the * first element of actualReturn. If no service object matches - * this key, returns NULL and leaves actualReturn unchanged.

+ * this key, returns nullptr and leaves actualReturn unchanged.

* *

This queries the cache using the key's descriptor, and if no * object in the cache matches, tries the key on each @@ -635,9 +635,9 @@ class U_COMMON_API ICUService : public ICUNotifier { * result before returning it. * * @param key the key. - * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or NULL. + * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or nullptr. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ virtual UObject* getKey(ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode& status) const; @@ -648,10 +648,10 @@ class U_COMMON_API ICUService : public ICUNotifier { * should not call it directly, but call through one of the other get functions.

* * @param key the key. - * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or NULL. + * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or nullptr. * @param factory the factory making the recursive call. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ UObject* getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUServiceFactory* factory, UErrorCode& status) const; @@ -677,11 +677,11 @@ class U_COMMON_API ICUService : public ICUNotifier { * new elements, if any, are added.

* *

matchID is passed to createKey to create a key. If the key - * is not NULL, its isFallbackOf method is used to filter out IDs + * is not nullptr, its isFallbackOf method is used to filter out IDs * that don't match the key or have it as a fallback.

* * @param result a vector to hold the returned IDs. - * @param matchID an ID used to filter the result, or NULL if all IDs are desired. + * @param matchID an ID used to filter the result, or nullptr if all IDs are desired. * @param status the error code status. * @return the result vector. */ @@ -711,7 +711,7 @@ class U_COMMON_API ICUService : public ICUNotifier { /** *

Convenience override of getDisplayNames(const Locale&, const UnicodeString*) that - * uses the current default Locale as the locale and NULL for + * uses the current default Locale as the locale and nullptr for * the matchID.

* * @param result a vector to hold the returned displayName/id StringPairs. @@ -722,7 +722,7 @@ class U_COMMON_API ICUService : public ICUNotifier { /** *

Convenience override of getDisplayNames(const Locale&, const UnicodeString*) that - * uses NULL for the matchID.

+ * uses nullptr for the matchID.

* * @param result a vector to hold the returned displayName/id StringPairs. * @param locale the locale in which to localize the ID. @@ -746,12 +746,12 @@ class U_COMMON_API ICUService : public ICUNotifier { * discarded before new elements, if any, are added.

* *

matchID is passed to createKey to create a key. If the key - * is not NULL, its isFallbackOf method is used to filter out IDs + * is not nullptr, its isFallbackOf method is used to filter out IDs * that don't match the key or have it as a fallback.

* * @param result a vector to hold the returned displayName/id StringPairs. * @param locale the locale in which to localize the ID. - * @param matchID an ID used to filter the result, or NULL if all IDs are desired. + * @param matchID an ID used to filter the result, or nullptr if all IDs are desired. * @param status the error code status. * @return the result vector. */ UVector& getDisplayNames(UVector& result, @@ -841,7 +841,7 @@ class U_COMMON_API ICUService : public ICUNotifier { virtual UBool isDefault(void) const; /** - *

Create a key from an ID. If ID is NULL, returns NULL.

+ *

Create a key from an ID. If ID is nullptr, returns nullptr.

* *

The default implementation creates an ICUServiceKey instance. * Subclasses can override to define more useful keys appropriate @@ -849,7 +849,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * * @param a pointer to the ID for which to create a default ICUServiceKey. * @param status the error code status. - * @return the ICUServiceKey corresponding to ID, or NULL. + * @return the ICUServiceKey corresponding to ID, or nullptr. */ virtual ICUServiceKey* createKey(const UnicodeString* id, UErrorCode& status) const; @@ -859,7 +859,7 @@ class U_COMMON_API ICUService : public ICUNotifier { * This is public so factories can call it, but should really be protected.

* * @param instance the service instance to clone. - * @return a clone of the passed-in instance, or NULL if cloning was unsuccessful. + * @return a clone of the passed-in instance, or nullptr if cloning was unsuccessful. */ virtual UObject* cloneInstance(UObject* instance) const = 0; @@ -901,12 +901,12 @@ class U_COMMON_API ICUService : public ICUNotifier { *

Default handler for this service if no factory in the factory list * handled the key passed to getKey.

* - *

The default implementation returns NULL.

+ *

The default implementation returns nullptr.

* * @param key the key. - * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or NULL. + * @param actualReturn a pointer to a UnicodeString to hold the matched descriptor, or nullptr. * @param status the error code status. - * @return the service instance, or NULL. + * @return the service instance, or nullptr. */ virtual UObject* handleDefault(const ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode& status) const; diff --git a/icu4c/source/common/servlk.cpp b/icu4c/source/common/servlk.cpp index 70218066595..c9c8c3dcccb 100644 --- a/icu4c/source/common/servlk.cpp +++ b/icu4c/source/common/servlk.cpp @@ -41,8 +41,8 @@ LocaleKey::createWithCanonicalFallback(const UnicodeString* primaryID, int32_t kind, UErrorCode& status) { - if (primaryID == NULL || U_FAILURE(status)) { - return NULL; + if (primaryID == nullptr || U_FAILURE(status)) { + return nullptr; } UnicodeString canonicalPrimaryID; LocaleUtility::canonicalLocaleString(primaryID, canonicalPrimaryID); @@ -61,7 +61,7 @@ LocaleKey::LocaleKey(const UnicodeString& primaryID, { _fallbackID.setToBogus(); if (_primaryID.length() != 0) { - if (canonicalFallbackID != NULL && _primaryID != *canonicalFallbackID) { + if (canonicalFallbackID != nullptr && _primaryID != *canonicalFallbackID) { _fallbackID = *canonicalFallbackID; } } diff --git a/icu4c/source/common/servlkf.cpp b/icu4c/source/common/servlkf.cpp index 7ccb0c72aa6..c4baed2df7c 100644 --- a/icu4c/source/common/servlkf.cpp +++ b/icu4c/source/common/servlkf.cpp @@ -54,7 +54,7 @@ LocaleKeyFactory::create(const ICUServiceKey& key, const ICUService* service, UE return handleCreate(loc, kind, service, status); } - return NULL; + return nullptr; } UBool @@ -63,7 +63,7 @@ LocaleKeyFactory::handlesKey(const ICUServiceKey& key, UErrorCode& status) const if (supported) { UnicodeString id; key.currentID(id); - return supported->get(id) != NULL; + return supported->get(id) != nullptr; } return false; } @@ -73,9 +73,9 @@ LocaleKeyFactory::updateVisibleIDs(Hashtable& result, UErrorCode& status) const const Hashtable* supported = getSupportedIDs(status); if (supported) { UBool visible = (_coverage & 0x1) == 0; - const UHashElement* elem = NULL; + const UHashElement* elem = nullptr; int32_t pos = UHASH_FIRST; - while ((elem = supported->nextElement(pos)) != NULL) { + while ((elem = supported->nextElement(pos)) != nullptr) { const UnicodeString& id = *((const UnicodeString*)elem->key.pointer); if (!visible) { result.remove(id); @@ -109,7 +109,7 @@ LocaleKeyFactory::handleCreate(const Locale& /* loc */, int32_t /* kind */, const ICUService* /* service */, UErrorCode& /* status */) const { - return NULL; + return nullptr; } //UBool @@ -120,7 +120,7 @@ LocaleKeyFactory::handleCreate(const Locale& /* loc */, const Hashtable* LocaleKeyFactory::getSupportedIDs(UErrorCode& /* status */) const { - return NULL; + return nullptr; } #ifdef SERVICE_DEBUG diff --git a/icu4c/source/common/servloc.h b/icu4c/source/common/servloc.h index 29c50a27d1a..554f9959364 100644 --- a/icu4c/source/common/servloc.h +++ b/icu4c/source/common/servloc.h @@ -258,7 +258,7 @@ public: protected: /** * Utility method used by create(ICUServiceKey, ICUService). Subclasses can implement - * this instead of create. The default returns NULL. + * this instead of create. The default returns nullptr. */ virtual UObject* handleCreate(const Locale& loc, int32_t kind, const ICUService* service, UErrorCode& status) const; diff --git a/icu4c/source/common/servls.cpp b/icu4c/source/common/servls.cpp index 19481122efa..7b1db42034c 100644 --- a/icu4c/source/common/servls.cpp +++ b/icu4c/source/common/servls.cpp @@ -44,13 +44,13 @@ ICULocaleService::~ICULocaleService() UObject* ICULocaleService::get(const Locale& locale, UErrorCode& status) const { - return get(locale, LocaleKey::KIND_ANY, NULL, status); + return get(locale, LocaleKey::KIND_ANY, nullptr, status); } UObject* ICULocaleService::get(const Locale& locale, int32_t kind, UErrorCode& status) const { - return get(locale, kind, NULL, status); + return get(locale, kind, nullptr, status); } UObject* @@ -62,7 +62,7 @@ ICULocaleService::get(const Locale& locale, Locale* actualReturn, UErrorCode& st UObject* ICULocaleService::get(const Locale& locale, int32_t kind, Locale* actualReturn, UErrorCode& status) const { - UObject* result = NULL; + UObject* result = nullptr; if (U_FAILURE(status)) { return result; } @@ -73,13 +73,13 @@ ICULocaleService::get(const Locale& locale, int32_t kind, Locale* actualReturn, } else { ICUServiceKey* key = createKey(&locName, kind, status); if (key) { - if (actualReturn == NULL) { + if (actualReturn == nullptr) { result = getKey(*key, status); } else { UnicodeString temp; result = getKey(*key, &temp, status); - if (result != NULL) { + if (result != nullptr) { key->parseSuffix(temp); LocaleUtility::initLocaleFromName(temp, *actualReturn); } @@ -117,11 +117,11 @@ URegistryKey ICULocaleService::registerInstance(UObject* objToAdopt, const Locale& locale, int32_t kind, int32_t coverage, UErrorCode& status) { ICUServiceFactory * factory = new SimpleLocaleKeyFactory(objToAdopt, locale, kind, coverage); - if (factory != NULL) { + if (factory != nullptr) { return registerFactory(factory, status); } delete objToAdopt; - return NULL; + return nullptr; } #if 0 @@ -143,11 +143,11 @@ URegistryKey ICULocaleService::registerInstance(UObject* objToAdopt, const UnicodeString& locale, int32_t kind, int32_t coverage, UErrorCode& status) { ICUServiceFactory * factory = new SimpleLocaleKeyFactory(objToAdopt, locale, kind, coverage); - if (factory != NULL) { + if (factory != nullptr) { return registerFactory(factory, status); } delete objToAdopt; - return NULL; + return nullptr; } #endif @@ -162,7 +162,7 @@ private: ServiceEnumeration(const ICULocaleService* service, UErrorCode &status) : _service(service) , _timestamp(service->getTimestamp()) - , _ids(uprv_deleteUObject, NULL, status) + , _ids(uprv_deleteUObject, nullptr, status) , _pos(0) { _service->getVisibleIDs(_ids, status); @@ -171,7 +171,7 @@ private: ServiceEnumeration(const ServiceEnumeration &other, UErrorCode &status) : _service(other._service) , _timestamp(other._timestamp) - , _ids(uprv_deleteUObject, NULL, status) + , _ids(uprv_deleteUObject, nullptr, status) , _pos(0) { if(U_SUCCESS(status)) { @@ -197,7 +197,7 @@ public: return result; } delete result; - return NULL; + return nullptr; } virtual ~ServiceEnumeration(); @@ -207,7 +207,7 @@ public: ServiceEnumeration *cl = new ServiceEnumeration(*this, status); if(U_FAILURE(status)) { delete cl; - cl = NULL; + cl = nullptr; } return cl; } @@ -230,7 +230,7 @@ public: if (upToDate(status) && (_pos < _ids.size())) { return (const UnicodeString*)_ids[_pos++]; } - return NULL; + return nullptr; } virtual void reset(UErrorCode& status) override { diff --git a/icu4c/source/common/servnotf.cpp b/icu4c/source/common/servnotf.cpp index d9fb3887520..5db65edf78d 100644 --- a/icu4c/source/common/servnotf.cpp +++ b/icu4c/source/common/servnotf.cpp @@ -24,7 +24,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(EventListener) static UMutex notifyLock; ICUNotifier::ICUNotifier(void) -: listeners(NULL) +: listeners(nullptr) { } @@ -32,7 +32,7 @@ ICUNotifier::~ICUNotifier(void) { { Mutex lmx(¬ifyLock); delete listeners; - listeners = NULL; + listeners = nullptr; } } @@ -41,14 +41,14 @@ void ICUNotifier::addListener(const EventListener* l, UErrorCode& status) { if (U_SUCCESS(status)) { - if (l == NULL) { + if (l == nullptr) { status = U_ILLEGAL_ARGUMENT_ERROR; return; } if (acceptsListener(*l)) { Mutex lmx(¬ifyLock); - if (listeners == NULL) { + if (listeners == nullptr) { LocalPointer lpListeners(new UVector(5, status), status); if (U_FAILURE(status)) { return; @@ -78,14 +78,14 @@ void ICUNotifier::removeListener(const EventListener *l, UErrorCode& status) { if (U_SUCCESS(status)) { - if (l == NULL) { + if (l == nullptr) { status = U_ILLEGAL_ARGUMENT_ERROR; return; } { Mutex lmx(¬ifyLock); - if (listeners != NULL) { + if (listeners != nullptr) { // identity equality check for (int i = 0, e = listeners->size(); i < e; ++i) { const EventListener* el = (const EventListener*)listeners->elementAt(i); @@ -93,7 +93,7 @@ ICUNotifier::removeListener(const EventListener *l, UErrorCode& status) listeners->removeElementAt(i); if (listeners->size() == 0) { delete listeners; - listeners = NULL; + listeners = nullptr; } return; } @@ -107,7 +107,7 @@ void ICUNotifier::notifyChanged(void) { Mutex lmx(¬ifyLock); - if (listeners != NULL) { + if (listeners != nullptr) { for (int i = 0, e = listeners->size(); i < e; ++i) { EventListener* el = (EventListener*)listeners->elementAt(i); notifyListener(*el); diff --git a/icu4c/source/common/servrbf.cpp b/icu4c/source/common/servrbf.cpp index 94279ab3a15..68583ef1fbb 100644 --- a/icu4c/source/common/servrbf.cpp +++ b/icu4c/source/common/servrbf.cpp @@ -48,7 +48,7 @@ ICUResourceBundleFactory::getSupportedIDs(UErrorCode& status) const if (U_SUCCESS(status)) { return LocaleUtility::getAvailableLocaleNames(_bundleName); } - return NULL; + return nullptr; } UObject* @@ -63,11 +63,11 @@ ICUResourceBundleFactory::handleCreate(const Locale& loc, int32_t /* kind */, co int32_t length; length=_bundleName.extract(0, INT32_MAX, pkg, (int32_t)sizeof(pkg), US_INV); if(length>=(int32_t)sizeof(pkg)) { - return NULL; + return nullptr; } return new ResourceBundle(pkg, loc, status); } - return NULL; + return nullptr; } #ifdef SERVICE_DEBUG diff --git a/icu4c/source/common/servslkf.cpp b/icu4c/source/common/servslkf.cpp index 09154d1b919..9966dac0ce9 100644 --- a/icu4c/source/common/servslkf.cpp +++ b/icu4c/source/common/servslkf.cpp @@ -57,7 +57,7 @@ SimpleLocaleKeyFactory::SimpleLocaleKeyFactory(UObject* objToAdopt, SimpleLocaleKeyFactory::~SimpleLocaleKeyFactory() { delete _obj; - _obj = NULL; + _obj = nullptr; } UObject* @@ -73,7 +73,7 @@ SimpleLocaleKeyFactory::create(const ICUServiceKey& key, const ICUService* servi } } } - return NULL; + return nullptr; } //UBool diff --git a/icu4c/source/common/sharedobject.h b/icu4c/source/common/sharedobject.h index 6298662bbaf..5532ec48d88 100644 --- a/icu4c/source/common/sharedobject.h +++ b/icu4c/source/common/sharedobject.h @@ -57,14 +57,14 @@ public: SharedObject() : softRefCount(0), hardRefCount(0), - cachePtr(NULL) {} + cachePtr(nullptr) {} /** Initializes totalRefCount, softRefCount to 0. */ SharedObject(const SharedObject &other) : UObject(other), softRefCount(0), hardRefCount(0), - cachePtr(NULL) {} + cachePtr(nullptr) {} virtual ~SharedObject(); @@ -116,7 +116,7 @@ public: * If there are multiple owners, then ptr is replaced with a * copy-constructed clone, * and that is returned. - * Returns NULL if cloning failed. + * Returns nullptr if cloning failed. * * T must be a subclass of SharedObject. */ @@ -125,7 +125,7 @@ public: const T *p = ptr; if(p->getRefCount() <= 1) { return const_cast(p); } T *p2 = new T(*p); - if(p2 == NULL) { return NULL; } + if(p2 == nullptr) { return nullptr; } p->removeRef(); ptr = p2; p2->addRef(); @@ -135,7 +135,7 @@ public: /** * Makes dest an owner of the object pointed to by src while adjusting * reference counts and deleting the previous object dest pointed to - * if necessary. Before this call is made, dest must either be NULL or + * if necessary. Before this call is made, dest must either be nullptr or * be included in the reference count of the object it points to. * * T must be a subclass of SharedObject. @@ -143,20 +143,20 @@ public: template static void copyPtr(const T *src, const T *&dest) { if(src != dest) { - if(dest != NULL) { dest->removeRef(); } + if(dest != nullptr) { dest->removeRef(); } dest = src; - if(src != NULL) { src->addRef(); } + if(src != nullptr) { src->addRef(); } } } /** - * Equivalent to copyPtr(NULL, dest). + * Equivalent to copyPtr(nullptr, dest). */ template static void clearPtr(const T *&ptr) { - if (ptr != NULL) { + if (ptr != nullptr) { ptr->removeRef(); - ptr = NULL; + ptr = nullptr; } } diff --git a/icu4c/source/common/simpleformatter.cpp b/icu4c/source/common/simpleformatter.cpp index 01d3024cfc3..b2ed2eb67d1 100644 --- a/icu4c/source/common/simpleformatter.cpp +++ b/icu4c/source/common/simpleformatter.cpp @@ -45,7 +45,7 @@ enum { }; inline UBool isInvalidArray(const void *array, int32_t length) { - return (length < 0 || (array == NULL && length != 0)); + return (length < 0 || (array == nullptr && length != 0)); } } // namespace @@ -159,7 +159,7 @@ UnicodeString& SimpleFormatter::format( const UnicodeString &value0, UnicodeString &appendTo, UErrorCode &errorCode) const { const UnicodeString *values[] = { &value0 }; - return formatAndAppend(values, 1, appendTo, NULL, 0, errorCode); + return formatAndAppend(values, 1, appendTo, nullptr, 0, errorCode); } UnicodeString& SimpleFormatter::format( @@ -167,7 +167,7 @@ UnicodeString& SimpleFormatter::format( const UnicodeString &value1, UnicodeString &appendTo, UErrorCode &errorCode) const { const UnicodeString *values[] = { &value0, &value1 }; - return formatAndAppend(values, 2, appendTo, NULL, 0, errorCode); + return formatAndAppend(values, 2, appendTo, nullptr, 0, errorCode); } UnicodeString& SimpleFormatter::format( @@ -176,7 +176,7 @@ UnicodeString& SimpleFormatter::format( const UnicodeString &value2, UnicodeString &appendTo, UErrorCode &errorCode) const { const UnicodeString *values[] = { &value0, &value1, &value2 }; - return formatAndAppend(values, 3, appendTo, NULL, 0, errorCode); + return formatAndAppend(values, 3, appendTo, nullptr, 0, errorCode); } UnicodeString& SimpleFormatter::formatAndAppend( @@ -192,7 +192,7 @@ UnicodeString& SimpleFormatter::formatAndAppend( return appendTo; } return format(compiledPattern.getBuffer(), compiledPattern.length(), values, - appendTo, NULL, true, + appendTo, nullptr, true, offsets, offsetsLength, errorCode); } @@ -287,7 +287,7 @@ UnicodeString &SimpleFormatter::format( int32_t n = compiledPattern[i++]; if (n < ARG_NUM_LIMIT) { const UnicodeString *value = values[n]; - if (value == NULL) { + if (value == nullptr) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return result; } diff --git a/icu4c/source/common/stringpiece.cpp b/icu4c/source/common/stringpiece.cpp index 99089e08ef9..eb9766c0180 100644 --- a/icu4c/source/common/stringpiece.cpp +++ b/icu4c/source/common/stringpiece.cpp @@ -16,7 +16,7 @@ U_NAMESPACE_BEGIN StringPiece::StringPiece(const char* str) - : ptr_(str), length_((str == NULL) ? 0 : static_cast(uprv_strlen(str))) { } + : ptr_(str), length_((str == nullptr) ? 0 : static_cast(uprv_strlen(str))) { } StringPiece::StringPiece(const StringPiece& x, int32_t pos) { if (pos < 0) { @@ -45,7 +45,7 @@ StringPiece::StringPiece(const StringPiece& x, int32_t pos, int32_t len) { void StringPiece::set(const char* str) { ptr_ = str; - if (str != NULL) + if (str != nullptr) length_ = static_cast(uprv_strlen(str)); else length_ = 0; diff --git a/icu4c/source/common/stringtriebuilder.cpp b/icu4c/source/common/stringtriebuilder.cpp index e6670d1cb71..bdd8b176950 100644 --- a/icu4c/source/common/stringtriebuilder.cpp +++ b/icu4c/source/common/stringtriebuilder.cpp @@ -36,7 +36,7 @@ U_CDECL_END U_NAMESPACE_BEGIN -StringTrieBuilder::StringTrieBuilder() : nodes(NULL) {} +StringTrieBuilder::StringTrieBuilder() : nodes(nullptr) {} StringTrieBuilder::~StringTrieBuilder() { deleteCompactBuilder(); @@ -47,10 +47,10 @@ StringTrieBuilder::createCompactBuilder(int32_t sizeGuess, UErrorCode &errorCode if(U_FAILURE(errorCode)) { return; } - nodes=uhash_openSize(hashStringTrieNode, equalStringTrieNodes, NULL, + nodes=uhash_openSize(hashStringTrieNode, equalStringTrieNodes, nullptr, sizeGuess, &errorCode); if(U_SUCCESS(errorCode)) { - if(nodes==NULL) { + if(nodes==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } else { uhash_setKeyDeleter(nodes, uprv_deleteUObject); @@ -61,7 +61,7 @@ StringTrieBuilder::createCompactBuilder(int32_t sizeGuess, UErrorCode &errorCode void StringTrieBuilder::deleteCompactBuilder() { uhash_close(nodes); - nodes=NULL; + nodes=nullptr; } void @@ -207,7 +207,7 @@ StringTrieBuilder::writeBranchSubNode(int32_t start, int32_t limit, int32_t unit StringTrieBuilder::Node * StringTrieBuilder::makeNode(int32_t start, int32_t limit, int32_t unitIndex, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } UBool hasValue=false; int32_t value=0; @@ -244,7 +244,7 @@ StringTrieBuilder::makeNode(int32_t start, int32_t limit, int32_t unitIndex, UEr Node *subNode=makeBranchSubNode(start, limit, unitIndex, length, errorCode); node=new BranchHeadNode(length, subNode); } - if(hasValue && node!=NULL) { + if(hasValue && node!=nullptr) { if(matchNodesCanHaveValues()) { ((ValueNode *)node)->setValue(value); } else { @@ -260,7 +260,7 @@ StringTrieBuilder::Node * StringTrieBuilder::makeBranchSubNode(int32_t start, int32_t limit, int32_t unitIndex, int32_t length, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } UChar middleUnits[kMaxSplitBranchLevels]; Node *lessThan[kMaxSplitBranchLevels]; @@ -278,12 +278,12 @@ StringTrieBuilder::makeBranchSubNode(int32_t start, int32_t limit, int32_t unitI length=length-length/2; } if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } ListBranchNode *listNode=new ListBranchNode(); - if(listNode==NULL) { + if(listNode==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // For each unit, find its elements array start and whether it has a final value. int32_t unitNumber=0; @@ -319,14 +319,14 @@ StringTrieBuilder::Node * StringTrieBuilder::registerNode(Node *newNode, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { delete newNode; - return NULL; + return nullptr; } - if(newNode==NULL) { + if(newNode==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } const UHashElement *old=uhash_find(nodes, newNode); - if(old!=NULL) { + if(old!=nullptr) { delete newNode; return (Node *)old->key.pointer; } @@ -339,7 +339,7 @@ StringTrieBuilder::registerNode(Node *newNode, UErrorCode &errorCode) { U_ASSERT(oldValue==0); if(U_FAILURE(errorCode)) { delete newNode; - return NULL; + return nullptr; } return newNode; } @@ -347,17 +347,17 @@ StringTrieBuilder::registerNode(Node *newNode, UErrorCode &errorCode) { StringTrieBuilder::Node * StringTrieBuilder::registerFinalValue(int32_t value, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } FinalValueNode key(value); const UHashElement *old=uhash_find(nodes, &key); - if(old!=NULL) { + if(old!=nullptr) { return (Node *)old->key.pointer; } Node *newNode=new FinalValueNode(value); - if(newNode==NULL) { + if(newNode==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // If uhash_puti() returns a non-zero value from an equivalent, previously // registered node, then uhash_find() failed to find that and we will leak newNode. @@ -368,7 +368,7 @@ StringTrieBuilder::registerFinalValue(int32_t value, UErrorCode &errorCode) { U_ASSERT(oldValue==0); if(U_FAILURE(errorCode)) { delete newNode; - return NULL; + return nullptr; } return newNode; } @@ -496,7 +496,7 @@ StringTrieBuilder::ListBranchNode::markRightEdgesFirst(int32_t edgeNumber) { int32_t i=length; do { Node *edge=equal[--i]; - if(edge!=NULL) { + if(edge!=nullptr) { edgeNumber=edge->markRightEdgesFirst(edgeNumber-step); } // For all but the rightmost edge, decrement the edge number. @@ -515,17 +515,17 @@ StringTrieBuilder::ListBranchNode::write(StringTrieBuilder &builder) { // Instead we write the minUnit sub-node last, for a shorter delta. int32_t unitNumber=length-1; Node *rightEdge=equal[unitNumber]; - int32_t rightEdgeNumber= rightEdge==NULL ? firstEdgeNumber : rightEdge->getOffset(); + int32_t rightEdgeNumber= rightEdge==nullptr ? firstEdgeNumber : rightEdge->getOffset(); do { --unitNumber; - if(equal[unitNumber]!=NULL) { + if(equal[unitNumber]!=nullptr) { equal[unitNumber]->writeUnlessInsideRightEdge(firstEdgeNumber, rightEdgeNumber, builder); } } while(unitNumber>0); // The maxUnit sub-node is written as the very last one because we do // not jump for it at all. unitNumber=length-1; - if(rightEdge==NULL) { + if(rightEdge==nullptr) { builder.writeValueAndFinal(values[unitNumber], true); } else { rightEdge->write(builder); @@ -535,7 +535,7 @@ StringTrieBuilder::ListBranchNode::write(StringTrieBuilder &builder) { while(--unitNumber>=0) { int32_t value; UBool isFinal; - if(equal[unitNumber]==NULL) { + if(equal[unitNumber]==nullptr) { // Write the final value for the one string ending with this unit. value=values[unitNumber]; isFinal=true; diff --git a/icu4c/source/common/uarrsort.cpp b/icu4c/source/common/uarrsort.cpp index 17b6964ffe0..f9daa4b30ff 100644 --- a/icu4c/source/common/uarrsort.cpp +++ b/icu4c/source/common/uarrsort.cpp @@ -256,10 +256,10 @@ U_CAPI void U_EXPORT2 uprv_sortArray(void *array, int32_t length, int32_t itemSize, UComparator *cmp, const void *context, UBool sortStable, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } - if((length>0 && array==NULL) || length<0 || itemSize<=0 || cmp==NULL) { + if((length>0 && array==nullptr) || length<0 || itemSize<=0 || cmp==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } diff --git a/icu4c/source/common/ubidi.cpp b/icu4c/source/common/ubidi.cpp index eb40a212e17..c1de0201b76 100644 --- a/icu4c/source/common/ubidi.cpp +++ b/icu4c/source/common/ubidi.cpp @@ -135,21 +135,21 @@ ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode) UBiDi *pBiDi; /* check the argument values */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { - return NULL; + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; } else if(maxLength<0 || maxRunCount<0) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; /* invalid arguments */ + return nullptr; /* invalid arguments */ } /* allocate memory for the object */ pBiDi=(UBiDi *)uprv_malloc(sizeof(UBiDi)); - if(pBiDi==NULL) { + if(pBiDi==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - /* reset the object, all pointers NULL, all flags false, all sizes 0 */ + /* reset the object, all pointers nullptr, all flags false, all sizes 0 */ uprv_memset(pBiDi, 0, sizeof(UBiDi)); /* allocate memory for arrays as requested */ @@ -178,18 +178,18 @@ ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode) return pBiDi; } else { ubidi_close(pBiDi); - return NULL; + return nullptr; } } /* - * We are allowed to allocate memory if memory==NULL or + * We are allowed to allocate memory if memory==nullptr or * mayAllocate==true for each array that we need. * We also try to grow memory as needed if we * allocate it. * * Assume sizeNeeded>0. - * If *pMemory!=NULL, then assume *pSize>0. + * If *pMemory!=nullptr, then assume *pSize>0. * * ### this realloc() may unnecessarily copy the old data, * which we know we don't need any more; @@ -199,9 +199,9 @@ U_CFUNC UBool ubidi_getMemory(BidiMemoryForAllocation *bidiMem, int32_t *pSize, UBool mayAllocate, int32_t sizeNeeded) { void **pMemory = (void **)bidiMem; /* check for existing memory */ - if(*pMemory==NULL) { + if(*pMemory==nullptr) { /* we need to allocate memory */ - if(mayAllocate && (*pMemory=uprv_malloc(sizeNeeded))!=NULL) { + if(mayAllocate && (*pMemory=uprv_malloc(sizeNeeded))!=nullptr) { *pSize=sizeNeeded; return true; } else { @@ -222,7 +222,7 @@ ubidi_getMemory(BidiMemoryForAllocation *bidiMem, int32_t *pSize, UBool mayAlloc * realloc, but it is needed when adding runs using getRunsMemory() * in setParaRunsOnly() */ - if((memory=uprv_realloc(*pMemory, sizeNeeded))!=NULL) { + if((memory=uprv_realloc(*pMemory, sizeNeeded))!=nullptr) { *pMemory=memory; *pSize=sizeNeeded; return true; @@ -236,27 +236,27 @@ ubidi_getMemory(BidiMemoryForAllocation *bidiMem, int32_t *pSize, UBool mayAlloc U_CAPI void U_EXPORT2 ubidi_close(UBiDi *pBiDi) { - if(pBiDi!=NULL) { - pBiDi->pParaBiDi=NULL; /* in case one tries to reuse this block */ - if(pBiDi->dirPropsMemory!=NULL) { + if(pBiDi!=nullptr) { + pBiDi->pParaBiDi=nullptr; /* in case one tries to reuse this block */ + if(pBiDi->dirPropsMemory!=nullptr) { uprv_free(pBiDi->dirPropsMemory); } - if(pBiDi->levelsMemory!=NULL) { + if(pBiDi->levelsMemory!=nullptr) { uprv_free(pBiDi->levelsMemory); } - if(pBiDi->openingsMemory!=NULL) { + if(pBiDi->openingsMemory!=nullptr) { uprv_free(pBiDi->openingsMemory); } - if(pBiDi->parasMemory!=NULL) { + if(pBiDi->parasMemory!=nullptr) { uprv_free(pBiDi->parasMemory); } - if(pBiDi->runsMemory!=NULL) { + if(pBiDi->runsMemory!=nullptr) { uprv_free(pBiDi->runsMemory); } - if(pBiDi->isolatesMemory!=NULL) { + if(pBiDi->isolatesMemory!=nullptr) { uprv_free(pBiDi->isolatesMemory); } - if(pBiDi->insertPoints.points!=NULL) { + if(pBiDi->insertPoints.points!=nullptr) { uprv_free(pBiDi->insertPoints.points); } @@ -268,7 +268,7 @@ ubidi_close(UBiDi *pBiDi) { U_CAPI void U_EXPORT2 ubidi_setInverse(UBiDi *pBiDi, UBool isInverse) { - if(pBiDi!=NULL) { + if(pBiDi!=nullptr) { pBiDi->isInverse=isInverse; pBiDi->reorderingMode = isInverse ? UBIDI_REORDER_INVERSE_NUMBERS_AS_L : UBIDI_REORDER_DEFAULT; @@ -277,7 +277,7 @@ ubidi_setInverse(UBiDi *pBiDi, UBool isInverse) { U_CAPI UBool U_EXPORT2 ubidi_isInverse(UBiDi *pBiDi) { - if(pBiDi!=NULL) { + if(pBiDi!=nullptr) { return pBiDi->isInverse; } else { return false; @@ -301,7 +301,7 @@ ubidi_isInverse(UBiDi *pBiDi) { */ U_CAPI void U_EXPORT2 ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode) { - if ((pBiDi!=NULL) && (reorderingMode >= UBIDI_REORDER_DEFAULT) + if ((pBiDi!=nullptr) && (reorderingMode >= UBIDI_REORDER_DEFAULT) && (reorderingMode < UBIDI_REORDER_COUNT)) { pBiDi->reorderingMode = reorderingMode; pBiDi->isInverse = (UBool)(reorderingMode == UBIDI_REORDER_INVERSE_NUMBERS_AS_L); @@ -310,7 +310,7 @@ ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode) { U_CAPI UBiDiReorderingMode U_EXPORT2 ubidi_getReorderingMode(UBiDi *pBiDi) { - if (pBiDi!=NULL) { + if (pBiDi!=nullptr) { return pBiDi->reorderingMode; } else { return UBIDI_REORDER_DEFAULT; @@ -322,14 +322,14 @@ ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions) { if (reorderingOptions & UBIDI_OPTION_REMOVE_CONTROLS) { reorderingOptions&=~UBIDI_OPTION_INSERT_MARKS; } - if (pBiDi!=NULL) { + if (pBiDi!=nullptr) { pBiDi->reorderingOptions=reorderingOptions; } } U_CAPI uint32_t U_EXPORT2 ubidi_getReorderingOptions(UBiDi *pBiDi) { - if (pBiDi!=NULL) { + if (pBiDi!=nullptr) { return pBiDi->reorderingOptions; } else { return 0; @@ -344,7 +344,7 @@ int32_t length){ UChar32 uchar; UCharDirection dir; - if( text==NULL || length<-1 ){ + if( text==nullptr || length<-1 ){ return UBIDI_NEUTRAL; } @@ -1797,7 +1797,7 @@ addPoint(UBiDi *pBiDi, int32_t pos, int32_t flag) if (pInsertPoints->capacity == 0) { pInsertPoints->points=static_cast(uprv_malloc(sizeof(Point)*FIRSTALLOC)); - if (pInsertPoints->points == NULL) + if (pInsertPoints->points == nullptr) { pInsertPoints->errorCode=U_MEMORY_ALLOCATION_ERROR; return; @@ -1809,7 +1809,7 @@ addPoint(UBiDi *pBiDi, int32_t pos, int32_t flag) Point * savePoints=pInsertPoints->points; pInsertPoints->points=static_cast(uprv_realloc(pInsertPoints->points, pInsertPoints->capacity*2*sizeof(Point))); - if (pInsertPoints->points == NULL) + if (pInsertPoints->points == nullptr) { pInsertPoints->points=savePoints; pInsertPoints->errorCode=U_MEMORY_ALLOCATION_ERROR; @@ -2331,8 +2331,8 @@ ubidi_setContext(UBiDi *pBiDi, UErrorCode *pErrorCode) { /* check the argument values */ RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrorCode); - if(pBiDi==NULL || proLength<-1 || epiLength<-1 || - (prologue==NULL && proLength!=0) || (epilogue==NULL && epiLength!=0)) { + if(pBiDi==nullptr || proLength<-1 || epiLength<-1 || + (prologue==nullptr && proLength!=0) || (epilogue==nullptr && epiLength!=0)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -2364,7 +2364,7 @@ setParaSuccess(UBiDi *pBiDi) { static void setParaRunsOnly(UBiDi *pBiDi, const UChar *text, int32_t length, UBiDiLevel paraLevel, UErrorCode *pErrorCode) { - int32_t *runsOnlyMemory = NULL; + int32_t *runsOnlyMemory = nullptr; int32_t *visualMap; UChar *visualText; int32_t saveLength, saveTrailingWSStart; @@ -2381,12 +2381,12 @@ setParaRunsOnly(UBiDi *pBiDi, const UChar *text, int32_t length, pBiDi->reorderingMode=UBIDI_REORDER_DEFAULT; if(length==0) { - ubidi_setPara(pBiDi, text, length, paraLevel, NULL, pErrorCode); + ubidi_setPara(pBiDi, text, length, paraLevel, nullptr, pErrorCode); goto cleanup3; } /* obtain memory for mapping table and visual text */ runsOnlyMemory=static_cast(uprv_malloc(length*(sizeof(int32_t)+sizeof(UChar)+sizeof(UBiDiLevel)))); - if(runsOnlyMemory==NULL) { + if(runsOnlyMemory==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; goto cleanup3; } @@ -2399,7 +2399,7 @@ setParaRunsOnly(UBiDi *pBiDi, const UChar *text, int32_t length, pBiDi->reorderingOptions|=UBIDI_OPTION_REMOVE_CONTROLS; } paraLevel&=1; /* accept only 0 or 1 */ - ubidi_setPara(pBiDi, text, length, paraLevel, NULL, pErrorCode); + ubidi_setPara(pBiDi, text, length, paraLevel, nullptr, pErrorCode); if(U_FAILURE(*pErrorCode)) { goto cleanup3; } @@ -2437,7 +2437,7 @@ setParaRunsOnly(UBiDi *pBiDi, const UChar *text, int32_t length, */ saveMayAllocateText=pBiDi->mayAllocateText; pBiDi->mayAllocateText=false; - ubidi_setPara(pBiDi, visualText, visualLength, paraLevel, NULL, pErrorCode); + ubidi_setPara(pBiDi, visualText, visualLength, paraLevel, nullptr, pErrorCode); pBiDi->mayAllocateText=saveMayAllocateText; ubidi_getRuns(pBiDi, pErrorCode); if(U_FAILURE(*pErrorCode)) { @@ -2559,7 +2559,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, /* check the argument values */ RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrorCode); - if(pBiDi==NULL || text==NULL || length<-1 || + if(pBiDi==nullptr || text==nullptr || length<-1 || (paraLevel>UBIDI_MAX_EXPLICIT_LEVEL && paraLevelpParaBiDi=NULL; /* mark unfinished setPara */ + pBiDi->pParaBiDi=nullptr; /* mark unfinished setPara */ pBiDi->text=text; pBiDi->length=pBiDi->originalLength=pBiDi->resultLength=length; pBiDi->paraLevel=paraLevel; pBiDi->direction=(UBiDiDirection)(paraLevel&1); pBiDi->paraCount=1; - pBiDi->dirProps=NULL; - pBiDi->levels=NULL; - pBiDi->runs=NULL; + pBiDi->dirProps=nullptr; + pBiDi->levels=nullptr; + pBiDi->runs=nullptr; pBiDi->insertPoints.size=0; /* clean up from last call */ pBiDi->insertPoints.confirmed=0; /* clean up from last call */ @@ -2640,7 +2640,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, pBiDi->trailingWSStart=length; /* the levels[] will reflect the WS run */ /* are explicit levels specified? */ - if(embeddingLevels==NULL) { + if(embeddingLevels==nullptr) { /* no: determine explicit levels according to the (Xn) rules */\ if(getLevelsMemory(pBiDi, length)) { pBiDi->levels=pBiDi->levelsMemory; @@ -2737,7 +2737,7 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, * Examples for "insignificant" ones are empty embeddings * LRE-PDF, LRE-RLE-PDF-PDF, etc. */ - if(embeddingLevels==NULL && pBiDi->paraCount<=1 && + if(embeddingLevels==nullptr && pBiDi->paraCount<=1 && !(pBiDi->flags&DIRPROP_FLAG_MULTI_RUNS)) { resolveImplicitLevels(pBiDi, 0, length, GET_LR_FROM_LEVEL(GET_PARALEVEL(pBiDi, 0)), @@ -2856,14 +2856,14 @@ ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length, U_CAPI void U_EXPORT2 ubidi_orderParagraphsLTR(UBiDi *pBiDi, UBool orderParagraphsLTR) { - if(pBiDi!=NULL) { + if(pBiDi!=nullptr) { pBiDi->orderParagraphsLTR=orderParagraphsLTR; } } U_CAPI UBool U_EXPORT2 ubidi_isOrderParagraphsLTR(UBiDi *pBiDi) { - if(pBiDi!=NULL) { + if(pBiDi!=nullptr) { return pBiDi->orderParagraphsLTR; } else { return false; @@ -2884,7 +2884,7 @@ ubidi_getText(const UBiDi *pBiDi) { if(IS_VALID_PARA_OR_LINE(pBiDi)) { return pBiDi->text; } else { - return NULL; + return nullptr; } } @@ -2952,13 +2952,13 @@ ubidi_getParagraphByIndex(const UBiDi *pBiDi, int32_t paraIndex, } else { paraStart=0; } - if(pParaStart!=NULL) { + if(pParaStart!=nullptr) { *pParaStart=paraStart; } - if(pParaLimit!=NULL) { + if(pParaLimit!=nullptr) { *pParaLimit=pBiDi->paras[paraIndex].limit; } - if(pParaLevel!=NULL) { + if(pParaLevel!=nullptr) { *pParaLevel=GET_PARALEVEL(pBiDi, paraStart); } } @@ -2987,7 +2987,7 @@ ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn, const void **oldContext, UErrorCode *pErrorCode) { RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrorCode); - if(pBiDi==NULL) { + if(pBiDi==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -3006,7 +3006,7 @@ ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn, U_CAPI void U_EXPORT2 ubidi_getClassCallback(UBiDi *pBiDi, UBiDiClassCallback **fn, const void **context) { - if(pBiDi==NULL) { + if(pBiDi==nullptr) { return; } if( fn ) @@ -3024,7 +3024,7 @@ ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c) { UCharDirection dir; - if( pBiDi->fnClassCallback == NULL || + if( pBiDi->fnClassCallback == nullptr || (dir = (*pBiDi->fnClassCallback)(pBiDi->coClassCallback, c)) == U_BIDI_CLASS_DEFAULT ) { dir = ubidi_getClass(c); diff --git a/icu4c/source/common/ubidi_props.cpp b/icu4c/source/common/ubidi_props.cpp index 3ba58f7af99..8f3f6a65c4b 100644 --- a/icu4c/source/common/ubidi_props.cpp +++ b/icu4c/source/common/ubidi_props.cpp @@ -69,7 +69,7 @@ ubidi_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) { } /* add the start code point of each same-value range of the trie */ - utrie2_enum(&ubidi_props_singleton.trie, NULL, _enumPropertyStartsRange, sa); + utrie2_enum(&ubidi_props_singleton.trie, nullptr, _enumPropertyStartsRange, sa); /* add the code points from the bidi mirroring table */ length=ubidi_props_singleton.indexes[UBIDI_IX_MIRROR_LENGTH]; diff --git a/icu4c/source/common/ubidi_props_data.h b/icu4c/source/common/ubidi_props_data.h index 01fcc968cb8..5dcd1d7c781 100644 --- a/icu4c/source/common/ubidi_props_data.h +++ b/icu4c/source/common/ubidi_props_data.h @@ -925,7 +925,7 @@ static const uint8_t ubidi_props_jgArray2[612]={ }; static const UBiDiProps ubidi_props_singleton={ - NULL, + nullptr, ubidi_props_indexes, ubidi_props_mirrors, ubidi_props_jgArray, @@ -933,7 +933,7 @@ static const UBiDiProps ubidi_props_singleton={ { ubidi_props_trieIndex, ubidi_props_trieIndex+3612, - NULL, + nullptr, 3612, 9412, 0x1a0, @@ -942,7 +942,7 @@ static const UBiDiProps ubidi_props_singleton={ 0x0, 0x110000, 0x32dc, - NULL, 0, false, false, 0, NULL + nullptr, 0, false, false, 0, nullptr }, { 2,2,0,0 } }; diff --git a/icu4c/source/common/ubidiln.cpp b/icu4c/source/common/ubidiln.cpp index 430ece39d28..7ad94498fcb 100644 --- a/icu4c/source/common/ubidiln.cpp +++ b/icu4c/source/common/ubidiln.cpp @@ -37,7 +37,7 @@ * This means that there is a UBiDi object with a levels * and a dirProps array. * paraLevel and direction are also set. - * Only if the length of the text is zero, then levels==dirProps==NULL. + * Only if the length of the text is zero, then levels==dirProps==nullptr. * * The overall directionality of the paragraph * or line is used to bypass the reordering steps if possible. @@ -134,25 +134,25 @@ ubidi_setLine(const UBiDi *pParaBiDi, RETURN_VOID_IF_NOT_VALID_PARA(pParaBiDi, *pErrorCode); RETURN_VOID_IF_BAD_RANGE(start, 0, limit, *pErrorCode); RETURN_VOID_IF_BAD_RANGE(limit, 0, pParaBiDi->length+1, *pErrorCode); - if(pLineBiDi==NULL) { + if(pLineBiDi==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } - if(ubidi_getParagraph(pParaBiDi, start, NULL, NULL, NULL, pErrorCode) != - ubidi_getParagraph(pParaBiDi, limit-1, NULL, NULL, NULL, pErrorCode)) { + if(ubidi_getParagraph(pParaBiDi, start, nullptr, nullptr, nullptr, pErrorCode) != + ubidi_getParagraph(pParaBiDi, limit-1, nullptr, nullptr, nullptr, pErrorCode)) { /* the line crosses a paragraph boundary */ *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } /* set the values in pLineBiDi from its pParaBiDi parent */ - pLineBiDi->pParaBiDi=NULL; /* mark unfinished setLine */ + pLineBiDi->pParaBiDi=nullptr; /* mark unfinished setLine */ pLineBiDi->text=pParaBiDi->text+start; length=pLineBiDi->length=limit-start; pLineBiDi->resultLength=pLineBiDi->originalLength=length; pLineBiDi->paraLevel=GET_PARALEVEL(pParaBiDi, start); pLineBiDi->paraCount=pParaBiDi->paraCount; - pLineBiDi->runs=NULL; + pLineBiDi->runs=nullptr; pLineBiDi->flags=0; pLineBiDi->reorderingMode=pParaBiDi->reorderingMode; pLineBiDi->reorderingOptions=pParaBiDi->reorderingOptions; @@ -263,11 +263,11 @@ U_CAPI const UBiDiLevel * U_EXPORT2 ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) { int32_t start, length; - RETURN_IF_NULL_OR_FAILING_ERRCODE(pErrorCode, NULL); - RETURN_IF_NOT_VALID_PARA_OR_LINE(pBiDi, *pErrorCode, NULL); + RETURN_IF_NULL_OR_FAILING_ERRCODE(pErrorCode, nullptr); + RETURN_IF_NOT_VALID_PARA_OR_LINE(pBiDi, *pErrorCode, nullptr); if((length=pBiDi->length)<=0) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if((start=pBiDi->trailingWSStart)==length) { /* the current levels array reflects the WS run */ @@ -297,7 +297,7 @@ ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) { } else { /* out of memory */ *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } } @@ -373,10 +373,10 @@ ubidi_getVisualRun(UBiDi *pBiDi, int32_t runIndex, RETURN_IF_BAD_RANGE(runIndex, 0, pBiDi->runCount, errorCode, UBIDI_LTR); start=pBiDi->runs[runIndex].logicalStart; - if(pLogicalStart!=NULL) { + if(pLogicalStart!=nullptr) { *pLogicalStart=GET_INDEX(start); } - if(pLength!=NULL) { + if(pLength!=nullptr) { if(runIndex>0) { *pLength=pBiDi->runs[runIndex].visualLimit- pBiDi->runs[runIndex-1].visualLimit; @@ -713,7 +713,7 @@ prepareReorder(const UBiDiLevel *levels, int32_t length, int32_t start; UBiDiLevel level, minLevel, maxLevel; - if(levels==NULL || length<=0) { + if(levels==nullptr || length<=0) { return false; } @@ -751,7 +751,7 @@ ubidi_reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap int32_t start, limit, sumOfSosEos; UBiDiLevel minLevel = 0, maxLevel = 0; - if(indexMap==NULL || !prepareReorder(levels, length, indexMap, &minLevel, &maxLevel)) { + if(indexMap==nullptr || !prepareReorder(levels, length, indexMap, &minLevel, &maxLevel)) { return; } @@ -814,7 +814,7 @@ ubidi_reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) int32_t start, end, limit, temp; UBiDiLevel minLevel = 0, maxLevel = 0; - if(indexMap==NULL || !prepareReorder(levels, length, indexMap, &minLevel, &maxLevel)) { + if(indexMap==nullptr || !prepareReorder(levels, length, indexMap, &minLevel, &maxLevel)) { return; } @@ -1113,7 +1113,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { ubidi_countRuns(pBiDi, pErrorCode); if(U_FAILURE(*pErrorCode)) { /* no op */ - } else if(indexMap==NULL) { + } else if(indexMap==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } else { /* fill a logical-to-visual index map using the runs[] */ @@ -1210,7 +1210,7 @@ ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { U_CAPI void U_EXPORT2 ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrorCode); - if(indexMap==NULL) { + if(indexMap==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1317,7 +1317,7 @@ ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) { U_CAPI void U_EXPORT2 ubidi_invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length) { - if(srcMap!=NULL && destMap!=NULL && length>0) { + if(srcMap!=nullptr && destMap!=nullptr && length>0) { const int32_t *pi; int32_t destLength=-1, count=0; /* find highest value and count positive indexes in srcMap */ diff --git a/icu4c/source/common/ubiditransform.cpp b/icu4c/source/common/ubiditransform.cpp index 24fffd9c460..fe190391bb7 100644 --- a/icu4c/source/common/ubiditransform.cpp +++ b/icu4c/source/common/ubiditransform.cpp @@ -92,10 +92,10 @@ struct UBiDiTransform { U_CAPI UBiDiTransform* U_EXPORT2 ubiditransform_open(UErrorCode *pErrorCode) { - UBiDiTransform *pBiDiTransform = NULL; + UBiDiTransform *pBiDiTransform = nullptr; if (U_SUCCESS(*pErrorCode)) { pBiDiTransform = (UBiDiTransform*) uprv_calloc(1, sizeof(UBiDiTransform)); - if (pBiDiTransform == NULL) { + if (pBiDiTransform == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; } } @@ -105,11 +105,11 @@ ubiditransform_open(UErrorCode *pErrorCode) U_CAPI void U_EXPORT2 ubiditransform_close(UBiDiTransform *pBiDiTransform) { - if (pBiDiTransform != NULL) { - if (pBiDiTransform->pBidi != NULL) { + if (pBiDiTransform != nullptr) { + if (pBiDiTransform->pBidi != nullptr) { ubidi_close(pBiDiTransform->pBidi); } - if (pBiDiTransform->src != NULL) { + if (pBiDiTransform->src != nullptr) { uprv_free(pBiDiTransform->src); } uprv_free(pBiDiTransform); @@ -129,7 +129,7 @@ static UBool action_resolve(UBiDiTransform *pTransform, UErrorCode *pErrorCode) { ubidi_setPara(pTransform->pBidi, pTransform->src, pTransform->srcLength, - pTransform->pActiveScheme->baseLevel, NULL, pErrorCode); + pTransform->pActiveScheme->baseLevel, nullptr, pErrorCode); return false; } @@ -229,12 +229,12 @@ updateSrc(UBiDiTransform *pTransform, const UChar *newSrc, uint32_t newLength, } if (newSize > pTransform->srcSize) { newSize += 50; // allocate slightly more than needed right now - if (pTransform->src != NULL) { + if (pTransform->src != nullptr) { uprv_free(pTransform->src); - pTransform->src = NULL; + pTransform->src = nullptr; } pTransform->src = (UChar *)uprv_malloc(newSize * sizeof(UChar)); - if (pTransform->src == NULL) { + if (pTransform->src == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; //pTransform->srcLength = pTransform->srcSize = 0; return; @@ -331,52 +331,52 @@ static const ReorderingScheme Schemes[] = { /* 0: Logical LTR => Visual LTR */ {LTR, LOGICAL, LTR, VISUAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_shapeArabic, action_resolve, action_reorder, NULL}}, + {action_shapeArabic, action_resolve, action_reorder, nullptr}}, /* 1: Logical RTL => Visual LTR */ {RTL, LOGICAL, LTR, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, RTL, - {action_resolve, action_reorder, action_shapeArabic, NULL}}, + {action_resolve, action_reorder, action_shapeArabic, nullptr}}, /* 2: Logical LTR => Visual RTL */ {LTR, LOGICAL, RTL, VISUAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_shapeArabic, action_resolve, action_reorder, action_reverse, NULL}}, + {action_shapeArabic, action_resolve, action_reorder, action_reverse, nullptr}}, /* 3: Logical RTL => Visual RTL */ {RTL, LOGICAL, RTL, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, RTL, - {action_resolve, action_reorder, action_shapeArabic, action_reverse, NULL}}, + {action_resolve, action_reorder, action_shapeArabic, action_reverse, nullptr}}, /* 4: Visual LTR => Logical RTL */ {LTR, VISUAL, RTL, LOGICAL, SHAPE_LOGICAL, SHAPE_VISUAL, RTL, - {action_shapeArabic, action_setInverse, action_resolve, action_reorder, NULL}}, + {action_shapeArabic, action_setInverse, action_resolve, action_reorder, nullptr}}, /* 5: Visual RTL => Logical RTL */ {RTL, VISUAL, RTL, LOGICAL, SHAPE_LOGICAL, SHAPE_VISUAL, RTL, - {action_reverse, action_shapeArabic, action_setInverse, action_resolve, action_reorder, NULL}}, + {action_reverse, action_shapeArabic, action_setInverse, action_resolve, action_reorder, nullptr}}, /* 6: Visual LTR => Logical LTR */ {LTR, VISUAL, LTR, LOGICAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_setInverse, action_resolve, action_reorder, action_shapeArabic, NULL}}, + {action_setInverse, action_resolve, action_reorder, action_shapeArabic, nullptr}}, /* 7: Visual RTL => Logical LTR */ {RTL, VISUAL, LTR, LOGICAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_reverse, action_setInverse, action_resolve, action_reorder, action_shapeArabic, NULL}}, + {action_reverse, action_setInverse, action_resolve, action_reorder, action_shapeArabic, nullptr}}, /* 8: Logical LTR => Logical RTL */ {LTR, LOGICAL, RTL, LOGICAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_shapeArabic, action_resolve, action_mirror, action_setRunsOnly, action_resolve, action_reorder, NULL}}, + {action_shapeArabic, action_resolve, action_mirror, action_setRunsOnly, action_resolve, action_reorder, nullptr}}, /* 9: Logical RTL => Logical LTR */ {RTL, LOGICAL, LTR, LOGICAL, SHAPE_LOGICAL, SHAPE_LOGICAL, RTL, - {action_resolve, action_mirror, action_setRunsOnly, action_resolve, action_reorder, action_shapeArabic, NULL}}, + {action_resolve, action_mirror, action_setRunsOnly, action_resolve, action_reorder, action_shapeArabic, nullptr}}, /* 10: Visual LTR => Visual RTL */ {LTR, VISUAL, RTL, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, LTR, - {action_shapeArabic, action_setInverse, action_resolve, action_mirror, action_reverse, NULL}}, + {action_shapeArabic, action_setInverse, action_resolve, action_mirror, action_reverse, nullptr}}, /* 11: Visual RTL => Visual LTR */ {RTL, VISUAL, LTR, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, LTR, - {action_reverse, action_shapeArabic, action_setInverse, action_resolve, action_mirror, NULL}}, + {action_reverse, action_shapeArabic, action_setInverse, action_resolve, action_mirror, nullptr}}, /* 12: Logical LTR => Logical LTR */ {LTR, LOGICAL, LTR, LOGICAL, SHAPE_LOGICAL, SHAPE_LOGICAL, LTR, - {action_resolve, action_mirror, action_shapeArabic, NULL}}, + {action_resolve, action_mirror, action_shapeArabic, nullptr}}, /* 13: Logical RTL => Logical RTL */ {RTL, LOGICAL, RTL, LOGICAL, SHAPE_VISUAL, SHAPE_LOGICAL, RTL, - {action_resolve, action_mirror, action_shapeArabic, NULL}}, + {action_resolve, action_mirror, action_shapeArabic, nullptr}}, /* 14: Visual LTR => Visual LTR */ {LTR, VISUAL, LTR, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, LTR, - {action_resolve, action_mirror, action_shapeArabic, NULL}}, + {action_resolve, action_mirror, action_shapeArabic, nullptr}}, /* 15: Visual RTL => Visual RTL */ {RTL, VISUAL, RTL, VISUAL, SHAPE_LOGICAL, SHAPE_VISUAL, LTR, - {action_reverse, action_resolve, action_mirror, action_shapeArabic, action_reverse, NULL}} + {action_reverse, action_resolve, action_mirror, action_shapeArabic, action_reverse, nullptr}} }; static const uint32_t nSchemes = sizeof(Schemes) / sizeof(*Schemes); @@ -417,7 +417,7 @@ resolveBaseDirection(const UChar *text, uint32_t length, * Finds a valid ReorderingScheme matching the * caller-defined scheme. * - * @return A valid ReorderingScheme object or NULL + * @return A valid ReorderingScheme object or nullptr */ static const ReorderingScheme* findMatchingScheme(UBiDiLevel inLevel, UBiDiLevel outLevel, @@ -431,7 +431,7 @@ findMatchingScheme(UBiDiLevel inLevel, UBiDiLevel outLevel, return pScheme; } } - return NULL; + return nullptr; } U_CAPI uint32_t U_EXPORT2 @@ -446,19 +446,19 @@ ubiditransform_transform(UBiDiTransform *pBiDiTransform, uint32_t destLength = 0; UBool textChanged = false; const UBiDiTransform *pOrigTransform = pBiDiTransform; - const UBiDiAction *action = NULL; + const UBiDiAction *action = nullptr; if (U_FAILURE(*pErrorCode)) { return 0; } - if (src == NULL || dest == NULL) { + if (src == nullptr || dest == nullptr) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } CHECK_LEN(src, srcLength, pErrorCode); CHECK_LEN(dest, destSize, pErrorCode); - if (pBiDiTransform == NULL) { + if (pBiDiTransform == nullptr) { pBiDiTransform = ubiditransform_open(pErrorCode); if (U_FAILURE(*pErrorCode)) { return 0; @@ -470,7 +470,7 @@ ubiditransform_transform(UBiDiTransform *pBiDiTransform, pBiDiTransform->pActiveScheme = findMatchingScheme(inParaLevel, outParaLevel, inOrder, outOrder); - if (pBiDiTransform->pActiveScheme == NULL) { + if (pBiDiTransform->pActiveScheme == nullptr) { goto cleanup; } pBiDiTransform->reorderingOptions = doMirroring ? UBIDI_DO_MIRRORING @@ -486,7 +486,7 @@ ubiditransform_transform(UBiDiTransform *pBiDiTransform, if (U_FAILURE(*pErrorCode)) { goto cleanup; } - if (pBiDiTransform->pBidi == NULL) { + if (pBiDiTransform->pBidi == nullptr) { pBiDiTransform->pBidi = ubidi_openSized(0, 0, pErrorCode); if (U_FAILURE(*pErrorCode)) { goto cleanup; @@ -521,8 +521,8 @@ cleanup: if (pOrigTransform != pBiDiTransform) { ubiditransform_close(pBiDiTransform); } else { - pBiDiTransform->dest = NULL; - pBiDiTransform->pDestLength = NULL; + pBiDiTransform->dest = nullptr; + pBiDiTransform->pDestLength = nullptr; pBiDiTransform->srcLength = 0; pBiDiTransform->destSize = 0; } diff --git a/icu4c/source/common/ubidiwrt.cpp b/icu4c/source/common/ubidiwrt.cpp index a69c0a4b8b1..ba30d46156c 100644 --- a/icu4c/source/common/ubidiwrt.cpp +++ b/icu4c/source/common/ubidiwrt.cpp @@ -312,20 +312,20 @@ ubidi_writeReverse(const UChar *src, int32_t srcLength, UErrorCode *pErrorCode) { int32_t destLength; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } /* more error checking */ - if( src==NULL || srcLength<-1 || - destSize<0 || (destSize>0 && dest==NULL)) + if( src==nullptr || srcLength<-1 || + destSize<0 || (destSize>0 && dest==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } /* do input and output overlap? */ - if( dest!=NULL && + if( dest!=nullptr && ((src>=dest && src=src && desttext)==NULL || (length=pBiDi->length)<0 || - destSize<0 || (destSize>0 && dest==NULL)) + if( pBiDi==nullptr || + (text=pBiDi->text)==nullptr || (length=pBiDi->length)<0 || + destSize<0 || (destSize>0 && dest==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } /* do input and output overlap? */ - if( dest!=NULL && + if( dest!=nullptr && ((text>=dest && text=text && destoriginalLength))) { @@ -451,7 +451,7 @@ ubidi_writeReordered(UBiDi *pBiDi, dest, destSize, options, pErrorCode); } - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; @@ -495,7 +495,7 @@ ubidi_writeReordered(UBiDi *pBiDi, runLength=doWriteForward(src, runLength, dest, destSize, (uint16_t)(options&~UBIDI_DO_MIRRORING), pErrorCode); - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; @@ -539,7 +539,7 @@ ubidi_writeReordered(UBiDi *pBiDi, runLength=doWriteReverse(src, runLength, dest, destSize, options, pErrorCode); - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; @@ -578,7 +578,7 @@ ubidi_writeReordered(UBiDi *pBiDi, dest, destSize, options, pErrorCode); } - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; @@ -605,7 +605,7 @@ ubidi_writeReordered(UBiDi *pBiDi, runLength=doWriteReverse(src, runLength, dest, destSize, (uint16_t)(options&~UBIDI_DO_MIRRORING), pErrorCode); - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; @@ -627,7 +627,7 @@ ubidi_writeReordered(UBiDi *pBiDi, runLength=doWriteForward(src, runLength, dest, destSize, options, pErrorCode); - if(dest!=NULL) { + if(dest!=nullptr) { dest+=runLength; } destSize-=runLength; diff --git a/icu4c/source/common/ucase.cpp b/icu4c/source/common/ucase.cpp index 3d1750265b1..e73b096bc59 100644 --- a/icu4c/source/common/ucase.cpp +++ b/icu4c/source/common/ucase.cpp @@ -50,7 +50,7 @@ ucase_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) { } /* add the start code point of each same-value range of the trie */ - utrie2_enum(&ucase_props_singleton.trie, NULL, _enumPropertyStartsRange, sa); + utrie2_enum(&ucase_props_singleton.trie, nullptr, _enumPropertyStartsRange, sa); /* add code points with hardcoded properties, plus the ones following them */ @@ -279,7 +279,7 @@ ucase_addCaseClosure(UChar32 c, const USetAdder *sa) { closure=(const UChar *)pe+1; /* behind this slot, unless there are full case mappings */ } else { closureLength=0; - closure=NULL; + closure=nullptr; } /* add the full case folding */ @@ -353,7 +353,7 @@ U_CFUNC UBool U_EXPORT2 ucase_addStringCaseClosure(const UChar *s, int32_t length, const USetAdder *sa) { int32_t i, start, limit, result, unfoldRows, unfoldRowWidth, unfoldStringWidth; - if(ucase_props_singleton.unfold==NULL || s==NULL) { + if(ucase_props_singleton.unfold==nullptr || s==nullptr) { return false; /* no reverse case folding data, or no string */ } if(length<=1) { @@ -708,7 +708,7 @@ ucase_isCaseSensitive(UChar32 c) { #define is_sep(c) ((c)=='_' || (c)=='-' || (c)==0) /** - * Requires non-NULL locale ID but otherwise does the equivalent of + * Requires non-nullptr locale ID but otherwise does the equivalent of * checking for language codes as if uloc_getLanguage() were called: * Accepts both 2- and 3-letter codes and accepts case variants. */ @@ -721,7 +721,7 @@ ucase_getCaseLocale(const char *locale) { * examined and copied/transformed. * * Because this code does not want to depend on uloc, the caller must - * pass in a non-NULL locale, i.e., may need to call uloc_getDefault(). + * pass in a non-nullptr locale, i.e., may need to call uloc_getDefault(). */ char c=*locale++; // Fastpath for English "en" which is often used for default (=root locale) case mappings, @@ -904,7 +904,7 @@ static UBool isFollowedByCasedLetter(UCaseContextIterator *iter, void *context, int8_t dir) { UChar32 c; - if(iter==NULL) { + if(iter==nullptr) { return false; } @@ -929,7 +929,7 @@ isPrecededBySoftDotted(UCaseContextIterator *iter, void *context) { int32_t dotType; int8_t dir; - if(iter==NULL) { + if(iter==nullptr) { return false; } @@ -986,7 +986,7 @@ isPrecededBy_I(UCaseContextIterator *iter, void *context) { int32_t dotType; int8_t dir; - if(iter==NULL) { + if(iter==nullptr) { return false; } @@ -1010,7 +1010,7 @@ isFollowedByMoreAbove(UCaseContextIterator *iter, void *context) { int32_t dotType; int8_t dir; - if(iter==NULL) { + if(iter==nullptr) { return false; } @@ -1033,7 +1033,7 @@ isFollowedByDotAbove(UCaseContextIterator *iter, void *context) { int32_t dotType; int8_t dir; - if(iter==NULL) { + if(iter==nullptr) { return false; } @@ -1589,17 +1589,17 @@ ucase_hasBinaryProperty(UChar32 c, UProperty which) { * start sets for normalization and case mappings. */ case UCHAR_CHANGES_WHEN_LOWERCASED: - return (UBool)(ucase_toFullLower(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0); + return (UBool)(ucase_toFullLower(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0); case UCHAR_CHANGES_WHEN_UPPERCASED: - return (UBool)(ucase_toFullUpper(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0); + return (UBool)(ucase_toFullUpper(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0); case UCHAR_CHANGES_WHEN_TITLECASED: - return (UBool)(ucase_toFullTitle(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0); + return (UBool)(ucase_toFullTitle(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0); /* case UCHAR_CHANGES_WHEN_CASEFOLDED: -- in uprops.c */ case UCHAR_CHANGES_WHEN_CASEMAPPED: return (UBool)( - ucase_toFullLower(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0 || - ucase_toFullUpper(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0 || - ucase_toFullTitle(c, NULL, NULL, &resultString, UCASE_LOC_ROOT)>=0); + ucase_toFullLower(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0 || + ucase_toFullUpper(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0 || + ucase_toFullTitle(c, nullptr, nullptr, &resultString, UCASE_LOC_ROOT)>=0); default: return false; } diff --git a/icu4c/source/common/ucase_props_data.h b/icu4c/source/common/ucase_props_data.h index b7797d14d73..7e6de63fb71 100644 --- a/icu4c/source/common/ucase_props_data.h +++ b/icu4c/source/common/ucase_props_data.h @@ -974,14 +974,14 @@ static const uint16_t ucase_props_unfold[370]={ }; static const UCaseProps ucase_props_singleton={ - NULL, + nullptr, ucase_props_indexes, ucase_props_exceptions, ucase_props_unfold, { ucase_props_trieIndex, ucase_props_trieIndex+3412, - NULL, + nullptr, 3412, 9736, 0x188, @@ -990,7 +990,7 @@ static const UCaseProps ucase_props_singleton={ 0x0, 0xe0800, 0x3358, - NULL, 0, false, false, 0, NULL + nullptr, 0, false, false, 0, nullptr }, { 4,0,0,0 } }; diff --git a/icu4c/source/common/ucasemap.cpp b/icu4c/source/common/ucasemap.cpp index fc0439db0f6..1eb049e2b2b 100644 --- a/icu4c/source/common/ucasemap.cpp +++ b/icu4c/source/common/ucasemap.cpp @@ -49,7 +49,7 @@ U_NAMESPACE_USE UCaseMap::UCaseMap(const char *localeID, uint32_t opts, UErrorCode *pErrorCode) : #if !UCONFIG_NO_BREAK_ITERATION - iter(NULL), + iter(nullptr), #endif caseLocale(UCASE_LOC_UNKNOWN), options(opts) { ucasemap_setLocale(this, localeID, pErrorCode); @@ -64,15 +64,15 @@ UCaseMap::~UCaseMap() { U_CAPI UCaseMap * U_EXPORT2 ucasemap_open(const char *locale, uint32_t options, UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } UCaseMap *csm = new UCaseMap(locale, options, pErrorCode); - if(csm==NULL) { + if(csm==nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } else if (U_FAILURE(*pErrorCode)) { delete csm; - return NULL; + return nullptr; } return csm; } @@ -97,7 +97,7 @@ ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { return; } - if (locale != NULL && *locale == 0) { + if (locale != nullptr && *locale == 0) { csm->locale[0] = 0; csm->caseLocale = UCASE_LOC_ROOT; return; @@ -143,7 +143,7 @@ appendResult(int32_t cpLength, int32_t result, const UChar *s, /* decode the result */ if(result<0) { /* (not) original code point */ - if(edits!=NULL) { + if(edits!=nullptr) { edits->addUnchanged(cpLength); } if((options & U_OMIT_UNCHANGED_TEXT) == 0) { @@ -757,11 +757,11 @@ void toUpper(uint32_t options, int32_t newLength = (i2 - i) + numYpogegrammeni * 2; // 2 bytes per U+0399 change |= oldLength != newLength; if (change) { - if (edits != NULL) { + if (edits != nullptr) { edits->addReplace(oldLength, newLength); } } else { - if (edits != NULL) { + if (edits != nullptr) { edits->addUnchanged(oldLength); } // Write unchanged text? @@ -784,7 +784,7 @@ void toUpper(uint32_t options, } } else if(c>=0) { const UChar *s; - c=ucase_toFullUpper(c, NULL, NULL, &s, UCASE_LOC_GREEK); + c=ucase_toFullUpper(c, nullptr, nullptr, &s, UCASE_LOC_GREEK); if (!appendResult(nextIndex - i, c, s, sink, options, edits, errorCode)) { return; } @@ -891,8 +891,8 @@ ucasemap_mapUTF8(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITERATOR_P return 0; } if( destCapacity<0 || - (dest==NULL && destCapacity>0) || - (src==NULL && srcLength!=0) || srcLength<-1 + (dest==nullptr && destCapacity>0) || + (src==nullptr && srcLength!=0) || srcLength<-1 ) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -904,7 +904,7 @@ ucasemap_mapUTF8(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITERATOR_P } /* check for overlapping source and destination */ - if( dest!=NULL && + if( dest!=nullptr && ((src>=dest && src<(dest+destCapacity)) || (dest>=src && dest<(src+srcLength))) ) { @@ -940,7 +940,7 @@ ucasemap_utf8ToLower(const UCaseMap *csm, csm->caseLocale, csm->options, UCASEMAP_BREAK_ITERATOR_NULL dest, destCapacity, src, srcLength, - ucasemap_internalUTF8ToLower, NULL, *pErrorCode); + ucasemap_internalUTF8ToLower, nullptr, *pErrorCode); } U_CAPI int32_t U_EXPORT2 @@ -952,7 +952,7 @@ ucasemap_utf8ToUpper(const UCaseMap *csm, csm->caseLocale, csm->options, UCASEMAP_BREAK_ITERATOR_NULL dest, destCapacity, src, srcLength, - ucasemap_internalUTF8ToUpper, NULL, *pErrorCode); + ucasemap_internalUTF8ToUpper, nullptr, *pErrorCode); } U_CAPI int32_t U_EXPORT2 @@ -964,7 +964,7 @@ ucasemap_utf8FoldCase(const UCaseMap *csm, UCASE_LOC_ROOT, csm->options, UCASEMAP_BREAK_ITERATOR_NULL dest, destCapacity, src, srcLength, - ucasemap_internalUTF8Fold, NULL, *pErrorCode); + ucasemap_internalUTF8Fold, nullptr, *pErrorCode); } U_NAMESPACE_BEGIN diff --git a/icu4c/source/common/ucasemap_titlecase_brkiter.cpp b/icu4c/source/common/ucasemap_titlecase_brkiter.cpp index c21dfb7698a..c2b44a2c788 100644 --- a/icu4c/source/common/ucasemap_titlecase_brkiter.cpp +++ b/icu4c/source/common/ucasemap_titlecase_brkiter.cpp @@ -66,7 +66,7 @@ int32_t CaseMap::utf8ToTitle( utext_openUTF8(&utext, src, srcLength, &errorCode); LocalPointer ownedIter; iter = ustrcase_getTitleBreakIterator(nullptr, locale, options, iter, ownedIter, errorCode); - if(iter==NULL) { + if(iter==nullptr) { utext_close(&utext); return 0; } @@ -111,7 +111,7 @@ ucasemap_utf8ToTitle(UCaseMap *csm, if (U_FAILURE(*pErrorCode)) { return 0; } - if(csm->iter==NULL) { + if(csm->iter==nullptr) { LocalPointer ownedIter; BreakIterator *iter = ustrcase_getTitleBreakIterator( nullptr, csm->locale, csm->options, nullptr, ownedIter, *pErrorCode); @@ -126,7 +126,7 @@ ucasemap_utf8ToTitle(UCaseMap *csm, csm->caseLocale, csm->options, csm->iter, dest, destCapacity, src, srcLength, - ucasemap_internalUTF8ToTitle, NULL, *pErrorCode); + ucasemap_internalUTF8ToTitle, nullptr, *pErrorCode); utext_close(&utext); return length; } diff --git a/icu4c/source/common/ucat.cpp b/icu4c/source/common/ucat.cpp index dac56eeb5ce..a5d2e296d5f 100644 --- a/icu4c/source/common/ucat.cpp +++ b/icu4c/source/common/ucat.cpp @@ -43,7 +43,7 @@ u_catopen(const char* name, const char* locale, UErrorCode* ec) { U_CAPI void U_EXPORT2 u_catclose(u_nl_catd catd) { - ures_close((UResourceBundle*) catd); /* may be NULL */ + ures_close((UResourceBundle*) catd); /* may be nullptr */ } U_CAPI const UChar* U_EXPORT2 @@ -54,7 +54,7 @@ u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num, char key[MAX_KEY_LEN]; const UChar* result; - if (ec == NULL || U_FAILURE(*ec)) { + if (ec == nullptr || U_FAILURE(*ec)) { goto ERROR; } @@ -69,7 +69,7 @@ u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num, ERROR: /* In case of any failure, return s */ - if (len != NULL) { + if (len != nullptr) { *len = u_strlen(s); } return s; diff --git a/icu4c/source/common/uchar.cpp b/icu4c/source/common/uchar.cpp index 49564069b71..d6f3321ddfe 100644 --- a/icu4c/source/common/uchar.cpp +++ b/icu4c/source/common/uchar.cpp @@ -76,7 +76,7 @@ U_CAPI void U_EXPORT2 u_enumCharTypes(UCharEnumTypeRange *enumRange, const void *context) { struct _EnumTypeCallback callback; - if(enumRange==NULL) { + if(enumRange==nullptr) { return; } @@ -485,7 +485,7 @@ u_forDigit(int32_t digit, int8_t radix) { U_CAPI void U_EXPORT2 u_getUnicodeVersion(UVersionInfo versionArray) { - if(versionArray!=NULL) { + if(versionArray!=nullptr) { uprv_memcpy(versionArray, dataVersion, U_MAX_VERSION_LENGTH); } } @@ -522,7 +522,7 @@ uprv_getMaxValues(int32_t column) { U_CAPI void U_EXPORT2 u_charAge(UChar32 c, UVersionInfo versionArray) { - if(versionArray!=NULL) { + if(versionArray!=nullptr) { uint32_t version=u_getUnicodeProperties(c, 0)>>UPROPS_AGE_SHIFT; versionArray[0]=(uint8_t)(version>>4); versionArray[1]=(uint8_t)(version&0xf); @@ -532,7 +532,7 @@ u_charAge(UChar32 c, UVersionInfo versionArray) { U_CAPI UScriptCode U_EXPORT2 uscript_getScript(UChar32 c, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return USCRIPT_INVALID_CODE; } if((uint32_t)c>0x10ffff) { @@ -579,10 +579,10 @@ U_CAPI int32_t U_EXPORT2 uscript_getScriptExtensions(UChar32 c, UScriptCode *scripts, int32_t capacity, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(capacity<0 || (capacity>0 && scripts==NULL)) { + if(capacity<0 || (capacity>0 && scripts==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -642,7 +642,7 @@ uchar_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) { } /* add the start code point of each same-value range of the main trie */ - utrie2_enum(&propsTrie, NULL, _enumPropertyStartsRange, sa); + utrie2_enum(&propsTrie, nullptr, _enumPropertyStartsRange, sa); /* add code points with hardcoded properties, plus the ones following them */ @@ -704,5 +704,5 @@ upropsvec_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) { } /* add the start code point of each same-value range of the properties vectors trie */ - utrie2_enum(&propsVectorsTrie, NULL, _enumPropertyStartsRange, sa); + utrie2_enum(&propsVectorsTrie, nullptr, _enumPropertyStartsRange, sa); } diff --git a/icu4c/source/common/uchar_props_data.h b/icu4c/source/common/uchar_props_data.h index acbeadd249b..f4d3932574d 100644 --- a/icu4c/source/common/uchar_props_data.h +++ b/icu4c/source/common/uchar_props_data.h @@ -1456,7 +1456,7 @@ static const uint16_t propsTrie_index[23016]={ static const UTrie2 propsTrie={ propsTrie_index, propsTrie_index+4692, - NULL, + nullptr, 4692, 18324, 0xa40, @@ -1465,7 +1465,7 @@ static const UTrie2 propsTrie={ 0x0, 0x110000, 0x59e4, - NULL, 0, false, false, 0, NULL + nullptr, 0, false, false, 0, nullptr }; static const uint16_t propsVectorsTrie_index[32692]={ @@ -3518,7 +3518,7 @@ static const uint16_t propsVectorsTrie_index[32692]={ static const UTrie2 propsVectorsTrie={ propsVectorsTrie_index, propsVectorsTrie_index+5348, - NULL, + nullptr, 5348, 27344, 0xa40, @@ -3527,7 +3527,7 @@ static const UTrie2 propsVectorsTrie={ 0x0, 0x110000, 0x7fb0, - NULL, 0, false, false, 0, NULL + nullptr, 0, false, false, 0, nullptr }; static const uint32_t propsVectors[7230]={ diff --git a/icu4c/source/common/ucharstrie.cpp b/icu4c/source/common/ucharstrie.cpp index 24ab4257779..e9aead4895d 100644 --- a/icu4c/source/common/ucharstrie.cpp +++ b/icu4c/source/common/ucharstrie.cpp @@ -31,7 +31,7 @@ UCharsTrie::~UCharsTrie() { UStringTrieResult UCharsTrie::current() const { const UChar *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } else { int32_t node; @@ -154,7 +154,7 @@ UCharsTrie::nextImpl(const UChar *pos, int32_t uchar) { UStringTrieResult UCharsTrie::next(int32_t uchar) { const UChar *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } int32_t length=remainingMatchLength_; // Actual remaining match length minus 1. @@ -182,7 +182,7 @@ UCharsTrie::next(ConstChar16Ptr ptr, int32_t sLength) { return current(); } const UChar *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return USTRINGTRIE_NO_MATCH; } int32_t length=remainingMatchLength_; // Actual remaining match length minus 1. @@ -287,8 +287,8 @@ UCharsTrie::findUniqueValueFromBranch(const UChar *pos, int32_t length, UBool haveUniqueValue, int32_t &uniqueValue) { while(length>kMaxBranchLinearSubNodeLength) { ++pos; // ignore the comparison unit - if(NULL==findUniqueValueFromBranch(jumpByDelta(pos), length>>1, haveUniqueValue, uniqueValue)) { - return NULL; + if(nullptr==findUniqueValueFromBranch(jumpByDelta(pos), length>>1, haveUniqueValue, uniqueValue)) { + return nullptr; } length=length-(length>>1); pos=skipDelta(pos); @@ -304,7 +304,7 @@ UCharsTrie::findUniqueValueFromBranch(const UChar *pos, int32_t length, if(isFinal) { if(haveUniqueValue) { if(value!=uniqueValue) { - return NULL; + return nullptr; } } else { uniqueValue=value; @@ -312,7 +312,7 @@ UCharsTrie::findUniqueValueFromBranch(const UChar *pos, int32_t length, } } else { if(!findUniqueValue(pos+value, haveUniqueValue, uniqueValue)) { - return NULL; + return nullptr; } haveUniqueValue=true; } @@ -329,7 +329,7 @@ UCharsTrie::findUniqueValue(const UChar *pos, UBool haveUniqueValue, int32_t &un node=*pos++; } pos=findUniqueValueFromBranch(pos, node+1, haveUniqueValue, uniqueValue); - if(pos==NULL) { + if(pos==nullptr) { return false; } haveUniqueValue=true; @@ -366,7 +366,7 @@ UCharsTrie::findUniqueValue(const UChar *pos, UBool haveUniqueValue, int32_t &un int32_t UCharsTrie::getNextUChars(Appendable &out) const { const UChar *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { return 0; } if(remainingMatchLength_>=0) { diff --git a/icu4c/source/common/ucharstriebuilder.cpp b/icu4c/source/common/ucharstriebuilder.cpp index be3260941ee..3c6c14f75a2 100644 --- a/icu4c/source/common/ucharstriebuilder.cpp +++ b/icu4c/source/common/ucharstriebuilder.cpp @@ -86,8 +86,8 @@ UCharsTrieElement::compareStringTo(const UCharsTrieElement &other, const Unicode } UCharsTrieBuilder::UCharsTrieBuilder(UErrorCode & /*errorCode*/) - : elements(NULL), elementsCapacity(0), elementsLength(0), - uchars(NULL), ucharsCapacity(0), ucharsLength(0) {} + : elements(nullptr), elementsCapacity(0), elementsLength(0), + uchars(nullptr), ucharsCapacity(0), ucharsLength(0) {} UCharsTrieBuilder::~UCharsTrieBuilder() { delete[] elements; @@ -112,7 +112,7 @@ UCharsTrieBuilder::add(const UnicodeString &s, int32_t value, UErrorCode &errorC newCapacity=4*elementsCapacity; } UCharsTrieElement *newElements=new UCharsTrieElement[newCapacity]; - if(newElements==NULL) { + if(newElements==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return *this; } @@ -145,13 +145,13 @@ U_CDECL_END UCharsTrie * UCharsTrieBuilder::build(UStringTrieBuildOption buildOption, UErrorCode &errorCode) { buildUChars(buildOption, errorCode); - UCharsTrie *newTrie=NULL; + UCharsTrie *newTrie=nullptr; if(U_SUCCESS(errorCode)) { newTrie=new UCharsTrie(uchars, uchars+(ucharsCapacity-ucharsLength)); - if(newTrie==NULL) { + if(newTrie==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } else { - uchars=NULL; // The new trie now owns the array. + uchars=nullptr; // The new trie now owns the array. ucharsCapacity=0; } } @@ -173,7 +173,7 @@ UCharsTrieBuilder::buildUChars(UStringTrieBuildOption buildOption, UErrorCode &e if(U_FAILURE(errorCode)) { return; } - if(uchars!=NULL && ucharsLength>0) { + if(uchars!=nullptr && ucharsLength>0) { // Already built. return; } @@ -213,7 +213,7 @@ UCharsTrieBuilder::buildUChars(UStringTrieBuildOption buildOption, UErrorCode &e if(ucharsCapacity(uprv_malloc(capacity*2)); - if(uchars==NULL) { + if(uchars==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; ucharsCapacity=0; return; @@ -221,7 +221,7 @@ UCharsTrieBuilder::buildUChars(UStringTrieBuildOption buildOption, UErrorCode &e ucharsCapacity=capacity; } StringTrieBuilder::build(buildOption, elementsLength, errorCode); - if(uchars==NULL) { + if(uchars==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -321,7 +321,7 @@ UCharsTrieBuilder::createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t l UBool UCharsTrieBuilder::ensureCapacity(int32_t length) { - if(uchars==NULL) { + if(uchars==nullptr) { return false; // previous memory allocation had failed } if(length>ucharsCapacity) { @@ -330,10 +330,10 @@ UCharsTrieBuilder::ensureCapacity(int32_t length) { newCapacity*=2; } while(newCapacity<=length); UChar *newUChars=static_cast(uprv_malloc(newCapacity*2)); - if(newUChars==NULL) { + if(newUChars==nullptr) { // unable to allocate memory uprv_free(uchars); - uchars=NULL; + uchars=nullptr; ucharsCapacity=0; return false; } diff --git a/icu4c/source/common/ucharstrieiterator.cpp b/icu4c/source/common/ucharstrieiterator.cpp index 2ba43692ddd..767157ca74f 100644 --- a/icu4c/source/common/ucharstrieiterator.cpp +++ b/icu4c/source/common/ucharstrieiterator.cpp @@ -27,7 +27,7 @@ UCharsTrie::Iterator::Iterator(ConstChar16Ptr trieUChars, int32_t maxStringLengt pos_(uchars_), initialPos_(uchars_), remainingMatchLength_(-1), initialRemainingMatchLength_(-1), skipValue_(false), - maxLength_(maxStringLength), value_(0), stack_(NULL) { + maxLength_(maxStringLength), value_(0), stack_(nullptr) { if(U_FAILURE(errorCode)) { return; } @@ -38,7 +38,7 @@ UCharsTrie::Iterator::Iterator(ConstChar16Ptr trieUChars, int32_t maxStringLengt // via the UnicodeString and UVector32 implementations, so this additional // cost is minimal. stack_=new UVector32(errorCode); - if(stack_==NULL) { + if(stack_==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -49,7 +49,7 @@ UCharsTrie::Iterator::Iterator(const UCharsTrie &trie, int32_t maxStringLength, remainingMatchLength_(trie.remainingMatchLength_), initialRemainingMatchLength_(trie.remainingMatchLength_), skipValue_(false), - maxLength_(maxStringLength), value_(0), stack_(NULL) { + maxLength_(maxStringLength), value_(0), stack_(nullptr) { if(U_FAILURE(errorCode)) { return; } @@ -57,7 +57,7 @@ UCharsTrie::Iterator::Iterator(const UCharsTrie &trie, int32_t maxStringLength, if(U_FAILURE(errorCode)) { return; } - if(stack_==NULL) { + if(stack_==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -95,7 +95,7 @@ UCharsTrie::Iterator::reset() { } UBool -UCharsTrie::Iterator::hasNext() const { return pos_!=NULL || !stack_->isEmpty(); } +UCharsTrie::Iterator::hasNext() const { return pos_!=nullptr || !stack_->isEmpty(); } UBool UCharsTrie::Iterator::next(UErrorCode &errorCode) { @@ -103,7 +103,7 @@ UCharsTrie::Iterator::next(UErrorCode &errorCode) { return false; } const UChar *pos=pos_; - if(pos==NULL) { + if(pos==nullptr) { if(stack_->isEmpty()) { return false; } @@ -117,7 +117,7 @@ UCharsTrie::Iterator::next(UErrorCode &errorCode) { length=(int32_t)((uint32_t)length>>16); if(length>1) { pos=branchNext(pos, length, errorCode); - if(pos==NULL) { + if(pos==nullptr) { return true; // Reached a final value. } } else { @@ -145,7 +145,7 @@ UCharsTrie::Iterator::next(UErrorCode &errorCode) { value_=readNodeValue(pos, node); } if(isFinal || (maxLength_>0 && str_.length()==maxLength_)) { - pos_=NULL; + pos_=nullptr; } else { // We cannot skip the value right here because it shares its // lead unit with a match node which we have to evaluate @@ -165,7 +165,7 @@ UCharsTrie::Iterator::next(UErrorCode &errorCode) { node=*pos++; } pos=branchNext(pos, node+1, errorCode); - if(pos==NULL) { + if(pos==nullptr) { return true; // Reached a final value. } } else { @@ -204,9 +204,9 @@ UCharsTrie::Iterator::branchNext(const UChar *pos, int32_t length, UErrorCode &e stack_->addElement(((length-1)<<16)|str_.length(), errorCode); str_.append(trieUnit); if(isFinal) { - pos_=NULL; + pos_=nullptr; value_=value; - return NULL; + return nullptr; } else { return pos+value; } diff --git a/icu4c/source/common/ucln_cmn.cpp b/icu4c/source/common/ucln_cmn.cpp index ea797d13449..9e7f7b1f9b5 100644 --- a/icu4c/source/common/ucln_cmn.cpp +++ b/icu4c/source/common/ucln_cmn.cpp @@ -40,8 +40,8 @@ U_CAPI void U_EXPORT2 u_cleanup(void) { UTRACE_ENTRY_OC(UTRACE_U_CLEANUP); - icu::umtx_lock(NULL); /* Force a memory barrier, so that we are sure to see */ - icu::umtx_unlock(NULL); /* all state left around by any other threads. */ + icu::umtx_lock(nullptr); /* Force a memory barrier, so that we are sure to see */ + icu::umtx_unlock(nullptr); /* all state left around by any other threads. */ ucln_lib_cleanup(); @@ -57,7 +57,7 @@ U_CAPI void U_EXPORT2 ucln_cleanupOne(ECleanupLibraryType libType) if (gLibCleanupFunctions[libType]) { gLibCleanupFunctions[libType](); - gLibCleanupFunctions[libType] = NULL; + gLibCleanupFunctions[libType] = nullptr; } } @@ -114,7 +114,7 @@ U_CFUNC UBool ucln_lib_cleanup(void) { if (gCommonCleanupFunctions[commonFunc]) { gCommonCleanupFunctions[commonFunc](); - gCommonCleanupFunctions[commonFunc] = NULL; + gCommonCleanupFunctions[commonFunc] = nullptr; } } #if !UCLN_NO_AUTO_CLEANUP && (defined(UCLN_AUTO_ATEXIT) || defined(UCLN_AUTO_LOCAL)) diff --git a/icu4c/source/common/ucmndata.cpp b/icu4c/source/common/ucmndata.cpp index 4215d66257d..69575d4e830 100644 --- a/icu4c/source/common/ucmndata.cpp +++ b/icu4c/source/common/ucmndata.cpp @@ -34,7 +34,7 @@ U_CFUNC uint16_t udata_getHeaderSize(const DataHeader *udh) { - if(udh==NULL) { + if(udh==nullptr) { return 0; } else if(udh->info.isBigEndian==U_IS_BIG_ENDIAN) { /* same endianness */ @@ -48,7 +48,7 @@ udata_getHeaderSize(const DataHeader *udh) { U_CFUNC uint16_t udata_getInfoSize(const UDataInfo *info) { - if(info==NULL) { + if(info==nullptr) { return 0; } else if(info->isBigEndian==U_IS_BIG_ENDIAN) { /* same endianness */ @@ -216,7 +216,7 @@ static uint32_t U_CALLCONV offsetTOCEntryCount(const UDataMemory *pData) { int32_t retVal=0; const UDataOffsetTOC *toc = (UDataOffsetTOC *)pData->toc; - if (toc != NULL) { + if (toc != nullptr) { retVal = toc->count; } return retVal; @@ -229,7 +229,7 @@ offsetTOCLookupFn(const UDataMemory *pData, UErrorCode *pErrorCode) { (void)pErrorCode; const UDataOffsetTOC *toc = (UDataOffsetTOC *)pData->toc; - if(toc!=NULL) { + if(toc!=nullptr) { const char *base=(const char *)toc; int32_t number, count=(int32_t)toc->count; @@ -257,7 +257,7 @@ offsetTOCLookupFn(const UDataMemory *pData, #ifdef UDATA_DEBUG fprintf(stderr, "%s: Not found.\n", tocEntryName); #endif - return NULL; + return nullptr; } } else { #ifdef UDATA_DEBUG @@ -271,7 +271,7 @@ offsetTOCLookupFn(const UDataMemory *pData, static uint32_t U_CALLCONV pointerTOCEntryCount(const UDataMemory *pData) { const PointerTOC *toc = (PointerTOC *)pData->toc; - return (uint32_t)((toc != NULL) ? (toc->count) : 0); + return (uint32_t)((toc != nullptr) ? (toc->count) : 0); } static const DataHeader * U_CALLCONV pointerTOCLookupFn(const UDataMemory *pData, @@ -279,7 +279,7 @@ static const DataHeader * U_CALLCONV pointerTOCLookupFn(const UDataMemory *pData int32_t *pLength, UErrorCode *pErrorCode) { (void)pErrorCode; - if(pData->toc!=NULL) { + if(pData->toc!=nullptr) { const PointerTOC *toc = (PointerTOC *)pData->toc; int32_t number, count=(int32_t)toc->count; @@ -301,7 +301,7 @@ static const DataHeader * U_CALLCONV pointerTOCLookupFn(const UDataMemory *pData #ifdef UDATA_DEBUG fprintf(stderr, "%s: Not found.\n", name); #endif - return NULL; + return nullptr; } } else { return pData->pHeader; @@ -328,7 +328,7 @@ U_CFUNC void udata_checkCommonData(UDataMemory *udm, UErrorCode *err) { return; } - if(udm==NULL || udm->pHeader==NULL) { + if(udm==nullptr || udm->pHeader==nullptr) { *err=U_INVALID_FORMAT_ERROR; } else if(!(udm->pHeader->dataHeader.magic1==0xda && udm->pHeader->dataHeader.magic2==0x27 && diff --git a/icu4c/source/common/ucnv.cpp b/icu4c/source/common/ucnv.cpp index 26baa550c35..e913dead520 100644 --- a/icu4c/source/common/ucnv.cpp +++ b/icu4c/source/common/ucnv.cpp @@ -75,11 +75,11 @@ ucnv_open (const char *name, { UConverter *r; - if (err == NULL || U_FAILURE (*err)) { - return NULL; + if (err == nullptr || U_FAILURE (*err)) { + return nullptr; } - r = ucnv_createConverter(NULL, name, err); + r = ucnv_createConverter(nullptr, name, err); return r; } @@ -96,14 +96,14 @@ ucnv_openU (const UChar * name, { char asciiName[UCNV_MAX_CONVERTER_NAME_LENGTH]; - if (err == NULL || U_FAILURE(*err)) - return NULL; - if (name == NULL) - return ucnv_open (NULL, err); + if (err == nullptr || U_FAILURE(*err)) + return nullptr; + if (name == nullptr) + return ucnv_open (nullptr, err); if (u_strlen(name) >= UCNV_MAX_CONVERTER_NAME_LENGTH) { *err = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } return ucnv_open(u_austrcpy(asciiName, name), err); } @@ -140,14 +140,14 @@ ucnv_openCCSID (int32_t codepage, char myName[UCNV_MAX_CONVERTER_NAME_LENGTH]; int32_t myNameLen; - if (err == NULL || U_FAILURE (*err)) - return NULL; + if (err == nullptr || U_FAILURE (*err)) + return nullptr; /* ucnv_copyPlatformString could return "ibm-" or "cp" */ myNameLen = ucnv_copyPlatformString(myName, platform); T_CString_integerToString(myName + myNameLen, codepage, 10); - return ucnv_createConverter(NULL, myName, err); + return ucnv_createConverter(nullptr, myName, err); } /* Creating a temporary stack-based object that can be used in one thread, @@ -164,47 +164,47 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U UConverterToUnicodeArgs toUArgs = { sizeof(UConverterToUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; UConverterFromUnicodeArgs fromUArgs = { sizeof(UConverterFromUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; UTRACE_ENTRY_OC(UTRACE_UCNV_CLONE); - if (status == NULL || U_FAILURE(*status)){ + if (status == nullptr || U_FAILURE(*status)){ UTRACE_EXIT_STATUS(status? *status: U_ILLEGAL_ARGUMENT_ERROR); - return NULL; + return nullptr; } - if (cnv == NULL) { + if (cnv == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; UTRACE_EXIT_STATUS(*status); - return NULL; + return nullptr; } UTRACE_DATA3(UTRACE_OPEN_CLOSE, "clone converter %s at %p into stackBuffer %p", ucnv_getName(cnv, status), cnv, stackBuffer); - if (cnv->sharedData->impl->safeClone != NULL) { + if (cnv->sharedData->impl->safeClone != nullptr) { /* call the custom safeClone function for sizing */ bufferSizeNeeded = 0; - cnv->sharedData->impl->safeClone(cnv, NULL, &bufferSizeNeeded, status); + cnv->sharedData->impl->safeClone(cnv, nullptr, &bufferSizeNeeded, status); if (U_FAILURE(*status)) { UTRACE_EXIT_STATUS(*status); - return NULL; + return nullptr; } } else @@ -213,7 +213,7 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U bufferSizeNeeded = sizeof(UConverter); } - if (pBufferSize == NULL) { + if (pBufferSize == nullptr) { stackBufferSize = 1; pBufferSize = &stackBufferSize; } else { @@ -221,7 +221,7 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U if (stackBufferSize <= 0){ /* 'preflighting' request - set needed size into *pBufferSize */ *pBufferSize = bufferSizeNeeded; UTRACE_EXIT_VALUE(bufferSizeNeeded); - return NULL; + return nullptr; } } @@ -242,17 +242,17 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U } /* Now, see if we must allocate any memory */ - if (stackBufferSize < bufferSizeNeeded || stackBuffer == NULL) + if (stackBufferSize < bufferSizeNeeded || stackBuffer == nullptr) { /* allocate one here...*/ localConverter = allocatedConverter = (UConverter *) uprv_malloc (bufferSizeNeeded); - if(localConverter == NULL) { + if(localConverter == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; UTRACE_EXIT_STATUS(*status); - return NULL; + return nullptr; } - // If pBufferSize was NULL as the input, pBufferSize is set to &stackBufferSize in this function. + // If pBufferSize was nullptr as the input, pBufferSize is set to &stackBufferSize in this function. if (pBufferSize != &stackBufferSize) { *status = U_SAFECLONE_ALLOCATED_WARNING; } @@ -262,7 +262,7 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U } else { /* just use the stack buffer */ localConverter = (UConverter*) stackBuffer; - allocatedConverter = NULL; + allocatedConverter = nullptr; } uprv_memset(localConverter, 0, bufferSizeNeeded); @@ -276,27 +276,27 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U localConverter->subChars = (uint8_t *)localConverter->subUChars; } else { localConverter->subChars = (uint8_t *)uprv_malloc(UCNV_ERROR_BUFFER_LENGTH * U_SIZEOF_UCHAR); - if (localConverter->subChars == NULL) { + if (localConverter->subChars == nullptr) { uprv_free(allocatedConverter); UTRACE_EXIT_STATUS(*status); - return NULL; + return nullptr; } uprv_memcpy(localConverter->subChars, cnv->subChars, UCNV_ERROR_BUFFER_LENGTH * U_SIZEOF_UCHAR); } /* now either call the safeclone fcn or not */ - if (cnv->sharedData->impl->safeClone != NULL) { + if (cnv->sharedData->impl->safeClone != nullptr) { /* call the custom safeClone function */ localConverter = cnv->sharedData->impl->safeClone(cnv, localConverter, pBufferSize, status); } - if(localConverter==NULL || U_FAILURE(*status)) { - if (allocatedConverter != NULL && allocatedConverter->subChars != (uint8_t *)allocatedConverter->subUChars) { + if(localConverter==nullptr || U_FAILURE(*status)) { + if (allocatedConverter != nullptr && allocatedConverter->subChars != (uint8_t *)allocatedConverter->subUChars) { uprv_free(allocatedConverter->subChars); } uprv_free(allocatedConverter); UTRACE_EXIT_STATUS(*status); - return NULL; + return nullptr; } /* increment refcount of shared data if needed */ @@ -312,9 +312,9 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U /* allow callback functions to handle any memory allocation */ toUArgs.converter = fromUArgs.converter = localConverter; cbErr = U_ZERO_ERROR; - cnv->fromCharErrorBehaviour(cnv->toUContext, &toUArgs, NULL, 0, UCNV_CLONE, &cbErr); + cnv->fromCharErrorBehaviour(cnv->toUContext, &toUArgs, nullptr, 0, UCNV_CLONE, &cbErr); cbErr = U_ZERO_ERROR; - cnv->fromUCharErrorBehaviour(cnv->fromUContext, &fromUArgs, NULL, 0, 0, UCNV_CLONE, &cbErr); + cnv->fromUCharErrorBehaviour(cnv->fromUContext, &fromUArgs, nullptr, 0, 0, UCNV_CLONE, &cbErr); UTRACE_EXIT_PTR_STATUS(localConverter, *status); return localConverter; @@ -336,7 +336,7 @@ ucnv_close (UConverter * converter) UTRACE_ENTRY_OC(UTRACE_UCNV_CLOSE); - if (converter == NULL) + if (converter == nullptr) { UTRACE_EXIT(); return; @@ -353,35 +353,35 @@ ucnv_close (UConverter * converter) UConverterToUnicodeArgs toUArgs = { sizeof(UConverterToUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; toUArgs.converter = converter; errorCode = U_ZERO_ERROR; - converter->fromCharErrorBehaviour(converter->toUContext, &toUArgs, NULL, 0, UCNV_CLOSE, &errorCode); + converter->fromCharErrorBehaviour(converter->toUContext, &toUArgs, nullptr, 0, UCNV_CLOSE, &errorCode); } if (converter->fromUCharErrorBehaviour != UCNV_FROM_U_DEFAULT_CALLBACK) { UConverterFromUnicodeArgs fromUArgs = { sizeof(UConverterFromUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; fromUArgs.converter = converter; errorCode = U_ZERO_ERROR; - converter->fromUCharErrorBehaviour(converter->fromUContext, &fromUArgs, NULL, 0, 0, UCNV_CLOSE, &errorCode); + converter->fromUCharErrorBehaviour(converter->fromUContext, &fromUArgs, nullptr, 0, 0, UCNV_CLOSE, &errorCode); } - if (converter->sharedData->impl->close != NULL) { + if (converter->sharedData->impl->close != nullptr) { converter->sharedData->impl->close(converter); } @@ -400,7 +400,7 @@ ucnv_close (UConverter * converter) UTRACE_EXIT(); } -/*returns a single Name from the list, will return NULL if out of bounds +/*returns a single Name from the list, will return nullptr if out of bounds */ U_CAPI const char* U_EXPORT2 ucnv_getAvailableName (int32_t n) @@ -412,7 +412,7 @@ ucnv_getAvailableName (int32_t n) return name; } } - return NULL; + return nullptr; } U_CAPI int32_t U_EXPORT2 @@ -492,14 +492,14 @@ ucnv_setSubstString(UConverter *cnv, /* Let the following functions check all arguments. */ cloneSize = sizeof(cloneBuffer); clone = ucnv_safeClone(cnv, cloneBuffer, &cloneSize, err); - ucnv_setFromUCallBack(clone, UCNV_FROM_U_CALLBACK_STOP, NULL, NULL, NULL, err); + ucnv_setFromUCallBack(clone, UCNV_FROM_U_CALLBACK_STOP, nullptr, nullptr, nullptr, err); length8 = ucnv_fromUChars(clone, chars, (int32_t)sizeof(chars), s, length, err); ucnv_close(clone); if (U_FAILURE(*err)) { return; } - if (cnv->sharedData->impl->writeSub == NULL + if (cnv->sharedData->impl->writeSub == nullptr #if !UCONFIG_NO_LEGACY_CONVERSION || (cnv->sharedData->staticData->conversionType == UCNV_MBCS && ucnv_MBCSGetType(cnv) != UCNV_EBCDIC_STATEFUL) @@ -539,7 +539,7 @@ ucnv_setSubstString(UConverter *cnv, if (cnv->subChars == (uint8_t *)cnv->subUChars) { /* Allocate a new buffer for the string. */ cnv->subChars = (uint8_t *)uprv_malloc(UCNV_ERROR_BUFFER_LENGTH * U_SIZEOF_UCHAR); - if (cnv->subChars == NULL) { + if (cnv->subChars == nullptr) { cnv->subChars = (uint8_t *)cnv->subUChars; *err = U_MEMORY_ALLOCATION_ERROR; return; @@ -569,7 +569,7 @@ ucnv_setSubstString(UConverter *cnv, */ static void _reset(UConverter *converter, UConverterResetChoice choice, UBool callCallback) { - if(converter == NULL) { + if(converter == nullptr) { return; } @@ -581,31 +581,31 @@ static void _reset(UConverter *converter, UConverterResetChoice choice, UConverterToUnicodeArgs toUArgs = { sizeof(UConverterToUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; toUArgs.converter = converter; errorCode = U_ZERO_ERROR; - converter->fromCharErrorBehaviour(converter->toUContext, &toUArgs, NULL, 0, UCNV_RESET, &errorCode); + converter->fromCharErrorBehaviour(converter->toUContext, &toUArgs, nullptr, 0, UCNV_RESET, &errorCode); } if(choice!=UCNV_RESET_TO_UNICODE && converter->fromUCharErrorBehaviour != UCNV_FROM_U_DEFAULT_CALLBACK) { UConverterFromUnicodeArgs fromUArgs = { sizeof(UConverterFromUnicodeArgs), true, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; fromUArgs.converter = converter; errorCode = U_ZERO_ERROR; - converter->fromUCharErrorBehaviour(converter->fromUContext, &fromUArgs, NULL, 0, 0, UCNV_RESET, &errorCode); + converter->fromUCharErrorBehaviour(converter->fromUContext, &fromUArgs, nullptr, 0, 0, UCNV_RESET, &errorCode); } } @@ -625,7 +625,7 @@ static void _reset(UConverter *converter, UConverterResetChoice choice, converter->preFromULength = 0; } - if (converter->sharedData->impl->reset != NULL) { + if (converter->sharedData->impl->reset != nullptr) { /* call the custom reset function */ converter->sharedData->impl->reset(converter, choice); } @@ -667,7 +667,7 @@ ucnv_getName (const UConverter * converter, UErrorCode * err) { if (U_FAILURE (*err)) - return NULL; + return nullptr; if(converter->sharedData->impl->getName){ const char* temp= converter->sharedData->impl->getName(converter); if(temp) @@ -853,11 +853,11 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { /* get the converter implementation function */ sourceIndex=0; - if(offsets==NULL) { + if(offsets==nullptr) { fromUnicode=cnv->sharedData->impl->fromUnicode; } else { fromUnicode=cnv->sharedData->impl->fromUnicodeWithOffsets; - if(fromUnicode==NULL) { + if(fromUnicode==nullptr) { /* there is no WithOffsets implementation */ fromUnicode=cnv->sharedData->impl->fromUnicode; /* we will write -1 for each offset */ @@ -867,10 +867,10 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { if(cnv->preFromULength>=0) { /* normal mode */ - realSource=NULL; + realSource=nullptr; /* avoid compiler warnings - not otherwise necessary, and the values do not matter */ - realSourceLimit=NULL; + realSourceLimit=nullptr; realFlush=false; realSourceIndex=0; } else { @@ -942,7 +942,7 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { */ for(;;) { /* update offsets if we write any */ - if(offsets!=NULL) { + if(offsets!=nullptr) { int32_t length=(int32_t)(pArgs->target-t); if(length>0) { _updateOffsets(offsets, length, sourceIndex, errorInputLength); @@ -967,7 +967,7 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { * switch the source to new replay units (cannot occur while replaying) * after offset handling and before end-of-input and callback handling */ - if(realSource==NULL) { + if(realSource==nullptr) { realSource=pArgs->source; realSourceLimit=pArgs->sourceLimit; realFlush=pArgs->flush; @@ -984,7 +984,7 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { cnv->preFromULength=0; } else { /* see implementation note before _fromUnicodeWithCallback() */ - U_ASSERT(realSource==NULL); + U_ASSERT(realSource==nullptr); *err=U_INTERNAL_PROGRAM_ERROR; } } @@ -1000,14 +1000,14 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { * (continue converting by breaking out of only the inner loop) */ break; - } else if(realSource!=NULL) { + } else if(realSource!=nullptr) { /* switch back from replaying to the real source and continue */ pArgs->source=realSource; pArgs->sourceLimit=realSourceLimit; pArgs->flush=realFlush; sourceIndex=realSourceIndex; - realSource=NULL; + realSource=nullptr; break; } else if(pArgs->flush && cnv->fromUChar32!=0) { /* @@ -1063,7 +1063,7 @@ _fromUnicodeWithCallback(UConverterFromUnicodeArgs *pArgs, UErrorCode *err) { * copied back into the UConverter * and the real arguments must be restored */ - if(realSource!=NULL) { + if(realSource!=nullptr) { int32_t length; U_ASSERT(cnv->preFromULength==0); @@ -1130,10 +1130,10 @@ ucnv_outputOverflowFromUnicode(UConverter *cnv, int32_t i, length; t=*target; - if(pOffsets!=NULL) { + if(pOffsets!=nullptr) { offsets=*pOffsets; } else { - offsets=NULL; + offsets=nullptr; } overflow=(char *)cnv->charErrorBuffer; @@ -1150,7 +1150,7 @@ ucnv_outputOverflowFromUnicode(UConverter *cnv, cnv->charErrorBufferLength=(int8_t)j; *target=t; - if(offsets!=NULL) { + if(offsets!=nullptr) { *pOffsets=offsets; } *err=U_BUFFER_OVERFLOW_ERROR; @@ -1159,7 +1159,7 @@ ucnv_outputOverflowFromUnicode(UConverter *cnv, /* copy the overflow contents to the target */ *t++=overflow[i++]; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; /* no source index available for old output */ } } @@ -1167,7 +1167,7 @@ ucnv_outputOverflowFromUnicode(UConverter *cnv, /* the overflow buffer is completely copied to the target */ cnv->charErrorBufferLength=0; *target=t; - if(offsets!=NULL) { + if(offsets!=nullptr) { *pOffsets=offsets; } return false; @@ -1185,11 +1185,11 @@ ucnv_fromUnicode(UConverter *cnv, char *t; /* check parameters */ - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return; } - if(cnv==NULL || target==NULL || source==NULL) { + if(cnv==nullptr || target==nullptr || source==nullptr) { *err=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1298,11 +1298,11 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { /* get the converter implementation function */ sourceIndex=0; - if(offsets==NULL) { + if(offsets==nullptr) { toUnicode=cnv->sharedData->impl->toUnicode; } else { toUnicode=cnv->sharedData->impl->toUnicodeWithOffsets; - if(toUnicode==NULL) { + if(toUnicode==nullptr) { /* there is no WithOffsets implementation */ toUnicode=cnv->sharedData->impl->toUnicode; /* we will write -1 for each offset */ @@ -1312,10 +1312,10 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { if(cnv->preToULength>=0) { /* normal mode */ - realSource=NULL; + realSource=nullptr; /* avoid compiler warnings - not otherwise necessary, and the values do not matter */ - realSourceLimit=NULL; + realSourceLimit=nullptr; realFlush=false; realSourceIndex=0; } else { @@ -1387,7 +1387,7 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { */ for(;;) { /* update offsets if we write any */ - if(offsets!=NULL) { + if(offsets!=nullptr) { int32_t length=(int32_t)(pArgs->target-t); if(length>0) { _updateOffsets(offsets, length, sourceIndex, errorInputLength); @@ -1412,7 +1412,7 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { * switch the source to new replay units (cannot occur while replaying) * after offset handling and before end-of-input and callback handling */ - if(realSource==NULL) { + if(realSource==nullptr) { realSource=pArgs->source; realSourceLimit=pArgs->sourceLimit; realFlush=pArgs->flush; @@ -1429,7 +1429,7 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { cnv->preToULength=0; } else { /* see implementation note before _fromUnicodeWithCallback() */ - U_ASSERT(realSource==NULL); + U_ASSERT(realSource==nullptr); *err=U_INTERNAL_PROGRAM_ERROR; } } @@ -1445,14 +1445,14 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { * (continue converting by breaking out of only the inner loop) */ break; - } else if(realSource!=NULL) { + } else if(realSource!=nullptr) { /* switch back from replaying to the real source and continue */ pArgs->source=realSource; pArgs->sourceLimit=realSourceLimit; pArgs->flush=realFlush; sourceIndex=realSourceIndex; - realSource=NULL; + realSource=nullptr; break; } else if(pArgs->flush && cnv->toULength>0) { /* @@ -1510,7 +1510,7 @@ _toUnicodeWithCallback(UConverterToUnicodeArgs *pArgs, UErrorCode *err) { * copied back into the UConverter * and the real arguments must be restored */ - if(realSource!=NULL) { + if(realSource!=nullptr) { int32_t length; U_ASSERT(cnv->preToULength==0); @@ -1576,10 +1576,10 @@ ucnv_outputOverflowToUnicode(UConverter *cnv, int32_t i, length; t=*target; - if(pOffsets!=NULL) { + if(pOffsets!=nullptr) { offsets=*pOffsets; } else { - offsets=NULL; + offsets=nullptr; } overflow=cnv->UCharErrorBuffer; @@ -1596,7 +1596,7 @@ ucnv_outputOverflowToUnicode(UConverter *cnv, cnv->UCharErrorBufferLength=(int8_t)j; *target=t; - if(offsets!=NULL) { + if(offsets!=nullptr) { *pOffsets=offsets; } *err=U_BUFFER_OVERFLOW_ERROR; @@ -1605,7 +1605,7 @@ ucnv_outputOverflowToUnicode(UConverter *cnv, /* copy the overflow contents to the target */ *t++=overflow[i++]; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; /* no source index available for old output */ } } @@ -1613,7 +1613,7 @@ ucnv_outputOverflowToUnicode(UConverter *cnv, /* the overflow buffer is completely copied to the target */ cnv->UCharErrorBufferLength=0; *target=t; - if(offsets!=NULL) { + if(offsets!=nullptr) { *pOffsets=offsets; } return false; @@ -1631,11 +1631,11 @@ ucnv_toUnicode(UConverter *cnv, UChar *t; /* check parameters */ - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return; } - if(cnv==NULL || target==NULL || source==NULL) { + if(cnv==nullptr || target==nullptr || source==nullptr) { *err=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1730,13 +1730,13 @@ ucnv_fromUChars(UConverter *cnv, int32_t destLength; /* check arguments */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if( cnv==NULL || - destCapacity<0 || (destCapacity>0 && dest==NULL) || - srcLength<-1 || (srcLength!=0 && src==NULL) + if( cnv==nullptr || + destCapacity<0 || (destCapacity>0 && dest==nullptr) || + srcLength<-1 || (srcLength!=0 && src==nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -1786,13 +1786,13 @@ ucnv_toUChars(UConverter *cnv, int32_t destLength; /* check arguments */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if( cnv==NULL || - destCapacity<0 || (destCapacity>0 && dest==NULL) || - srcLength<-1 || (srcLength!=0 && src==NULL)) + if( cnv==nullptr || + destCapacity<0 || (destCapacity>0 && dest==nullptr) || + srcLength<-1 || (srcLength!=0 && src==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -1847,11 +1847,11 @@ ucnv_getNextUChar(UConverter *cnv, int32_t i, length; /* check parameters */ - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return 0xffff; } - if(cnv==NULL || source==NULL) { + if(cnv==nullptr || source==nullptr) { *err=U_ILLEGAL_ARGUMENT_ERROR; return 0xffff; } @@ -1916,7 +1916,7 @@ ucnv_getNextUChar(UConverter *cnv, /* prepare the converter arguments */ args.converter=cnv; args.flush=true; - args.offsets=NULL; + args.offsets=nullptr; args.source=s; args.sourceLimit=sourceLimit; args.target=buffer; @@ -1932,7 +1932,7 @@ ucnv_getNextUChar(UConverter *cnv, * U_TRUNCATED_CHAR_FOUND for truncated input, * in addition to setting toULength/toUBytes[] */ - if(cnv->toULength==0 && cnv->sharedData->impl->getNextUChar!=NULL) { + if(cnv->toULength==0 && cnv->sharedData->impl->getNextUChar!=nullptr) { c=cnv->sharedData->impl->getNextUChar(&args, err); *source=s=args.source; if(*err==U_INDEX_OUTOFBOUNDS_ERROR) { @@ -2060,13 +2060,13 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, UConverterConvert convert; /* error checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } - if( targetCnv==NULL || sourceCnv==NULL || - source==NULL || *source==NULL || - target==NULL || *target==NULL || targetLimit==NULL + if( targetCnv==nullptr || sourceCnv==nullptr || + source==nullptr || *source==nullptr || + target==nullptr || *target==nullptr || targetLimit==nullptr ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; @@ -2074,7 +2074,7 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, s=*source; t=*target; - if((sourceLimit!=NULL && sourceLimit(size_t)0x7fffffff && sourceLimit>s)) || + (sourceLimit!=nullptr && ((size_t)(sourceLimit-s)>(size_t)0x7fffffff && sourceLimit>s)) || ((size_t)(targetLimit-t)>(size_t)0x7fffffff && targetLimit>t) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } - if(pivotStart==NULL) { + if(pivotStart==nullptr) { if(!flush) { /* streaming conversion requires an explicit pivot buffer */ *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; @@ -2104,15 +2104,15 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, pivotTarget=&myPivotTarget; pivotLimit=pivotBuffer+CHUNK_SIZE; } else if( pivotStart>=pivotLimit || - pivotSource==NULL || *pivotSource==NULL || - pivotTarget==NULL || *pivotTarget==NULL || - pivotLimit==NULL + pivotSource==nullptr || *pivotSource==nullptr || + pivotTarget==nullptr || *pivotTarget==nullptr || + pivotLimit==nullptr ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } - if(sourceLimit==NULL) { + if(sourceLimit==nullptr) { /* get limit of single-byte-NUL-terminated source string */ sourceLimit=uprv_strchr(*source, 0); } @@ -2123,7 +2123,7 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, *pivotSource=*pivotTarget=pivotStart; } else if(targetCnv->charErrorBufferLength>0) { /* output the targetCnv overflow buffer */ - if(ucnv_outputOverflowFromUnicode(targetCnv, target, targetLimit, NULL, pErrorCode)) { + if(ucnv_outputOverflowFromUnicode(targetCnv, target, targetLimit, nullptr, pErrorCode)) { /* U_BUFFER_OVERFLOW_ERROR */ return; } @@ -2140,15 +2140,15 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, /* Is direct-UTF-8 conversion available? */ if( sourceCnv->sharedData->staticData->conversionType==UCNV_UTF8 && - targetCnv->sharedData->impl->fromUTF8!=NULL + targetCnv->sharedData->impl->fromUTF8!=nullptr ) { convert=targetCnv->sharedData->impl->fromUTF8; } else if( targetCnv->sharedData->staticData->conversionType==UCNV_UTF8 && - sourceCnv->sharedData->impl->toUTF8!=NULL + sourceCnv->sharedData->impl->toUTF8!=nullptr ) { convert=sourceCnv->sharedData->impl->toUTF8; } else { - convert=NULL; + convert=nullptr; } /* @@ -2170,21 +2170,21 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, * conversion, with function call overhead outweighing the benefits * of direct conversion. */ - if(convert!=NULL && (pivotLimit-pivotStart)>32) { + if(convert!=nullptr && (pivotLimit-pivotStart)>32) { pivotLimit=pivotStart+32; } /* prepare the converter arguments */ fromUArgs.converter=targetCnv; fromUArgs.flush=false; - fromUArgs.offsets=NULL; + fromUArgs.offsets=nullptr; fromUArgs.target=*target; fromUArgs.targetLimit=targetLimit; fromUArgs.size=sizeof(fromUArgs); toUArgs.converter=sourceCnv; toUArgs.flush=flush; - toUArgs.offsets=NULL; + toUArgs.offsets=nullptr; toUArgs.source=s; toUArgs.sourceLimit=sourceLimit; toUArgs.targetLimit=pivotLimit; @@ -2197,7 +2197,7 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, * * Otherwise stop using s and t from here on. */ - s=t=NULL; + s=t=nullptr; /* * conversion loop @@ -2250,7 +2250,7 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, */ /* output the sourceCnv overflow buffer */ if(sourceCnv->UCharErrorBufferLength>0) { - if(ucnv_outputOverflowToUnicode(sourceCnv, pivotTarget, pivotLimit, NULL, pErrorCode)) { + if(ucnv_outputOverflowToUnicode(sourceCnv, pivotTarget, pivotLimit, nullptr, pErrorCode)) { /* U_BUFFER_OVERFLOW_ERROR */ *pErrorCode=U_ZERO_ERROR; } @@ -2277,7 +2277,7 @@ ucnv_convertEx(UConverter *targetCnv, UConverter *sourceCnv, * but not if continuing a partial match * or flushing the toUnicode replay buffer */ - if(convert!=NULL && targetCnv->preFromUFirstCP<0 && sourceCnv->preToULength==0) { + if(convert!=nullptr && targetCnv->preFromUFirstCP<0 && sourceCnv->preToULength==0) { if(*pErrorCode==U_USING_DEFAULT_WARNING) { /* remove a warning that may be set by this function */ *pErrorCode=U_ZERO_ERROR; @@ -2482,12 +2482,12 @@ ucnv_convert(const char *toConverterName, const char *fromConverterName, UConverter *inConverter, *outConverter; int32_t targetLength; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if( source==NULL || sourceLength<-1 || - targetCapacity<0 || (targetCapacity>0 && target==NULL) + if( source==nullptr || sourceLength<-1 || + targetCapacity<0 || (targetCapacity>0 && target==nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -2533,12 +2533,12 @@ ucnv_convertAlgorithmic(UBool convertToAlgorithmic, UConverter *algoConverter, *to, *from; int32_t targetLength; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if( cnv==NULL || source==NULL || sourceLength<-1 || - targetCapacity<0 || (targetCapacity>0 && target==NULL) + if( cnv==nullptr || source==nullptr || sourceLength<-1 || + targetCapacity<0 || (targetCapacity>0 && target==nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -2620,11 +2620,11 @@ ucnv_getStarters(const UConverter* converter, UBool starters[256], UErrorCode* err) { - if (err == NULL || U_FAILURE(*err)) { + if (err == nullptr || U_FAILURE(*err)) { return; } - if(converter->sharedData->impl->getStarters != NULL) { + if(converter->sharedData->impl->getStarters != nullptr) { converter->sharedData->impl->getStarters(converter, starters, err); } else { *err = U_ILLEGAL_ARGUMENT_ERROR; @@ -2637,14 +2637,14 @@ static const UAmbiguousConverter *ucnv_getAmbiguous(const UConverter *cnv) const char *name; int32_t i; - if(cnv==NULL) { - return NULL; + if(cnv==nullptr) { + return nullptr; } errorCode=U_ZERO_ERROR; name=ucnv_getName(cnv, &errorCode); if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } for(i=0; iextraInfo = uprv_malloc (sizeof (UConverterDataISO2022)); - if(cnv->extraInfo != NULL) { + if(cnv->extraInfo != nullptr) { UConverterNamePieces stackPieces; UConverterLoadArgs stackArgs=UCNV_LOAD_ARGS_INITIALIZER; UConverterDataISO2022 *myConverterData=(UConverterDataISO2022 *) cnv->extraInfo; @@ -557,7 +557,7 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){ if(pArgs->onlyTestIsLoadable) { ucnv_canCreateConverter(cnvName, errorCode); /* errorCode carries result */ uprv_free(cnv->extraInfo); - cnv->extraInfo=NULL; + cnv->extraInfo=nullptr; return; } else { myConverterData->currentConverter=ucnv_open(cnvName, errorCode); @@ -659,10 +659,10 @@ _ISO2022Close(UConverter *converter) { UConverterSharedData **array = myData->myConverterArray; int32_t i; - if (converter->extraInfo != NULL) { + if (converter->extraInfo != nullptr) { /*close the array of converter pointers and free the memory*/ for (i=0; iisExtraLocal){ uprv_free (converter->extraInfo); - converter->extraInfo = NULL; + converter->extraInfo = nullptr; } } } @@ -694,7 +694,7 @@ _ISO2022Reset(UConverter *converter, UConverterResetChoice choice) { myConverterData->key = 0; if (converter->mode == UCNV_SO){ ucnv_close (myConverterData->currentConverter); - myConverterData->currentConverter=NULL; + myConverterData->currentConverter=nullptr; } converter->mode = UCNV_SI; } @@ -729,7 +729,7 @@ _ISO2022getName(const UConverter* cnv){ UConverterDataISO2022* myData= (UConverterDataISO2022*)cnv->extraInfo; return myData->name; } - return NULL; + return nullptr; } U_CDECL_END @@ -891,7 +891,7 @@ DONE: case ISO_2022: { const char *chosenConverterName = escSeqStateTable_Result_2022[offset]; - if(chosenConverterName == NULL) { + if(chosenConverterName == nullptr) { /* SS2 or SS3 */ *err = U_UNSUPPORTED_ESCAPE_SEQUENCE; _this->toUCallbackReason = UCNV_UNASSIGNED; @@ -1171,7 +1171,7 @@ MBCS_FROM_UCHAR32_ISO2022(UConverterSharedData* sharedData, } cx=sharedData->mbcs.extIndexes; - if(cx!=NULL) { + if(cx!=nullptr) { return ucnv_extSimpleMatchFromU(cx, c, value, useFallback); } @@ -1274,7 +1274,7 @@ T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverterToUnicodeArgs* args, mySourceLimit = getEndOfBuffer_2022(&(args->source), realSourceLimit, args->flush); if(args->source < mySourceLimit) { - if(myData->currentConverter==NULL) { + if(myData->currentConverter==nullptr) { myData->currentConverter = ucnv_open("ASCII",err); if(U_FAILURE(*err)){ return; @@ -1322,7 +1322,7 @@ T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverterToUnicodeArgs* args, */ if (U_FAILURE(*err) || (args->source == realSourceLimit) || - (args->offsets != NULL && (args->target != myTargetStart || args->source != sourceStart) || + (args->offsets != nullptr && (args->target != myTargetStart || args->source != sourceStart) || (mySourceLimit < realSourceLimit && myData->currentConverter->toULength > 0)) ) { /* copy partial or error input for truncated detection and error handling */ @@ -1351,7 +1351,7 @@ T_UConverter_toUnicode_ISO_2022_OFFSETS_LOGIC(UConverterToUnicodeArgs* args, realSourceLimit, ISO_2022, err); - if (U_FAILURE(*err) || (args->source != sourceStart && args->offsets != NULL)) { + if (U_FAILURE(*err) || (args->source != sourceStart && args->offsets != nullptr)) { /* let the ucnv.c code update its current offset */ return; } @@ -2624,7 +2624,7 @@ UConverter_toUnicode_ISO_2022_KR_OFFSETS_LOGIC_IBM(UConverterToUnicodeArgs *args */ ucnv_MBCSToUnicodeWithOffsets(&subArgs, err); - if(args->offsets != NULL && sourceStart != args->source) { + if(args->offsets != nullptr && sourceStart != args->source) { /* update offsets to base them on the actual start of the input */ int32_t *offsets = args->offsets; UChar *target = args->target; @@ -3599,7 +3599,7 @@ _ISO_2022_SafeClone( if (*pBufferSize == 0) { /* 'preflighting' request - set needed size into *pBufferSize */ *pBufferSize = (int32_t)sizeof(struct cloneStruct); - return NULL; + return nullptr; } cnvData = (UConverterDataISO2022 *)cnv->extraInfo; @@ -3613,19 +3613,19 @@ _ISO_2022_SafeClone( /* share the subconverters */ - if(cnvData->currentConverter != NULL) { + if(cnvData->currentConverter != nullptr) { size = (int32_t)sizeof(UConverter); localClone->mydata.currentConverter = ucnv_safeClone(cnvData->currentConverter, &localClone->currentConverter, &size, status); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } } for(i=0; imyConverterArray[i] != NULL) { + if(cnvData->myConverterArray[i] != nullptr) { ucnv_incrementRefCount(cnvData->myConverterArray[i]); } } @@ -3721,7 +3721,7 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv, for (i=0; imyConverterArray[i]!=NULL) { + if(cnvData->myConverterArray[i]!=nullptr) { if(cnvData->locale[0]=='j' && i==JISX208) { /* * Only add code points that map to Shift-JIS codes @@ -3769,8 +3769,8 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv, static const UConverterImpl _ISO2022Impl={ UCNV_ISO_2022, - NULL, - NULL, + nullptr, + nullptr, _ISO2022Open, _ISO2022Close, @@ -3782,21 +3782,21 @@ static const UConverterImpl _ISO2022Impl={ ucnv_fromUnicode_UTF8, ucnv_fromUnicode_UTF8_OFFSETS_LOGIC, #else - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, #endif - NULL, + nullptr, - NULL, + nullptr, _ISO2022getName, _ISO_2022_WriteSub, _ISO_2022_SafeClone, _ISO_2022_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _ISO2022StaticData={ sizeof(UConverterStaticData), @@ -3821,8 +3821,8 @@ const UConverterSharedData _ISO2022Data= static const UConverterImpl _ISO2022JPImpl={ UCNV_ISO_2022, - NULL, - NULL, + nullptr, + nullptr, _ISO2022Open, _ISO2022Close, @@ -3832,16 +3832,16 @@ static const UConverterImpl _ISO2022JPImpl={ UConverter_toUnicode_ISO_2022_JP_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_JP_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_JP_OFFSETS_LOGIC, - NULL, + nullptr, - NULL, + nullptr, _ISO2022getName, _ISO_2022_WriteSub, _ISO_2022_SafeClone, _ISO_2022_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _ISO2022JPStaticData={ sizeof(UConverterStaticData), @@ -3872,8 +3872,8 @@ const UConverterSharedData _ISO2022JPData= static const UConverterImpl _ISO2022KRImpl={ UCNV_ISO_2022, - NULL, - NULL, + nullptr, + nullptr, _ISO2022Open, _ISO2022Close, @@ -3883,16 +3883,16 @@ static const UConverterImpl _ISO2022KRImpl={ UConverter_toUnicode_ISO_2022_KR_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_KR_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_KR_OFFSETS_LOGIC, - NULL, + nullptr, - NULL, + nullptr, _ISO2022getName, _ISO_2022_WriteSub, _ISO_2022_SafeClone, _ISO_2022_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _ISO2022KRStaticData={ sizeof(UConverterStaticData), @@ -3923,8 +3923,8 @@ static const UConverterImpl _ISO2022CNImpl={ UCNV_ISO_2022, - NULL, - NULL, + nullptr, + nullptr, _ISO2022Open, _ISO2022Close, @@ -3934,16 +3934,16 @@ static const UConverterImpl _ISO2022CNImpl={ UConverter_toUnicode_ISO_2022_CN_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_CN_OFFSETS_LOGIC, UConverter_fromUnicode_ISO_2022_CN_OFFSETS_LOGIC, - NULL, + nullptr, - NULL, + nullptr, _ISO2022getName, _ISO_2022_WriteSub, _ISO_2022_SafeClone, _ISO_2022_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _ISO2022CNStaticData={ sizeof(UConverterStaticData), diff --git a/icu4c/source/common/ucnv_bld.cpp b/icu4c/source/common/ucnv_bld.cpp index a0fbfe2d7f5..df1dfb11f94 100644 --- a/icu4c/source/common/ucnv_bld.cpp +++ b/icu4c/source/common/ucnv_bld.cpp @@ -57,10 +57,10 @@ extern void UCNV_DEBUG_LOG(char *what, char *who, void *p, int l); static const UConverterSharedData * const converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={ - NULL, NULL, + nullptr, nullptr, #if UCONFIG_NO_LEGACY_CONVERSION - NULL, + nullptr, #else &_MBCSData, #endif @@ -68,22 +68,22 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={ &_Latin1Data, &_UTF8Data, &_UTF16BEData, &_UTF16LEData, #if UCONFIG_ONLY_HTML_CONVERSION - NULL, NULL, + nullptr, nullptr, #else &_UTF32BEData, &_UTF32LEData, #endif - NULL, + nullptr, #if UCONFIG_NO_LEGACY_CONVERSION - NULL, + nullptr, #else &_ISO2022Data, #endif #if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_ONLY_HTML_CONVERSION - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, #else &_LMBCSData1,&_LMBCSData2, &_LMBCSData3, &_LMBCSData4, &_LMBCSData5, &_LMBCSData6, &_LMBCSData8,&_LMBCSData11,&_LMBCSData16,&_LMBCSData17,&_LMBCSData18,&_LMBCSData19, @@ -91,27 +91,27 @@ converterData[UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES]={ #endif #if UCONFIG_ONLY_HTML_CONVERSION - NULL, + nullptr, #else &_SCSUData, #endif #if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_ONLY_HTML_CONVERSION - NULL, + nullptr, #else &_ISCIIData, #endif &_ASCIIData, #if UCONFIG_ONLY_HTML_CONVERSION - NULL, NULL, &_UTF16Data, NULL, NULL, NULL, + nullptr, nullptr, &_UTF16Data, nullptr, nullptr, nullptr, #else &_UTF7Data, &_Bocu1Data, &_UTF16Data, &_UTF32Data, &_CESU8Data, &_IMAPData, #endif #if UCONFIG_NO_LEGACY_CONVERSION || UCONFIG_ONLY_HTML_CONVERSION - NULL, + nullptr, #else &_CompoundTextData #endif @@ -193,20 +193,20 @@ static struct { /*initializes some global variables */ -static UHashtable *SHARED_DATA_HASHTABLE = NULL; +static UHashtable *SHARED_DATA_HASHTABLE = nullptr; static icu::UMutex cnvCacheMutex; /* Note: the global mutex is used for */ /* reference count updates. */ -static const char **gAvailableConverters = NULL; +static const char **gAvailableConverters = nullptr; static uint16_t gAvailableConverterCount = 0; static icu::UInitOnce gAvailableConvertersInitOnce {}; #if !U_CHARSET_IS_UTF8 /* This contains the resolved converter name. So no further alias lookup is needed again. */ -static char gDefaultConverterNameBuffer[UCNV_MAX_CONVERTER_NAME_LENGTH + 1]; /* +1 for NULL */ -static const char *gDefaultConverterName = NULL; +static char gDefaultConverterNameBuffer[UCNV_MAX_CONVERTER_NAME_LENGTH + 1]; /* +1 for nullptr */ +static const char *gDefaultConverterName = nullptr; /* If the default converter is an algorithmic converter, this is the cached value. @@ -214,7 +214,7 @@ We don't cache a full UConverter and clone it because ucnv_clone doesn't have less overhead than an algorithmic open. We don't cache non-algorithmic converters because ucnv_flushCache must be able to unload the default converter and its table. */ -static const UConverterSharedData *gDefaultAlgorithmicSharedData = NULL; +static const UConverterSharedData *gDefaultAlgorithmicSharedData = nullptr; /* Does gDefaultConverterName have a converter option and require extra parsing? */ static UBool gDefaultConverterContainsOption; @@ -232,7 +232,7 @@ ucnv_flushAvailableConverterCache() { gAvailableConverterCount = 0; if (gAvailableConverters) { uprv_free((char **)gAvailableConverters); - gAvailableConverters = NULL; + gAvailableConverters = nullptr; } gAvailableConvertersInitOnce.reset(); } @@ -243,22 +243,22 @@ ucnv_flushAvailableConverterCache() { /* Not supported API. */ static UBool U_CALLCONV ucnv_cleanup(void) { ucnv_flushCache(); - if (SHARED_DATA_HASHTABLE != NULL && uhash_count(SHARED_DATA_HASHTABLE) == 0) { + if (SHARED_DATA_HASHTABLE != nullptr && uhash_count(SHARED_DATA_HASHTABLE) == 0) { uhash_close(SHARED_DATA_HASHTABLE); - SHARED_DATA_HASHTABLE = NULL; + SHARED_DATA_HASHTABLE = nullptr; } /* Isn't called from flushCache because other threads may have preexisting references to the table. */ ucnv_flushAvailableConverterCache(); #if !U_CHARSET_IS_UTF8 - gDefaultConverterName = NULL; + gDefaultConverterName = nullptr; gDefaultConverterNameBuffer[0] = 0; gDefaultConverterContainsOption = false; - gDefaultAlgorithmicSharedData = NULL; + gDefaultAlgorithmicSharedData = nullptr; #endif - return (SHARED_DATA_HASHTABLE == NULL); + return (SHARED_DATA_HASHTABLE == nullptr); } U_CAPI void U_EXPORT2 @@ -295,22 +295,22 @@ ucnv_data_unFlattenClone(UConverterLoadArgs *pArgs, UDataMemory *pData, UErrorCo UConverterType type = (UConverterType)source->conversionType; if(U_FAILURE(*status)) - return NULL; + return nullptr; if( (uint16_t)type >= UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES || - converterData[type] == NULL || + converterData[type] == nullptr || !converterData[type]->isReferenceCounted || converterData[type]->referenceCounter != 1 || source->structSize != sizeof(UConverterStaticData)) { *status = U_INVALID_TABLE_FORMAT; - return NULL; + return nullptr; } data = (UConverterSharedData *)uprv_malloc(sizeof(UConverterSharedData)); - if(data == NULL) { + if(data == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } /* copy initial values from the static structure for this type */ @@ -323,11 +323,11 @@ ucnv_data_unFlattenClone(UConverterLoadArgs *pArgs, UDataMemory *pData, UErrorCo /* fill in fields from the loaded data */ data->dataMemory = (void*)pData; /* for future use */ - if(data->impl->load != NULL) { + if(data->impl->load != nullptr) { data->impl->load(data, pArgs, raw + source->structSize, status); if(U_FAILURE(*status)) { uprv_free(data); - return NULL; + return nullptr; } } return data; @@ -346,16 +346,16 @@ static UConverterSharedData *createConverterFromFile(UConverterLoadArgs *pArgs, if (U_FAILURE (*err)) { UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } UTRACE_DATA2(UTRACE_OPEN_CLOSE, "load converter %s from package %s", pArgs->name, pArgs->pkg); - data = udata_openChoice(pArgs->pkg, DATA_TYPE, pArgs->name, isCnvAcceptable, NULL, err); + data = udata_openChoice(pArgs->pkg, DATA_TYPE, pArgs->name, isCnvAcceptable, nullptr, err); if(U_FAILURE(*err)) { UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } sharedData = ucnv_data_unFlattenClone(pArgs, data, err); @@ -363,7 +363,7 @@ static UConverterSharedData *createConverterFromFile(UConverterLoadArgs *pArgs, { udata_close(data); UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } /* @@ -413,7 +413,7 @@ getAlgorithmicTypeFromName(const char *realName) } } - return NULL; + return nullptr; } /* @@ -437,11 +437,11 @@ ucnv_shareConverterData(UConverterSharedData * data) { UErrorCode err = U_ZERO_ERROR; /*Lazy evaluates the Hashtable itself */ - /*void *sanity = NULL;*/ + /*void *sanity = nullptr;*/ - if (SHARED_DATA_HASHTABLE == NULL) + if (SHARED_DATA_HASHTABLE == nullptr) { - SHARED_DATA_HASHTABLE = uhash_openSize(uhash_hashChars, uhash_compareChars, NULL, + SHARED_DATA_HASHTABLE = uhash_openSize(uhash_hashChars, uhash_compareChars, nullptr, ucnv_io_countKnownConverters(&err)*UCNV_CACHE_LOAD_FACTOR, &err); ucnv_enableCleanup(); @@ -454,7 +454,7 @@ ucnv_shareConverterData(UConverterSharedData * data) /* sanity = ucnv_getSharedConverterData (data->staticData->name); - if(sanity != NULL) + if(sanity != nullptr) { UCNV_DEBUG_LOG("put:overwrite!",data->staticData->name,sanity); } @@ -466,7 +466,7 @@ ucnv_shareConverterData(UConverterSharedData * data) uhash_put(SHARED_DATA_HASHTABLE, (void*) data->staticData->name, /* Okay to cast away const as long as - keyDeleter == NULL */ + keyDeleter == nullptr */ data, &err); UCNV_DEBUG_LOG("put", data->staticData->name,data); @@ -475,17 +475,17 @@ ucnv_shareConverterData(UConverterSharedData * data) /* Look up a converter name in the shared data cache. */ /* cnvCacheMutex must be held by the caller to protect the hash table. */ -/* gets the shared data from the SHARED_DATA_HASHTABLE (might return NULL if it isn't there) +/* gets the shared data from the SHARED_DATA_HASHTABLE (might return nullptr if it isn't there) * @param name The name of the shared data * @return the shared data from the SHARED_DATA_HASHTABLE */ static UConverterSharedData * ucnv_getSharedConverterData(const char *name) { - /*special case when no Table has yet been created we return NULL */ - if (SHARED_DATA_HASHTABLE == NULL) + /*special case when no Table has yet been created we return nullptr */ + if (SHARED_DATA_HASHTABLE == nullptr) { - return NULL; + return nullptr; } else { @@ -519,11 +519,11 @@ ucnv_deleteSharedConverterData(UConverterSharedData * deadSharedData) return false; } - if (deadSharedData->impl->unload != NULL) { + if (deadSharedData->impl->unload != nullptr) { deadSharedData->impl->unload(deadSharedData); } - if(deadSharedData->dataMemory != NULL) + if(deadSharedData->dataMemory != nullptr) { UDataMemory *data = (UDataMemory*)deadSharedData->dataMemory; udata_close(data); @@ -537,29 +537,29 @@ ucnv_deleteSharedConverterData(UConverterSharedData * deadSharedData) /** * Load a non-algorithmic converter. - * If pkg==NULL, then this function must be called inside umtx_lock(&cnvCacheMutex). + * If pkg==nullptr, then this function must be called inside umtx_lock(&cnvCacheMutex). */ UConverterSharedData * ucnv_load(UConverterLoadArgs *pArgs, UErrorCode *err) { UConverterSharedData *mySharedConverterData; - if(err == NULL || U_FAILURE(*err)) { - return NULL; + if(err == nullptr || U_FAILURE(*err)) { + return nullptr; } - if(pArgs->pkg != NULL && *pArgs->pkg != 0) { + if(pArgs->pkg != nullptr && *pArgs->pkg != 0) { /* application-provided converters are not currently cached */ return createConverterFromFile(pArgs, err); } mySharedConverterData = ucnv_getSharedConverterData(pArgs->name); - if (mySharedConverterData == NULL) + if (mySharedConverterData == nullptr) { /*Not cached, we need to stream it in from file */ mySharedConverterData = createConverterFromFile(pArgs, err); - if (U_FAILURE (*err) || (mySharedConverterData == NULL)) + if (U_FAILURE (*err) || (mySharedConverterData == nullptr)) { - return NULL; + return nullptr; } else if (!pArgs->onlyTestIsLoadable) { @@ -584,7 +584,7 @@ ucnv_load(UConverterLoadArgs *pArgs, UErrorCode *err) { */ U_CAPI void ucnv_unload(UConverterSharedData *sharedData) { - if(sharedData != NULL) { + if(sharedData != nullptr) { if (sharedData->referenceCounter > 0) { sharedData->referenceCounter--; } @@ -598,7 +598,7 @@ ucnv_unload(UConverterSharedData *sharedData) { U_CFUNC void ucnv_unloadSharedDataIfReady(UConverterSharedData *sharedData) { - if(sharedData != NULL && sharedData->isReferenceCounted) { + if(sharedData != nullptr && sharedData->isReferenceCounted) { umtx_lock(&cnvCacheMutex); ucnv_unload(sharedData); umtx_unlock(&cnvCacheMutex); @@ -608,7 +608,7 @@ ucnv_unloadSharedDataIfReady(UConverterSharedData *sharedData) U_CFUNC void ucnv_incrementRefCount(UConverterSharedData *sharedData) { - if(sharedData != NULL && sharedData->isReferenceCounted) { + if(sharedData != nullptr && sharedData->isReferenceCounted) { umtx_lock(&cnvCacheMutex); sharedData->referenceCounter++; umtx_unlock(&cnvCacheMutex); @@ -715,27 +715,27 @@ ucnv_loadSharedData(const char *converterName, UErrorCode * err) { UConverterNamePieces stackPieces; UConverterLoadArgs stackArgs; - UConverterSharedData *mySharedConverterData = NULL; + UConverterSharedData *mySharedConverterData = nullptr; UErrorCode internalErrorCode = U_ZERO_ERROR; UBool mayContainOption = true; UBool checkForAlgorithmic = true; if (U_FAILURE (*err)) { - return NULL; + return nullptr; } - if(pPieces == NULL) { - if(pArgs != NULL) { + if(pPieces == nullptr) { + if(pArgs != nullptr) { /* * Bad: We may set pArgs pointers to stackPieces fields * which will be invalid after this function returns. */ *err = U_INTERNAL_PROGRAM_ERROR; - return NULL; + return nullptr; } pPieces = &stackPieces; } - if(pArgs == NULL) { + if(pArgs == nullptr) { uprv_memset(&stackArgs, 0, sizeof(stackArgs)); stackArgs.size = (int32_t)sizeof(stackArgs); pArgs = &stackArgs; @@ -749,17 +749,17 @@ ucnv_loadSharedData(const char *converterName, pArgs->locale = pPieces->locale; pArgs->options = pPieces->options; - /* In case "name" is NULL we want to open the default converter. */ - if (converterName == NULL) { + /* In case "name" is nullptr we want to open the default converter. */ + if (converterName == nullptr) { #if U_CHARSET_IS_UTF8 pArgs->name = "UTF-8"; return (UConverterSharedData *)converterData[UCNV_UTF8]; #else /* Call ucnv_getDefaultName first to query the name from the OS. */ pArgs->name = ucnv_getDefaultName(); - if (pArgs->name == NULL) { + if (pArgs->name == nullptr) { *err = U_MISSING_RESOURCE_ERROR; - return NULL; + return nullptr; } mySharedConverterData = (UConverterSharedData *)gDefaultAlgorithmicSharedData; checkForAlgorithmic = false; @@ -777,12 +777,12 @@ ucnv_loadSharedData(const char *converterName, parseConverterOptions(converterName, pPieces, pArgs, err); if (U_FAILURE(*err)) { /* Very bad name used. */ - return NULL; + return nullptr; } /* get the canonical converter name */ pArgs->name = ucnv_io_getConverterName(pArgs->name, &mayContainOption, &internalErrorCode); - if (U_FAILURE(internalErrorCode) || pArgs->name == NULL) { + if (U_FAILURE(internalErrorCode) || pArgs->name == nullptr) { /* * set the input name in case the converter was added * without updating the alias table, or when there is no alias table @@ -802,7 +802,7 @@ ucnv_loadSharedData(const char *converterName, if (checkForAlgorithmic) { mySharedConverterData = (UConverterSharedData *)getAlgorithmicTypeFromName(pArgs->name); } - if (mySharedConverterData == NULL) + if (mySharedConverterData == nullptr) { /* it is a data-based converter, get its shared data. */ /* Hold the cnvCacheMutex through the whole process of checking the */ @@ -810,14 +810,14 @@ ucnv_loadSharedData(const char *converterName, /* to prevent other threads from modifying the cache during the */ /* process. */ pArgs->nestedLoads=1; - pArgs->pkg=NULL; + pArgs->pkg=nullptr; umtx_lock(&cnvCacheMutex); mySharedConverterData = ucnv_load(pArgs, err); umtx_unlock(&cnvCacheMutex); - if (U_FAILURE (*err) || (mySharedConverterData == NULL)) + if (U_FAILURE (*err) || (mySharedConverterData == nullptr)) { - return NULL; + return nullptr; } } @@ -851,7 +851,7 @@ ucnv_createConverter(UConverter *myUConverter, const char *converterName, UError /* exit with error */ UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } U_CFUNC UBool @@ -894,15 +894,15 @@ ucnv_createAlgorithmicConverter(UConverter *myUConverter, if(type<0 || UCNV_NUMBER_OF_SUPPORTED_CONVERTER_TYPES<=type) { *err = U_ILLEGAL_ARGUMENT_ERROR; UTRACE_EXIT_STATUS(U_ILLEGAL_ARGUMENT_ERROR); - return NULL; + return nullptr; } sharedData = converterData[type]; - if(sharedData == NULL || sharedData->isReferenceCounted) { + if(sharedData == nullptr || sharedData->isReferenceCounted) { /* not a valid type, or not an algorithmic converter */ *err = U_ILLEGAL_ARGUMENT_ERROR; UTRACE_EXIT_STATUS(U_ILLEGAL_ARGUMENT_ERROR); - return NULL; + return nullptr; } stackArgs.name = ""; @@ -928,7 +928,7 @@ ucnv_createConverterFromPackage(const char *packageName, const char *converterNa if(U_FAILURE(*err)) { UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } UTRACE_DATA2(UTRACE_OPEN_CLOSE, "open converter %s from package %s", converterName, packageName); @@ -941,7 +941,7 @@ ucnv_createConverterFromPackage(const char *packageName, const char *converterNa if (U_FAILURE(*err)) { /* Very bad name used. */ UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } stackArgs.nestedLoads=1; stackArgs.pkg=packageName; @@ -951,16 +951,16 @@ ucnv_createConverterFromPackage(const char *packageName, const char *converterNa if (U_FAILURE(*err)) { UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } /* create the actual converter */ - myUConverter = ucnv_createConverterFromSharedData(NULL, mySharedConverterData, &stackArgs, err); + myUConverter = ucnv_createConverterFromSharedData(nullptr, mySharedConverterData, &stackArgs, err); if (U_FAILURE(*err)) { ucnv_close(myUConverter); UTRACE_EXIT_STATUS(*err); - return NULL; + return nullptr; } UTRACE_EXIT_PTR_STATUS(myUConverter, *err); @@ -980,14 +980,14 @@ ucnv_createConverterFromSharedData(UConverter *myUConverter, ucnv_unloadSharedDataIfReady(mySharedConverterData); return myUConverter; } - if(myUConverter == NULL) + if(myUConverter == nullptr) { myUConverter = (UConverter *) uprv_malloc (sizeof (UConverter)); - if(myUConverter == NULL) + if(myUConverter == nullptr) { *err = U_MEMORY_ALLOCATION_ERROR; ucnv_unloadSharedDataIfReady(mySharedConverterData); - return NULL; + return nullptr; } isCopyLocal = false; } else { @@ -1013,12 +1013,12 @@ ucnv_createConverterFromSharedData(UConverter *myUConverter, myUConverter->toUCallbackReason = UCNV_ILLEGAL; /* default reason to invoke (*fromCharErrorBehaviour) */ } - if(mySharedConverterData->impl->open != NULL) { + if(mySharedConverterData->impl->open != nullptr) { mySharedConverterData->impl->open(myUConverter, pArgs, err); if(U_FAILURE(*err) && !pArgs->onlyTestIsLoadable) { /* don't ucnv_close() if onlyTestIsLoadable because not fully initialized */ ucnv_close(myUConverter); - return NULL; + return nullptr; } } @@ -1030,7 +1030,7 @@ ucnv_createConverterFromSharedData(UConverter *myUConverter, U_CAPI int32_t U_EXPORT2 ucnv_flushCache () { - UConverterSharedData *mySharedData = NULL; + UConverterSharedData *mySharedData = nullptr; int32_t pos; int32_t tableDeletedNum = 0; const UHashElement *e; @@ -1045,7 +1045,7 @@ ucnv_flushCache () /*if shared data hasn't even been lazy evaluated yet * return 0 */ - if (SHARED_DATA_HASHTABLE == NULL) { + if (SHARED_DATA_HASHTABLE == nullptr) { UTRACE_EXIT_VALUE((int32_t)0); return 0; } @@ -1072,7 +1072,7 @@ ucnv_flushCache () do { remaining = 0; pos = UHASH_FIRST; - while ((e = uhash_nextElement (SHARED_DATA_HASHTABLE, &pos)) != NULL) + while ((e = uhash_nextElement (SHARED_DATA_HASHTABLE, &pos)) != nullptr) { mySharedData = (UConverterSharedData *) e->value.pointer; /*deletes only if reference counter == 0 */ @@ -1102,7 +1102,7 @@ ucnv_flushCache () static void U_CALLCONV initAvailableConvertersList(UErrorCode &errCode) { U_ASSERT(gAvailableConverterCount == 0); - U_ASSERT(gAvailableConverters == NULL); + U_ASSERT(gAvailableConverters == nullptr); ucnv_enableCleanup(); UEnumeration *allConvEnum = ucnv_openAllNames(&errCode); @@ -1121,13 +1121,13 @@ static void U_CALLCONV initAvailableConvertersList(UErrorCode &errCode) { /* Open the default converter to make sure that it has first dibs in the hash table. */ UErrorCode localStatus = U_ZERO_ERROR; UConverter tempConverter; - ucnv_close(ucnv_createConverter(&tempConverter, NULL, &localStatus)); + ucnv_close(ucnv_createConverter(&tempConverter, nullptr, &localStatus)); gAvailableConverterCount = 0; for (int32_t idx = 0; idx < allConverterCount; idx++) { localStatus = U_ZERO_ERROR; - const char *converterName = uenum_next(allConvEnum, NULL, &localStatus); + const char *converterName = uenum_next(allConvEnum, nullptr, &localStatus); if (ucnv_canCreateConverter(converterName, &localStatus)) { gAvailableConverters[gAvailableConverterCount++] = converterName; } @@ -1158,7 +1158,7 @@ ucnv_bld_getAvailableConverter(uint16_t n, UErrorCode *pErrorCode) { } *pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR; } - return NULL; + return nullptr; } /* default converter name --------------------------------------------------- */ @@ -1181,7 +1181,7 @@ internalSetName(const char *name, UErrorCode *status) { UConverterNamePieces stackPieces; UConverterLoadArgs stackArgs=UCNV_LOAD_ARGS_INITIALIZER; int32_t length=(int32_t)(uprv_strlen(name)); - UBool containsOption = (UBool)(uprv_strchr(name, UCNV_OPTION_SEP_CHAR) != NULL); + UBool containsOption = (UBool)(uprv_strchr(name, UCNV_OPTION_SEP_CHAR) != nullptr); const UConverterSharedData *algorithmicSharedData; stackArgs.name = name; @@ -1240,22 +1240,22 @@ ucnv_getDefaultName() { icu::Mutex lock(&cnvCacheMutex); name = gDefaultConverterName; } - if(name==NULL) { + if(name==nullptr) { UErrorCode errorCode = U_ZERO_ERROR; - UConverter *cnv = NULL; + UConverter *cnv = nullptr; name = uprv_getDefaultCodepage(); /* if the name is there, test it out and get the canonical name with options */ - if(name != NULL) { + if(name != nullptr) { cnv = ucnv_open(name, &errorCode); - if(U_SUCCESS(errorCode) && cnv != NULL) { + if(U_SUCCESS(errorCode) && cnv != nullptr) { name = ucnv_getName(cnv, &errorCode); } } - if(name == NULL || name[0] == 0 - || U_FAILURE(errorCode) || cnv == NULL + if(name == nullptr || name[0] == 0 + || U_FAILURE(errorCode) || cnv == nullptr || uprv_strlen(name)>=sizeof(gDefaultConverterNameBuffer)) { /* Panic time, let's use a fallback. */ @@ -1288,21 +1288,21 @@ See internalSetName or the API reference for details. */ U_CAPI void U_EXPORT2 ucnv_setDefaultName(const char *converterName) { - if(converterName==NULL) { + if(converterName==nullptr) { /* reset to the default codepage */ - gDefaultConverterName=NULL; + gDefaultConverterName=nullptr; } else { UErrorCode errorCode = U_ZERO_ERROR; - UConverter *cnv = NULL; - const char *name = NULL; + UConverter *cnv = nullptr; + const char *name = nullptr; /* if the name is there, test it out and get the canonical name with options */ cnv = ucnv_open(converterName, &errorCode); - if(U_SUCCESS(errorCode) && cnv != NULL) { + if(U_SUCCESS(errorCode) && cnv != nullptr) { name = ucnv_getName(cnv, &errorCode); } - if(U_SUCCESS(errorCode) && name!=NULL) { + if(U_SUCCESS(errorCode) && name!=nullptr) { internalSetName(name, &errorCode); } /* else this converter is bad to use. Don't change it to a bad value. */ @@ -1353,7 +1353,7 @@ ucnv_swap(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } @@ -1509,7 +1509,7 @@ ucnv_swap(const UDataSwapper *ds, } /* avoid compiler warnings - not otherwise necessary, and the value does not matter */ - inExtIndexes=NULL; + inExtIndexes=nullptr; } else { /* there is extension data after the base data, see ucnv_ext.h */ if(length>=0 && length<(extOffset+UCNV_EXT_INDEXES_MIN_LENGTH*4)) { diff --git a/icu4c/source/common/ucnv_cb.cpp b/icu4c/source/common/ucnv_cb.cpp index 7bfde828704..afd1e5eae51 100644 --- a/icu4c/source/common/ucnv_cb.cpp +++ b/icu4c/source/common/ucnv_cb.cpp @@ -85,7 +85,7 @@ ucnv_cbFromUWriteUChars(UConverterFromUnicodeArgs *args, args->targetLimit, source, sourceLimit, - NULL, /* no offsets */ + nullptr, /* no offsets */ false, /* no flush */ err); @@ -140,7 +140,7 @@ ucnv_cbFromUWriteUChars(UConverterFromUnicodeArgs *args, newTargetLimit, source, sourceLimit, - NULL, + nullptr, false, &err2); @@ -205,7 +205,7 @@ ucnv_cbFromUWriteSub (UConverterFromUnicodeArgs *args, return; } - if(converter->sharedData->impl->writeSub!=NULL) { + if(converter->sharedData->impl->writeSub!=nullptr) { converter->sharedData->impl->writeSub(args, offsetIndex, err); } else if(converter->subChar1!=0 && (uint16_t)converter->invalidUCharBuffer[0]<=(uint16_t)0xffu) { diff --git a/icu4c/source/common/ucnv_cnv.cpp b/icu4c/source/common/ucnv_cnv.cpp index ea71acf92c7..93b096b437f 100644 --- a/icu4c/source/common/ucnv_cnv.cpp +++ b/icu4c/source/common/ucnv_cnv.cpp @@ -62,7 +62,7 @@ ucnv_fromUWriteBytes(UConverter *cnv, int32_t *o; /* write bytes */ - if(offsets==NULL || (o=*offsets)==NULL) { + if(offsets==nullptr || (o=*offsets)==nullptr) { while(length>0 && t0) { - if(cnv!=NULL) { + if(cnv!=nullptr) { t=(char *)cnv->charErrorBuffer; cnv->charErrorBufferLength=(int8_t)length; do { @@ -102,7 +102,7 @@ ucnv_toUWriteUChars(UConverter *cnv, int32_t *o; /* write UChars */ - if(offsets==NULL || (o=*offsets)==NULL) { + if(offsets==nullptr || (o=*offsets)==nullptr) { while(length>0 && t0) { - if(cnv!=NULL) { + if(cnv!=nullptr) { t=cnv->UCharErrorBuffer; cnv->UCharErrorBufferLength=(int8_t)length; do { @@ -157,7 +157,7 @@ ucnv_toUWriteCodePoint(UConverter *cnv, } /* write offsets */ - if(offsets!=NULL && (o=*offsets)!=NULL) { + if(offsets!=nullptr && (o=*offsets)!=nullptr) { *o++=sourceIndex; if((*target+1)=0) { - if(cnv!=NULL) { + if(cnv!=nullptr) { int8_t i=0; U16_APPEND_UNSAFE(cnv->UCharErrorBuffer, i, c); cnv->UCharErrorBufferLength=i; diff --git a/icu4c/source/common/ucnv_ct.cpp b/icu4c/source/common/ucnv_ct.cpp index c12e982b88b..3cb333dc725 100644 --- a/icu4c/source/common/ucnv_ct.cpp +++ b/icu4c/source/common/ucnv_ct.cpp @@ -261,13 +261,13 @@ static COMPOUND_TEXT_CONVERTERS findStateFromEscSeq(const char* source, const ch static void U_CALLCONV _CompoundTextOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){ cnv->extraInfo = uprv_malloc (sizeof (UConverterDataCompoundText)); - if (cnv->extraInfo != NULL) { + if (cnv->extraInfo != nullptr) { UConverterDataCompoundText *myConverterData = (UConverterDataCompoundText *) cnv->extraInfo; UConverterNamePieces stackPieces; UConverterLoadArgs stackArgs=UCNV_LOAD_ARGS_INITIALIZER; - myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_0] = NULL; + myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_0] = nullptr; myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_1] = ucnv_loadSharedData("icu-internal-compound-s1", &stackPieces, &stackArgs, errorCode); myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_2] = ucnv_loadSharedData("icu-internal-compound-s2", &stackPieces, &stackArgs, errorCode); myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_3] = ucnv_loadSharedData("icu-internal-compound-s3", &stackPieces, &stackArgs, errorCode); @@ -306,16 +306,16 @@ _CompoundTextClose(UConverter *converter) { UConverterDataCompoundText* myConverterData = (UConverterDataCompoundText*)(converter->extraInfo); int32_t i; - if (converter->extraInfo != NULL) { + if (converter->extraInfo != nullptr) { /*close the array of converter pointers and free the memory*/ for (i = 0; i < NUM_OF_CONVERTERS; i++) { - if (myConverterData->myConverterArray[i] != NULL) { + if (myConverterData->myConverterArray[i] != nullptr) { ucnv_unloadSharedDataIfReady(myConverterData->myConverterArray[i]); } } uprv_free(converter->extraInfo); - converter->extraInfo = NULL; + converter->extraInfo = nullptr; } } @@ -474,7 +474,7 @@ UConverter_toUnicode_CompoundText_OFFSETS(UConverterToUnicodeArgs *args, COMPOUND_TEXT_CONVERTERS currentState, tmpState; int32_t sourceOffset = 0; UConverterDataCompoundText *myConverterData = (UConverterDataCompoundText *) args->converter->extraInfo; - UConverterSharedData* savedSharedData = NULL; + UConverterSharedData* savedSharedData = nullptr; UConverterToUnicodeArgs subArgs; int32_t minArgsSize; @@ -602,8 +602,8 @@ static const UConverterImpl _CompoundTextImpl = { UCNV_COMPOUND_TEXT, - NULL, - NULL, + nullptr, + nullptr, _CompoundTextOpen, _CompoundTextClose, @@ -613,15 +613,15 @@ static const UConverterImpl _CompoundTextImpl = { UConverter_toUnicode_CompoundText_OFFSETS, UConverter_fromUnicode_CompoundText_OFFSETS, UConverter_fromUnicode_CompoundText_OFFSETS, - NULL, + nullptr, - NULL, + nullptr, _CompoundTextgetName, - NULL, - NULL, + nullptr, + nullptr, _CompoundText_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _CompoundTextStaticData = { diff --git a/icu4c/source/common/ucnv_err.cpp b/icu4c/source/common/ucnv_err.cpp index 4210673ef93..4201f3395da 100644 --- a/icu4c/source/common/ucnv_err.cpp +++ b/icu4c/source/common/ucnv_err.cpp @@ -150,7 +150,7 @@ UCNV_FROM_U_CALLBACK_SKIP ( */ *err = U_ZERO_ERROR; } - else if (context == NULL || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) + else if (context == nullptr || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) { *err = U_ZERO_ERROR; } @@ -180,7 +180,7 @@ UCNV_FROM_U_CALLBACK_SUBSTITUTE ( */ *err = U_ZERO_ERROR; } - else if (context == NULL || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) + else if (context == nullptr || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) { *err = U_ZERO_ERROR; ucnv_cbFromUWriteSub(fromArgs, 0, err); @@ -210,12 +210,12 @@ UCNV_FROM_U_CALLBACK_ESCAPE ( int32_t valueStringLength = 0; int32_t i = 0; - const UChar *myValueSource = NULL; + const UChar *myValueSource = nullptr; UErrorCode err2 = U_ZERO_ERROR; - UConverterFromUCallback original = NULL; + UConverterFromUCallback original = nullptr; const void *originalContext; - UConverterFromUCallback ignoredCallback = NULL; + UConverterFromUCallback ignoredCallback = nullptr; const void *ignoredContext; if (reason > UCNV_IRREGULAR) @@ -233,7 +233,7 @@ UCNV_FROM_U_CALLBACK_ESCAPE ( ucnv_setFromUCallBack (fromArgs->converter, (UConverterFromUCallback) UCNV_FROM_U_CALLBACK_SUBSTITUTE, - NULL, + nullptr, &original, &originalContext, &err2); @@ -243,7 +243,7 @@ UCNV_FROM_U_CALLBACK_ESCAPE ( *err = err2; return; } - if(context==NULL) + if(context==nullptr) { while (i < length) { @@ -373,7 +373,7 @@ UCNV_TO_U_CALLBACK_SKIP ( (void)length; if (reason <= UCNV_IRREGULAR) { - if (context == NULL || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) + if (context == nullptr || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) { *err = U_ZERO_ERROR; } @@ -395,7 +395,7 @@ UCNV_TO_U_CALLBACK_SUBSTITUTE ( (void)length; if (reason <= UCNV_IRREGULAR) { - if (context == NULL || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) + if (context == nullptr || (*((char*)context) == UCNV_PRV_STOP_ON_ILLEGAL && reason == UCNV_UNASSIGNED)) { *err = U_ZERO_ERROR; ucnv_cbToUWriteSub(toArgs,0,err); @@ -426,7 +426,7 @@ UCNV_TO_U_CALLBACK_ESCAPE ( return; } - if(context==NULL) + if(context==nullptr) { while (i < length) { diff --git a/icu4c/source/common/ucnv_ext.cpp b/icu4c/source/common/ucnv_ext.cpp index ffc3c93033a..558bdce1e34 100644 --- a/icu4c/source/common/ucnv_ext.cpp +++ b/icu4c/source/common/ucnv_ext.cpp @@ -132,7 +132,7 @@ ucnv_extMatchToU(const int32_t *cx, int8_t sisoState, int32_t i, j, idx, length, matchLength; uint8_t b; - if(cx==NULL || cx[UCNV_EXT_TO_U_LENGTH]<=0) { + if(cx==nullptr || cx[UCNV_EXT_TO_U_LENGTH]<=0) { return 0; /* no extension data, no match */ } @@ -343,7 +343,7 @@ ucnv_extSimpleMatchToU(const int32_t *cx, /* try to match */ match=ucnv_extMatchToU(cx, -1, source, length, - NULL, 0, + nullptr, 0, &value, useFallback, true); if(match==length) { @@ -508,7 +508,7 @@ ucnv_extFindFromU(const UChar *fromUSection, int32_t length, UChar u) { } /* - * @param cx pointer to extension data; if NULL, returns 0 + * @param cx pointer to extension data; if nullptr, returns 0 * @param firstCP the first code point before all the other UChars * @param pre UChars that must match; !initialMatch: partial match with them * @param preLength length of pre, >=0 @@ -544,7 +544,7 @@ ucnv_extMatchFromU(const int32_t *cx, int32_t i, j, idx, length, matchLength; UChar c; - if(cx==NULL) { + if(cx==nullptr) { return 0; /* no extension data, no match */ } @@ -759,7 +759,7 @@ ucnv_extInitialMatchFromU(UConverter *cnv, const int32_t *cx, /* try to match */ match=ucnv_extMatchFromU(cx, cp, - NULL, 0, + nullptr, 0, *src, (int32_t)(srcLimit-*src), &value, cnv->useFallback, flush); @@ -819,8 +819,8 @@ ucnv_extSimpleMatchFromU(const int32_t *cx, /* try to match */ match=ucnv_extMatchFromU(cx, cp, - NULL, 0, - NULL, 0, + nullptr, 0, + nullptr, 0, &value, useFallback, true); if(match>=2) { @@ -1044,7 +1044,7 @@ ucnv_extGetUnicodeSet(const UConverterSharedData *sharedData, int32_t length; cx=sharedData->mbcs.extIndexes; - if(cx==NULL) { + if(cx==nullptr) { return; } diff --git a/icu4c/source/common/ucnv_io.cpp b/icu4c/source/common/ucnv_io.cpp index c9d20cb941b..5cabcbd5313 100644 --- a/icu4c/source/common/ucnv_io.cpp +++ b/icu4c/source/common/ucnv_io.cpp @@ -174,7 +174,7 @@ typedef struct UAliasContext { static const char DATA_NAME[] = "cnvalias"; static const char DATA_TYPE[] = "icu"; -static UDataMemory *gAliasData=NULL; +static UDataMemory *gAliasData=nullptr; static icu::UInitOnce gAliasDataInitOnce {}; enum { @@ -220,7 +220,7 @@ static UBool U_CALLCONV ucnv_io_cleanup(void) { if (gAliasData) { udata_close(gAliasData); - gAliasData = NULL; + gAliasData = nullptr; } gAliasDataInitOnce.reset(); @@ -238,8 +238,8 @@ static void U_CALLCONV initAliasData(UErrorCode &errCode) { ucln_common_registerCleanup(UCLN_COMMON_UCNV_IO, ucnv_io_cleanup); - U_ASSERT(gAliasData == NULL); - data = udata_openChoice(NULL, DATA_TYPE, DATA_NAME, isAcceptable, NULL, &errCode); + U_ASSERT(gAliasData == nullptr); + data = udata_openChoice(nullptr, DATA_TYPE, DATA_NAME, isAcceptable, nullptr, &errCode); if(U_FAILURE(errCode)) { return; } @@ -317,7 +317,7 @@ haveAliasData(UErrorCode *pErrorCode) { static inline UBool isAlias(const char *alias, UErrorCode *pErrorCode) { - if(alias==NULL) { + if(alias==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return false; } @@ -615,7 +615,7 @@ findConverter(const char *alias, UBool *containsOption, UErrorCode *pErrorCode) /* * Is this alias in this list? - * alias and listOffset should be non-NULL. + * alias and listOffset should be non-nullptr. */ static inline UBool isAliasInList(const char *alias, uint32_t listOffset) { @@ -650,7 +650,7 @@ findTaggedAliasListsOffset(const char *alias, const char *standard, UErrorCode * uint32_t tagNum = getTagNumber(standard); /* Make a quick guess. Hopefully they used a TR22 canonical alias. */ - convNum = findConverter(alias, NULL, &myErr); + convNum = findConverter(alias, nullptr, &myErr); if (myErr != U_ZERO_ERROR) { *pErrorCode = myErr; } @@ -701,7 +701,7 @@ findTaggedConverterNum(const char *alias, const char *standard, UErrorCode *pErr uint32_t tagNum = getTagNumber(standard); /* Make a quick guess. Hopefully they used a TR22 canonical alias. */ - convNum = findConverter(alias, NULL, &myErr); + convNum = findConverter(alias, nullptr, &myErr); if (myErr != U_ZERO_ERROR) { *pErrorCode = myErr; } @@ -762,7 +762,7 @@ ucnv_io_getConverterName(const char *alias, UBool *containsOption, UErrorCode *p } } - return NULL; + return nullptr; } U_CDECL_BEGIN @@ -804,7 +804,7 @@ ucnv_io_nextStandardAliases(UEnumeration *enumerator, if (resultLength) { *resultLength = 0; } - return NULL; + return nullptr; } static void U_CALLCONV @@ -822,8 +822,8 @@ U_CDECL_END /* Enumerate the aliases for the specified converter and standard tag */ static const UEnumeration gEnumAliases = { - NULL, - NULL, + nullptr, + nullptr, ucnv_io_closeUEnumeration, ucnv_io_countStandardAliases, uenum_unextDefault, @@ -836,7 +836,7 @@ ucnv_openStandardNames(const char *convName, const char *standard, UErrorCode *pErrorCode) { - UEnumeration *myEnum = NULL; + UEnumeration *myEnum = nullptr; if (haveAliasData(pErrorCode) && isAlias(convName, pErrorCode)) { uint32_t listOffset = findTaggedAliasListsOffset(convName, standard, pErrorCode); @@ -847,16 +847,16 @@ ucnv_openStandardNames(const char *convName, UAliasContext *myContext; myEnum = static_cast(uprv_malloc(sizeof(UEnumeration))); - if (myEnum == NULL) { + if (myEnum == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(myEnum, &gEnumAliases, sizeof(UEnumeration)); myContext = static_cast(uprv_malloc(sizeof(UAliasContext))); - if (myContext == NULL) { + if (myContext == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; uprv_free(myEnum); - return NULL; + return nullptr; } myContext->listOffset = listOffset; myContext->listIdx = 0; @@ -870,7 +870,7 @@ ucnv_openStandardNames(const char *convName, static uint16_t ucnv_io_countAliases(const char *alias, UErrorCode *pErrorCode) { if(haveAliasData(pErrorCode) && isAlias(alias, pErrorCode)) { - uint32_t convNum = findConverter(alias, NULL, pErrorCode); + uint32_t convNum = findConverter(alias, nullptr, pErrorCode); if (convNum < gMainTable.converterListSize) { /* tagListNum - 1 is the ALL tag */ int32_t listOffset = gMainTable.taggedAliasArray[(gMainTable.tagListSize - 1)*gMainTable.converterListSize + convNum]; @@ -889,7 +889,7 @@ static uint16_t ucnv_io_getAliases(const char *alias, uint16_t start, const char **aliases, UErrorCode *pErrorCode) { if(haveAliasData(pErrorCode) && isAlias(alias, pErrorCode)) { uint32_t currAlias; - uint32_t convNum = findConverter(alias, NULL, pErrorCode); + uint32_t convNum = findConverter(alias, nullptr, pErrorCode); if (convNum < gMainTable.converterListSize) { /* tagListNum - 1 is the ALL tag */ int32_t listOffset = gMainTable.taggedAliasArray[(gMainTable.tagListSize - 1)*gMainTable.converterListSize + convNum]; @@ -913,7 +913,7 @@ ucnv_io_getAliases(const char *alias, uint16_t start, const char **aliases, UErr static const char * ucnv_io_getAlias(const char *alias, uint16_t n, UErrorCode *pErrorCode) { if(haveAliasData(pErrorCode) && isAlias(alias, pErrorCode)) { - uint32_t convNum = findConverter(alias, NULL, pErrorCode); + uint32_t convNum = findConverter(alias, nullptr, pErrorCode); if (convNum < gMainTable.converterListSize) { /* tagListNum - 1 is the ALL tag */ int32_t listOffset = gMainTable.taggedAliasArray[(gMainTable.tagListSize - 1)*gMainTable.converterListSize + convNum]; @@ -932,7 +932,7 @@ ucnv_io_getAlias(const char *alias, uint16_t n, UErrorCode *pErrorCode) { } /* else converter not found */ } - return NULL; + return nullptr; } static uint16_t @@ -954,7 +954,7 @@ ucnv_getStandard(uint16_t n, UErrorCode *pErrorCode) { *pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR; } - return NULL; + return nullptr; } U_CAPI const char * U_EXPORT2 @@ -974,7 +974,7 @@ ucnv_getStandardName(const char *alias, const char *standard, UErrorCode *pError } } - return NULL; + return nullptr; } U_CAPI uint16_t U_EXPORT2 @@ -1013,7 +1013,7 @@ ucnv_getCanonicalName(const char *alias, const char *standard, UErrorCode *pErro } } - return NULL; + return nullptr; } U_CDECL_BEGIN @@ -1042,7 +1042,7 @@ ucnv_io_nextAllConverters(UEnumeration *enumerator, if (resultLength) { *resultLength = 0; } - return NULL; + return nullptr; } static void U_CALLCONV @@ -1051,8 +1051,8 @@ ucnv_io_resetAllConverters(UEnumeration *enumerator, UErrorCode * /*pErrorCode*/ } U_CDECL_END static const UEnumeration gEnumAllConverters = { - NULL, - NULL, + nullptr, + nullptr, ucnv_io_closeUEnumeration, ucnv_io_countAllConverters, uenum_unextDefault, @@ -1062,21 +1062,21 @@ static const UEnumeration gEnumAllConverters = { U_CAPI UEnumeration * U_EXPORT2 ucnv_openAllNames(UErrorCode *pErrorCode) { - UEnumeration *myEnum = NULL; + UEnumeration *myEnum = nullptr; if (haveAliasData(pErrorCode)) { uint16_t *myContext; myEnum = static_cast(uprv_malloc(sizeof(UEnumeration))); - if (myEnum == NULL) { + if (myEnum == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(myEnum, &gEnumAllConverters, sizeof(UEnumeration)); myContext = static_cast(uprv_malloc(sizeof(uint16_t))); - if (myContext == NULL) { + if (myContext == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; uprv_free(myEnum); - return NULL; + return nullptr; } *myContext = 0; myEnum->context = myContext; @@ -1153,7 +1153,7 @@ ucnv_swapAliases(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } @@ -1251,7 +1251,7 @@ ucnv_swapAliases(const UDataSwapper *ds, tempTable.resort=resort; } else { tempTable.rows=(TempRow *)uprv_malloc(count*sizeof(TempRow)+count*2); - if(tempTable.rows==NULL) { + if(tempTable.rows==nullptr) { udata_printError(ds, "ucnv_swapAliases(): unable to allocate memory for sorting tables (max length: %u)\n", count); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; diff --git a/icu4c/source/common/ucnv_lmb.cpp b/icu4c/source/common/ucnv_lmb.cpp index 78b8e407006..03af75f032f 100644 --- a/icu4c/source/common/ucnv_lmb.cpp +++ b/icu4c/source/common/ucnv_lmb.cpp @@ -242,15 +242,15 @@ static const char * const OptGroupByteToCPName[ULMBCS_GRP_LAST + 1] = { /* 0x0004 */ "windows-1256", /* 0x0005 */ "windows-1251", /* 0x0006 */ "ibm-852", - /* 0x0007 */ NULL, /* Unused */ + /* 0x0007 */ nullptr, /* Unused */ /* 0x0008 */ "windows-1254", - /* 0x0009 */ NULL, /* Control char HT */ - /* 0x000A */ NULL, /* Control char LF */ + /* 0x0009 */ nullptr, /* Control char HT */ + /* 0x000A */ nullptr, /* Control char LF */ /* 0x000B */ "windows-874", - /* 0x000C */ NULL, /* Unused */ - /* 0x000D */ NULL, /* Control char CR */ - /* 0x000E */ NULL, /* Unused */ - /* 0x000F */ NULL, /* Control chars: 0x0F20 + C0/C1 character: algorithmic */ + /* 0x000C */ nullptr, /* Unused */ + /* 0x000D */ nullptr, /* Control char CR */ + /* 0x000E */ nullptr, /* Unused */ + /* 0x000F */ nullptr, /* Control chars: 0x0F20 + C0/C1 character: algorithmic */ /* 0x0010 */ "windows-932", /* 0x0011 */ "windows-949", /* 0x0012 */ "windows-950", @@ -530,7 +530,7 @@ static const struct _LocaleLMBCSGrpMap /* {"vi", ULMBCS_GRP_L1}, */ {"zhTW", ULMBCS_GRP_TW}, {"zh", ULMBCS_GRP_CN}, - {NULL, ULMBCS_GRP_L1} + {nullptr, ULMBCS_GRP_L1} }; @@ -589,22 +589,22 @@ U_CDECL_END #define DECLARE_LMBCS_DATA(n) \ static const UConverterImpl _LMBCSImpl##n={\ UCNV_LMBCS_##n,\ - NULL,NULL,\ + nullptr,nullptr,\ _LMBCSOpen##n,\ _LMBCSClose,\ - NULL,\ + nullptr,\ _LMBCSToUnicodeWithOffsets,\ _LMBCSToUnicodeWithOffsets,\ _LMBCSFromUnicode,\ _LMBCSFromUnicode,\ - NULL,\ - NULL,\ - NULL,\ - NULL,\ + nullptr,\ + nullptr,\ + nullptr,\ + nullptr,\ _LMBCSSafeClone,\ ucnv_getCompleteUnicodeSet,\ - NULL,\ - NULL\ + nullptr,\ + nullptr\ };\ static const UConverterStaticData _LMBCSStaticData##n={\ sizeof(UConverterStaticData),\ @@ -635,7 +635,7 @@ _LMBCSOpenWorker(UConverter* _this, { UConverterDataLMBCS * extraInfo = (UConverterDataLMBCS*)uprv_malloc (sizeof (UConverterDataLMBCS)); _this->extraInfo = extraInfo; - if(extraInfo != NULL) + if(extraInfo != nullptr) { UConverterNamePieces stackPieces; UConverterLoadArgs stackArgs= UCNV_LOAD_ARGS_INITIALIZER; @@ -647,7 +647,7 @@ _LMBCSOpenWorker(UConverter* _this, for (i=0; i <= ULMBCS_GRP_LAST && U_SUCCESS(*err); i++) { - if(OptGroupByteToCPName[i] != NULL) { + if(OptGroupByteToCPName[i] != nullptr) { extraInfo->OptGrpConverter[i] = ucnv_loadSharedData(OptGroupByteToCPName[i], &stackPieces, &stackArgs, err); } } @@ -669,19 +669,19 @@ U_CDECL_BEGIN static void U_CALLCONV _LMBCSClose(UConverter * _this) { - if (_this->extraInfo != NULL) + if (_this->extraInfo != nullptr) { ulmbcs_byte_t Ix; UConverterDataLMBCS * extraInfo = (UConverterDataLMBCS *) _this->extraInfo; for (Ix=0; Ix <= ULMBCS_GRP_LAST; Ix++) { - if (extraInfo->OptGrpConverter[Ix] != NULL) + if (extraInfo->OptGrpConverter[Ix] != nullptr) ucnv_unloadSharedDataIfReady(extraInfo->OptGrpConverter[Ix]); } if (!_this->isExtraLocal) { uprv_free (_this->extraInfo); - _this->extraInfo = NULL; + _this->extraInfo = nullptr; } } } @@ -703,7 +703,7 @@ _LMBCSSafeClone(const UConverter *cnv, if(*pBufferSize<=0) { *pBufferSize=(int32_t)sizeof(LMBCSClone); - return NULL; + return nullptr; } extraInfo=(UConverterDataLMBCS *)cnv->extraInfo; @@ -715,7 +715,7 @@ _LMBCSSafeClone(const UConverter *cnv, /* share the subconverters */ for(i = 0; i <= ULMBCS_GRP_LAST; ++i) { - if(extraInfo->OptGrpConverter[i] != NULL) { + if(extraInfo->OptGrpConverter[i] != nullptr) { ucnv_incrementRefCount(extraInfo->OptGrpConverter[i]); } } @@ -1177,7 +1177,7 @@ _LMBCSGetNextUCharWorker(UConverterToUnicodeArgs* args, { group = CurByte; /* group byte is in the source */ extraInfo = (UConverterDataLMBCS *) args->converter->extraInfo; - if (group > ULMBCS_GRP_LAST || (cnv = extraInfo->OptGrpConverter[group]) == NULL) + if (group > ULMBCS_GRP_LAST || (cnv = extraInfo->OptGrpConverter[group]) == nullptr) { /* this is not a valid group byte - no converter*/ *err = U_INVALID_CHAR_FOUND; @@ -1267,7 +1267,7 @@ _LMBCSToUnicodeWithOffsets(UConverterToUnicodeArgs* args, UChar uniChar; /* one output UNICODE char */ const char * saveSource; /* beginning of current code point */ const char * pStartLMBCS = args->source; /* beginning of whole string */ - const char * errSource = NULL; /* pointer to actual input in case an error occurs */ + const char * errSource = nullptr; /* pointer to actual input in case an error occurs */ int8_t savebytes = 0; /* Process from source to limit, or until error */ diff --git a/icu4c/source/common/ucnv_set.cpp b/icu4c/source/common/ucnv_set.cpp index 926cee0de81..872d8bc0662 100644 --- a/icu4c/source/common/ucnv_set.cpp +++ b/icu4c/source/common/ucnv_set.cpp @@ -34,23 +34,23 @@ ucnv_getUnicodeSet(const UConverter *cnv, UConverterUnicodeSet whichSet, UErrorCode *pErrorCode) { /* argument checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } - if(cnv==NULL || setFillIn==NULL || whichSetsharedData->impl->getUnicodeSet==NULL) { + if(cnv->sharedData->impl->getUnicodeSet==nullptr) { *pErrorCode=U_UNSUPPORTED_ERROR; return; } { USetAdder sa={ - NULL, + nullptr, uset_add, uset_addRange, uset_addString, diff --git a/icu4c/source/common/ucnv_u16.cpp b/icu4c/source/common/ucnv_u16.cpp index bebdede4c44..6e0b95c4809 100644 --- a/icu4c/source/common/ucnv_u16.cpp +++ b/icu4c/source/common/ucnv_u16.cpp @@ -102,7 +102,7 @@ _UTF16BEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, target[3]=(uint8_t)trail; target+=4; targetCapacity-=4; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; *offsets++=-1; *offsets++=-1; @@ -123,7 +123,7 @@ _UTF16BEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, count>>=1; length-=count; - if(offsets==NULL) { + if(offsets==nullptr) { while(count>0) { c=*source++; if(U16_IS_SINGLE(c)) { @@ -310,7 +310,7 @@ _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, if(U16_IS_SINGLE(c)) { /* output the BMP code point */ *target++=c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; } --targetCapacity; @@ -332,7 +332,7 @@ _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, *target++=c; if(targetCapacity>=2) { *target++=trail; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; *offsets++=-1; } @@ -384,7 +384,7 @@ _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, length-=count; count>>=1; targetCapacity-=count; - if(offsets==NULL) { + if(offsets==nullptr) { do { c=((UChar)source[0]<<8)|source[1]; source+=2; @@ -452,7 +452,7 @@ _UTF16BEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, source+=2; length-=2; *target++=c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } cnv->UCharErrorBuffer[0]=trail; @@ -610,11 +610,11 @@ U_CDECL_END static const UConverterImpl _UTF16BEImpl={ UCNV_UTF16_BigEndian, - NULL, - NULL, + nullptr, + nullptr, _UTF16BEOpen, - NULL, + nullptr, _UTF16BEReset, _UTF16BEToUnicodeWithOffsets, @@ -623,14 +623,14 @@ static const UConverterImpl _UTF16BEImpl={ _UTF16BEFromUnicodeWithOffsets, _UTF16BEGetNextUChar, - NULL, + nullptr, _UTF16BEGetName, - NULL, - NULL, + nullptr, + nullptr, ucnv_getNonSurrogateUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _UTF16BEStaticData={ @@ -703,7 +703,7 @@ _UTF16LEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, target[3]=(uint8_t)(trail>>8); target+=4; targetCapacity-=4; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; *offsets++=-1; *offsets++=-1; @@ -724,7 +724,7 @@ _UTF16LEFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, count>>=1; length-=count; - if(offsets==NULL) { + if(offsets==nullptr) { while(count>0) { c=*source++; if(U16_IS_SINGLE(c)) { @@ -911,7 +911,7 @@ _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, if(U16_IS_SINGLE(c)) { /* output the BMP code point */ *target++=c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; } --targetCapacity; @@ -933,7 +933,7 @@ _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, *target++=c; if(targetCapacity>=2) { *target++=trail; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=-1; *offsets++=-1; } @@ -985,7 +985,7 @@ _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, length-=count; count>>=1; targetCapacity-=count; - if(offsets==NULL) { + if(offsets==nullptr) { do { c=((UChar)source[1]<<8)|source[0]; source+=2; @@ -1053,7 +1053,7 @@ _UTF16LEToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, source+=2; length-=2; *target++=c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } cnv->UCharErrorBuffer[0]=trail; @@ -1211,11 +1211,11 @@ U_CDECL_END static const UConverterImpl _UTF16LEImpl={ UCNV_UTF16_LittleEndian, - NULL, - NULL, + nullptr, + nullptr, _UTF16LEOpen, - NULL, + nullptr, _UTF16LEReset, _UTF16LEToUnicodeWithOffsets, @@ -1224,14 +1224,14 @@ static const UConverterImpl _UTF16LEImpl={ _UTF16LEFromUnicodeWithOffsets, _UTF16LEGetNextUChar, - NULL, + nullptr, _UTF16LEGetName, - NULL, - NULL, + nullptr, + nullptr, ucnv_getNonSurrogateUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; @@ -1447,7 +1447,7 @@ _UTF16ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, } /* add BOM size to offsets - see comment at offsetDelta declaration */ - if(offsets!=NULL && offsetDelta!=0) { + if(offsets!=nullptr && offsetDelta!=0) { int32_t *offsetsLimit=pArgs->offsets; while(offsetssource=source; - if(offsets==NULL) { + if(offsets==nullptr) { T_UConverter_toUnicode_UTF32_BE(pArgs, pErrorCode); } else { T_UConverter_toUnicode_UTF32_BE_OFFSET_LOGIC(pArgs, pErrorCode); @@ -1136,7 +1136,7 @@ _UTF32ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, case 9: /* call UTF-32LE */ pArgs->source=source; - if(offsets==NULL) { + if(offsets==nullptr) { T_UConverter_toUnicode_UTF32_LE(pArgs, pErrorCode); } else { T_UConverter_toUnicode_UTF32_LE_OFFSET_LOGIC(pArgs, pErrorCode); @@ -1149,7 +1149,7 @@ _UTF32ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, } /* add BOM size to offsets - see comment at offsetDelta declaration */ - if(offsets!=NULL && offsetDelta!=0) { + if(offsets!=nullptr && offsetDelta!=0) { int32_t *offsetsLimit=pArgs->offsets; while(offsets>2)); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; sourceIndex=nextSourceIndex-1; } @@ -386,7 +386,7 @@ unicodeMode: break; case 5: *target++=(UChar)((bits<<2)|(base64Value>>4)); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; sourceIndex=nextSourceIndex-1; } @@ -397,7 +397,7 @@ unicodeMode: break; case 7: *target++=(UChar)((bits<<6)|base64Value); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; sourceIndex=nextSourceIndex; } @@ -415,7 +415,7 @@ unicodeMode: if(base64Counter==-1) { /* +- i.e. a minus immediately following a plus */ *target++=PLUS; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex-1; } } else { @@ -511,7 +511,7 @@ directMode: if(c<=127 && encodeDirectly[c]) { /* encode directly */ *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex++; } } else if(c==PLUS) { @@ -519,14 +519,14 @@ directMode: *target++=PLUS; if(targetcharErrorBuffer[0]=MINUS; @@ -538,7 +538,7 @@ directMode: /* un-read this character and switch to Unicode Mode */ --source; *target++=PLUS; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } inDirectMode=false; @@ -567,7 +567,7 @@ unicodeMode: if(base64Counter!=0) { /* write remaining bits for the previous character */ *target++=toBase64[bits]; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex-1; } } @@ -575,7 +575,7 @@ unicodeMode: /* need to terminate with a minus */ if(target>10]; if(target>4)&0x3f]; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex++; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex++; } cnv->charErrorBuffer[0]=toBase64[(c>>4)&0x3f]; @@ -622,13 +622,13 @@ unicodeMode: *target++=toBase64[(c>>8)&0x3f]; if(target>2)&0x3f]; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex; *offsets++=sourceIndex++; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex++; } @@ -637,7 +637,7 @@ unicodeMode: *pErrorCode=U_BUFFER_OVERFLOW_ERROR; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex++; } cnv->charErrorBuffer[0]=toBase64[(c>>8)&0x3f]; @@ -654,13 +654,13 @@ unicodeMode: *target++=toBase64[(c>>6)&0x3f]; if(targetcharErrorBuffer[0]=toBase64[(c>>6)&0x3f]; @@ -699,7 +699,7 @@ unicodeMode: if (base64Counter!=0) { if(targetcharErrorBuffer[0]=MINUS; @@ -1237,7 +1237,7 @@ directMode: /* un-read this character and switch to Unicode Mode */ --source; *target++=AMPERSAND; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } inDirectMode=false; @@ -1266,14 +1266,14 @@ unicodeMode: if(base64Counter!=0) { /* write remaining bits for the previous character */ *target++=TO_BASE64_IMAP(bits); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex-1; } } /* need to terminate with a minus */ if(target>4)&0x3f); *target++=TO_BASE64_IMAP(b); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex++; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex++; } b=(uint8_t)((c>>4)&0x3f); @@ -1325,13 +1325,13 @@ unicodeMode: if(target>2)&0x3f); *target++=TO_BASE64_IMAP(b); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex; *offsets++=sourceIndex++; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex++; } @@ -1341,7 +1341,7 @@ unicodeMode: *pErrorCode=U_BUFFER_OVERFLOW_ERROR; } } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex++; } b=(uint8_t)((c>>8)&0x3f); @@ -1363,13 +1363,13 @@ unicodeMode: if(target>6)&0x3f); @@ -1411,7 +1411,7 @@ unicodeMode: if(base64Counter!=0) { if(targettargetLimit-target); - sourceIndex=nextSourceIndex; /* wrong if offsets==NULL but does not matter */ + sourceIndex=nextSourceIndex; /* wrong if offsets==nullptr but does not matter */ /* regular loop for all cases */ while(source0 && displayName==NULL)) { + if(cnv==nullptr || displayNameCapacity<0 || (displayNameCapacity>0 && displayName==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } /* open the resource bundle and get the display name string */ - rb=ures_open(NULL, displayLocale, pErrorCode); + rb=ures_open(nullptr, displayLocale, pErrorCode); if(U_FAILURE(*pErrorCode)) { return 0; } diff --git a/icu4c/source/common/ucnvhz.cpp b/icu4c/source/common/ucnvhz.cpp index e0d2f0775df..00f05c35220 100644 --- a/icu4c/source/common/ucnvhz.cpp +++ b/icu4c/source/common/ucnvhz.cpp @@ -42,7 +42,7 @@ while(len-->0){ \ if(targetIndex < targetLength){ \ args->target[targetIndex] = (unsigned char) *strToAppend; \ - if(args->offsets!=NULL){ \ + if(args->offsets!=nullptr){ \ *(offsets++) = sourceIndex-1; \ } \ targetIndex++; \ @@ -84,7 +84,7 @@ _HZOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){ cnv->mode=0; cnv->fromUChar32=0x0000; cnv->extraInfo = uprv_calloc(1, sizeof(UConverterDataHZ)); - if(cnv->extraInfo != NULL){ + if(cnv->extraInfo != nullptr){ ((UConverterDataHZ*)cnv->extraInfo)->gbConverter = gbConverter; } else { @@ -96,12 +96,12 @@ _HZOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){ static void U_CALLCONV _HZClose(UConverter *cnv){ - if(cnv->extraInfo != NULL) { + if(cnv->extraInfo != nullptr) { ucnv_close (((UConverterDataHZ *) (cnv->extraInfo))->gbConverter); if(!cnv->isExtraLocal) { uprv_free(cnv->extraInfo); } - cnv->extraInfo = NULL; + cnv->extraInfo = nullptr; } } @@ -110,7 +110,7 @@ _HZReset(UConverter *cnv, UConverterResetChoice choice){ if(choice<=UCNV_RESET_TO_UNICODE) { cnv->toUnicodeStatus = 0; cnv->mode=0; - if(cnv->extraInfo != NULL){ + if(cnv->extraInfo != nullptr){ ((UConverterDataHZ*)cnv->extraInfo)->isStateDBCS = false; ((UConverterDataHZ*)cnv->extraInfo)->isEmptySegment = false; } @@ -118,7 +118,7 @@ _HZReset(UConverter *cnv, UConverterResetChoice choice){ if(choice!=UCNV_RESET_TO_UNICODE) { cnv->fromUnicodeStatus= 0; cnv->fromUChar32=0x0000; - if(cnv->extraInfo != NULL){ + if(cnv->extraInfo != nullptr){ ((UConverterDataHZ*)cnv->extraInfo)->isEscapeAppended = false; ((UConverterDataHZ*)cnv->extraInfo)->targetIndex = 0; ((UConverterDataHZ*)cnv->extraInfo)->sourceIndex = 0; @@ -166,7 +166,7 @@ UConverter_toUnicode_HZ_OFFSETS_LOGIC(UConverterToUnicodeArgs *args, tempBuf[1]=0; /* Calling code already handles this situation. */ - /*if ((args->converter == NULL) || (args->targetLimit < args->target) || (mySourceLimit < args->source)){ + /*if ((args->converter == nullptr) || (args->targetLimit < args->target) || (mySourceLimit < args->source)){ *err = U_ILLEGAL_ARGUMENT_ERROR; return; }*/ @@ -348,10 +348,10 @@ UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args, UBool isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS; UBool oldIsTargetUCharDBCS; int len =0; - const char* escSeq=NULL; + const char* escSeq=nullptr; /* Calling code already handles this situation. */ - /*if ((args->converter == NULL) || (args->targetLimit < myTarget) || (args->sourceLimit < args->source)){ + /*if ((args->converter == nullptr) || (args->targetLimit < myTarget) || (args->sourceLimit < args->source)){ *err = U_ILLEGAL_ARGUMENT_ERROR; return; }*/ @@ -579,8 +579,8 @@ static const UConverterImpl _HZImpl={ UCNV_HZ, - NULL, - NULL, + nullptr, + nullptr, _HZOpen, _HZClose, @@ -590,15 +590,15 @@ static const UConverterImpl _HZImpl={ UConverter_toUnicode_HZ_OFFSETS_LOGIC, UConverter_fromUnicode_HZ_OFFSETS_LOGIC, UConverter_fromUnicode_HZ_OFFSETS_LOGIC, - NULL, + nullptr, - NULL, - NULL, + nullptr, + nullptr, _HZ_WriteSub, _HZ_SafeClone, _HZ_GetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _HZStaticData={ diff --git a/icu4c/source/common/ucnvisci.cpp b/icu4c/source/common/ucnvisci.cpp index 839f7ff9c62..80b09923d6f 100644 --- a/icu4c/source/common/ucnvisci.cpp +++ b/icu4c/source/common/ucnvisci.cpp @@ -195,7 +195,7 @@ _ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode) { cnv->extraInfo = uprv_malloc(sizeof(UConverterDataISCII)); - if (cnv->extraInfo != NULL) { + if (cnv->extraInfo != nullptr) { int32_t len=0; UConverterDataISCII *converterData= (UConverterDataISCII *) cnv->extraInfo; @@ -223,7 +223,7 @@ _ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode) { converterData->prevToUnicodeStatus = 0x0000; } else { uprv_free(cnv->extraInfo); - cnv->extraInfo = NULL; + cnv->extraInfo = nullptr; *errorCode = U_ILLEGAL_ARGUMENT_ERROR; } @@ -234,11 +234,11 @@ _ISCIIOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode) { static void U_CALLCONV _ISCIIClose(UConverter *cnv) { - if (cnv->extraInfo!=NULL) { + if (cnv->extraInfo!=nullptr) { if (!cnv->isExtraLocal) { uprv_free(cnv->extraInfo); } - cnv->extraInfo=NULL; + cnv->extraInfo=nullptr; } } @@ -248,7 +248,7 @@ _ISCIIgetName(const UConverter* cnv) { UConverterDataISCII* myData= (UConverterDataISCII*)cnv->extraInfo; return myData->name; } - return NULL; + return nullptr; } static void U_CALLCONV @@ -908,7 +908,7 @@ UConverter_fromUnicode_ISCII_OFFSETS_LOGIC( uint16_t range = 0; UBool deltaChanged = false; - if ((args->converter == NULL) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)) { + if ((args->converter == nullptr) || (args->targetLimit < args->target) || (args->sourceLimit < args->source)) { *err = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1185,14 +1185,14 @@ UConverter_toUnicode_ISCII_OFFSETS_LOGIC(UConverterToUnicodeArgs *args, UErrorCo uint32_t targetUniChar = 0x0000; uint8_t sourceChar = 0x0000; UConverterDataISCII* data; - UChar32* toUnicodeStatus=NULL; + UChar32* toUnicodeStatus=nullptr; UChar32 tempTargetUniChar = 0x0000; - UChar* contextCharToUnicode= NULL; + UChar* contextCharToUnicode= nullptr; UBool found; int i; int offset = 0; - if ((args->converter == NULL) || (target < args->target) || (source < args->source)) { + if ((args->converter == nullptr) || (target < args->target) || (source < args->source)) { *err = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1589,8 +1589,8 @@ static const UConverterImpl _ISCIIImpl={ UCNV_ISCII, - NULL, - NULL, + nullptr, + nullptr, _ISCIIOpen, _ISCIIClose, @@ -1600,15 +1600,15 @@ static const UConverterImpl _ISCIIImpl={ UConverter_toUnicode_ISCII_OFFSETS_LOGIC, UConverter_fromUnicode_ISCII_OFFSETS_LOGIC, UConverter_fromUnicode_ISCII_OFFSETS_LOGIC, - NULL, + nullptr, - NULL, + nullptr, _ISCIIgetName, - NULL, + nullptr, _ISCII_SafeClone, _ISCIIGetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _ISCIIStaticData={ diff --git a/icu4c/source/common/ucnvlat1.cpp b/icu4c/source/common/ucnvlat1.cpp index 05aad6a0e03..3e4c38c627f 100644 --- a/icu4c/source/common/ucnvlat1.cpp +++ b/icu4c/source/common/ucnvlat1.cpp @@ -82,7 +82,7 @@ _Latin1ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, source+=8; } while(--count>0); - if(offsets!=NULL) { + if(offsets!=nullptr) { do { offsets[0]=sourceIndex++; offsets[1]=sourceIndex++; @@ -108,7 +108,7 @@ _Latin1ToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, pArgs->target=target; /* set offsets */ - if(offsets!=NULL) { + if(offsets!=nullptr) { while(length>0) { *offsets++=sourceIndex++; --length; @@ -233,7 +233,7 @@ _Latin1FromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, count=loops-count; targetCapacity-=16*count; - if(offsets!=NULL) { + if(offsets!=nullptr) { oldTarget+=16*count; while(count>0) { *offsets++=sourceIndex++; @@ -300,7 +300,7 @@ getTrail: noMoreInput: /* set offsets since the start */ - if(offsets!=NULL) { + if(offsets!=nullptr) { size_t count=target-oldTarget; while(count>0) { *offsets++=sourceIndex++; @@ -438,12 +438,12 @@ U_CDECL_END static const UConverterImpl _Latin1Impl={ UCNV_LATIN_1, - NULL, - NULL, + nullptr, + nullptr, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, _Latin1ToUnicodeWithOffsets, _Latin1ToUnicodeWithOffsets, @@ -451,13 +451,13 @@ static const UConverterImpl _Latin1Impl={ _Latin1FromUnicodeWithOffsets, _Latin1GetNextUChar, - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, _Latin1GetUnicodeSet, - NULL, + nullptr, ucnv_Latin1FromUTF8 }; @@ -536,7 +536,7 @@ _ASCIIToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, count=loops-count; targetCapacity-=count*8; - if(offsets!=NULL) { + if(offsets!=nullptr) { oldTarget+=count*8; while(count>0) { offsets[0]=sourceIndex++; @@ -572,7 +572,7 @@ _ASCIIToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, } /* set offsets since the start */ - if(offsets!=NULL) { + if(offsets!=nullptr) { size_t count=target-oldTarget; while(count>0) { *offsets++=sourceIndex++; @@ -717,12 +717,12 @@ U_CDECL_END static const UConverterImpl _ASCIIImpl={ UCNV_US_ASCII, - NULL, - NULL, + nullptr, + nullptr, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, _ASCIIToUnicodeWithOffsets, _ASCIIToUnicodeWithOffsets, @@ -730,13 +730,13 @@ static const UConverterImpl _ASCIIImpl={ _Latin1FromUnicodeWithOffsets, _ASCIIGetNextUChar, - NULL, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, + nullptr, _ASCIIGetUnicodeSet, - NULL, + nullptr, ucnv_ASCIIFromUTF8 }; diff --git a/icu4c/source/common/ucnvmbcs.cpp b/icu4c/source/common/ucnvmbcs.cpp index 0e753c8ffbf..69b3d05eb09 100644 --- a/icu4c/source/common/ucnvmbcs.cpp +++ b/icu4c/source/common/ucnvmbcs.cpp @@ -438,8 +438,8 @@ static const UConverterImpl _SBCSUTF8Impl={ ucnv_MBCSUnload, ucnv_MBCSOpen, - NULL, - NULL, + nullptr, + nullptr, ucnv_MBCSToUnicodeWithOffsets, ucnv_MBCSToUnicodeWithOffsets, @@ -450,10 +450,10 @@ static const UConverterImpl _SBCSUTF8Impl={ ucnv_MBCSGetStarters, ucnv_MBCSGetName, ucnv_MBCSWriteSub, - NULL, + nullptr, ucnv_MBCSGetUnicodeSet, - NULL, + nullptr, ucnv_SBCSFromUTF8 }; @@ -464,8 +464,8 @@ static const UConverterImpl _DBCSUTF8Impl={ ucnv_MBCSUnload, ucnv_MBCSOpen, - NULL, - NULL, + nullptr, + nullptr, ucnv_MBCSToUnicodeWithOffsets, ucnv_MBCSToUnicodeWithOffsets, @@ -476,10 +476,10 @@ static const UConverterImpl _DBCSUTF8Impl={ ucnv_MBCSGetStarters, ucnv_MBCSGetName, ucnv_MBCSWriteSub, - NULL, + nullptr, ucnv_MBCSGetUnicodeSet, - NULL, + nullptr, ucnv_DBCSFromUTF8 }; @@ -490,8 +490,8 @@ static const UConverterImpl _MBCSImpl={ ucnv_MBCSUnload, ucnv_MBCSOpen, - NULL, - NULL, + nullptr, + nullptr, ucnv_MBCSToUnicodeWithOffsets, ucnv_MBCSToUnicodeWithOffsets, @@ -502,10 +502,10 @@ static const UConverterImpl _MBCSImpl={ ucnv_MBCSGetStarters, ucnv_MBCSGetName, ucnv_MBCSWriteSub, - NULL, + nullptr, ucnv_MBCSGetUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; /* Static data is in tools/makeconv/ucnvstat.c for data-based @@ -514,7 +514,7 @@ static const UConverterImpl _MBCSImpl={ const UConverterSharedData _MBCSData={ sizeof(UConverterSharedData), 1, - NULL, NULL, false, true, &_MBCSImpl, + nullptr, nullptr, false, true, &_MBCSImpl, 0, UCNV_MBCS_TABLE_INITIALIZER }; @@ -1113,7 +1113,7 @@ _extFromU(UConverter *cnv, const UConverterSharedData *sharedData, cnv->useSubChar1=false; - if( (cx=sharedData->mbcs.extIndexes)!=NULL && + if( (cx=sharedData->mbcs.extIndexes)!=nullptr && ucnv_extInitialMatchFromU( cnv, cx, cp, source, sourceLimit, @@ -1178,7 +1178,7 @@ _extToU(UConverter *cnv, const UConverterSharedData *sharedData, UErrorCode *pErrorCode) { const int32_t *cx; - if( (cx=sharedData->mbcs.extIndexes)!=NULL && + if( (cx=sharedData->mbcs.extIndexes)!=nullptr && ucnv_extInitialMatchToU( cnv, cx, length, (const char **)source, (const char *)sourceLimit, @@ -1349,7 +1349,7 @@ _EBCDICSwapLFNL(UConverterSharedData *sharedData, UErrorCode *pErrorCode) { sizeofFromUBytes+ UCNV_MAX_CONVERTER_NAME_LENGTH+20; p=(uint8_t *)uprv_malloc(size); - if(p==NULL) { + if(p==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return false; } @@ -1383,18 +1383,18 @@ _EBCDICSwapLFNL(UConverterSharedData *sharedData, UErrorCode *pErrorCode) { uprv_strcat(name, UCNV_SWAP_LFNL_OPTION_STRING); /* set the pointers */ - icu::umtx_lock(NULL); - if(mbcsTable->swapLFNLStateTable==NULL) { + icu::umtx_lock(nullptr); + if(mbcsTable->swapLFNLStateTable==nullptr) { mbcsTable->swapLFNLStateTable=newStateTable; mbcsTable->swapLFNLFromUnicodeBytes=(uint8_t *)newResults; mbcsTable->swapLFNLName=name; - newStateTable=NULL; + newStateTable=nullptr; } - icu::umtx_unlock(NULL); + icu::umtx_unlock(nullptr); /* release the allocated memory if another thread beat us to it */ - if(newStateTable!=NULL) { + if(newStateTable!=nullptr) { uprv_free(newStateTable); } return true; @@ -1489,7 +1489,7 @@ reconstituteData(UConverterMBCSTable *mbcsTable, uint32_t *stage2; uint32_t dataLength=stage1Length*2+fullStage2Length*4+mbcsTable->fromUBytesLength; mbcsTable->reconstitutedData=(uint8_t *)uprv_malloc(dataLength); - if(mbcsTable->reconstitutedData==NULL) { + if(mbcsTable->reconstitutedData==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -1593,7 +1593,7 @@ ucnv_MBCSLoad(UConverterSharedData *sharedData, const char *baseName; /* extension-only file, load the base table and set values appropriately */ - if((extIndexes=mbcsTable->extIndexes)==NULL) { + if((extIndexes=mbcsTable->extIndexes)==nullptr) { /* extension-only file without extension */ *pErrorCode=U_INVALID_TABLE_FORMAT; return; @@ -1626,7 +1626,7 @@ ucnv_MBCSLoad(UConverterSharedData *sharedData, return; } if( baseSharedData->staticData->conversionType!=UCNV_MBCS || - baseSharedData->mbcs.baseSharedData!=NULL + baseSharedData->mbcs.baseSharedData!=nullptr ) { ucnv_unload(baseSharedData); *pErrorCode=U_INVALID_TABLE_FORMAT; @@ -1657,15 +1657,15 @@ ucnv_MBCSLoad(UConverterSharedData *sharedData, * It is easier to just create the data for the extension converter * separately when it is requested. */ - mbcsTable->swapLFNLStateTable=NULL; - mbcsTable->swapLFNLFromUnicodeBytes=NULL; - mbcsTable->swapLFNLName=NULL; + mbcsTable->swapLFNLStateTable=nullptr; + mbcsTable->swapLFNLFromUnicodeBytes=nullptr; + mbcsTable->swapLFNLName=nullptr; /* * The reconstitutedData must be deleted only when the base converter * is unloaded. */ - mbcsTable->reconstitutedData=NULL; + mbcsTable->reconstitutedData=nullptr; /* * Set a special, runtime-only outputType if the extension converter @@ -1703,7 +1703,7 @@ ucnv_MBCSLoad(UConverterSharedData *sharedData, /* allocate a new state table and copy the base state table contents */ count=mbcsTable->countStates; newStateTable=(int32_t (*)[256])uprv_malloc((count+1)*1024); - if(newStateTable==NULL) { + if(newStateTable==nullptr) { ucnv_unload(baseSharedData); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return; @@ -1880,16 +1880,16 @@ static void U_CALLCONV ucnv_MBCSUnload(UConverterSharedData *sharedData) { UConverterMBCSTable *mbcsTable=&sharedData->mbcs; - if(mbcsTable->swapLFNLStateTable!=NULL) { + if(mbcsTable->swapLFNLStateTable!=nullptr) { uprv_free(mbcsTable->swapLFNLStateTable); } if(mbcsTable->stateTableOwned) { uprv_free((void *)mbcsTable->stateTable); } - if(mbcsTable->baseSharedData!=NULL) { + if(mbcsTable->baseSharedData!=nullptr) { ucnv_unload(mbcsTable->baseSharedData); } - if(mbcsTable->reconstitutedData!=NULL) { + if(mbcsTable->reconstitutedData!=nullptr) { uprv_free(mbcsTable->reconstitutedData); } } @@ -1919,9 +1919,9 @@ ucnv_MBCSOpen(UConverter *cnv, /* do this because double-checked locking is broken */ UBool isCached; - icu::umtx_lock(NULL); - isCached=mbcsTable->swapLFNLStateTable!=NULL; - icu::umtx_unlock(NULL); + icu::umtx_lock(nullptr); + isCached=mbcsTable->swapLFNLStateTable!=nullptr; + icu::umtx_unlock(nullptr); if(!isCached) { if(!_EBCDICSwapLFNL(cnv->sharedData, pErrorCode)) { @@ -1935,18 +1935,18 @@ ucnv_MBCSOpen(UConverter *cnv, } } - if(uprv_strstr(pArgs->name, "18030")!=NULL) { - if(uprv_strstr(pArgs->name, "gb18030")!=NULL || uprv_strstr(pArgs->name, "GB18030")!=NULL) { + if(uprv_strstr(pArgs->name, "18030")!=nullptr) { + if(uprv_strstr(pArgs->name, "gb18030")!=nullptr || uprv_strstr(pArgs->name, "GB18030")!=nullptr) { /* set a flag for GB 18030 mode, which changes the callback behavior */ cnv->options|=_MBCS_OPTION_GB18030; } - } else if((uprv_strstr(pArgs->name, "KEIS")!=NULL) || (uprv_strstr(pArgs->name, "keis")!=NULL)) { + } else if((uprv_strstr(pArgs->name, "KEIS")!=nullptr) || (uprv_strstr(pArgs->name, "keis")!=nullptr)) { /* set a flag for KEIS converter, which changes the SI/SO character sequence */ cnv->options|=_MBCS_OPTION_KEIS; - } else if((uprv_strstr(pArgs->name, "JEF")!=NULL) || (uprv_strstr(pArgs->name, "jef")!=NULL)) { + } else if((uprv_strstr(pArgs->name, "JEF")!=nullptr) || (uprv_strstr(pArgs->name, "jef")!=nullptr)) { /* set a flag for JEF converter, which changes the SI/SO character sequence */ cnv->options|=_MBCS_OPTION_JEF; - } else if((uprv_strstr(pArgs->name, "JIPS")!=NULL) || (uprv_strstr(pArgs->name, "jips")!=NULL)) { + } else if((uprv_strstr(pArgs->name, "JIPS")!=nullptr) || (uprv_strstr(pArgs->name, "jips")!=nullptr)) { /* set a flag for JIPS converter, which changes the SI/SO character sequence */ cnv->options|=_MBCS_OPTION_JIPS; } @@ -1957,7 +1957,7 @@ ucnv_MBCSOpen(UConverter *cnv, } extIndexes=mbcsTable->extIndexes; - if(extIndexes!=NULL) { + if(extIndexes!=nullptr) { maxBytesPerUChar=(int8_t)UCNV_GET_MAX_BYTES_PER_UCHAR(extIndexes); if(outputType==MBCS_OUTPUT_2_SISO) { ++maxBytesPerUChar; /* SO + multiple DBCS */ @@ -1989,7 +1989,7 @@ U_CDECL_BEGIN static const char* U_CALLCONV ucnv_MBCSGetName(const UConverter *cnv) { - if((cnv->options&UCNV_OPTION_SWAP_LFNL)!=0 && cnv->sharedData->mbcs.swapLFNLName!=NULL) { + if((cnv->options&UCNV_OPTION_SWAP_LFNL)!=0 && cnv->sharedData->mbcs.swapLFNLName!=nullptr) { return cnv->sharedData->mbcs.swapLFNLName; } else { return cnv->sharedData->staticData->name; @@ -2086,7 +2086,7 @@ ucnv_MBCSSingleToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, if(MBCS_ENTRY_FINAL_IS_VALID_DIRECT_16(entry)) { /* output BMP code point */ *target++=(UChar)MBCS_ENTRY_FINAL_VALUE_16(entry); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } @@ -2106,13 +2106,13 @@ ucnv_MBCSSingleToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, entry=MBCS_ENTRY_FINAL_VALUE(entry); /* output surrogate pair */ *target++=(UChar)(0xd800|(UChar)(entry>>10)); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } c=(UChar)(0xdc00|(UChar)(entry&0x3ff)); if(target0) { *offsets++=sourceIndex++; @@ -2338,7 +2338,7 @@ unrolled: } /* set offsets since the start or the last extension */ - if(offsets!=NULL) { + if(offsets!=nullptr) { int32_t count=(int32_t)(source-lastSource); /* predecrement: do not set the offset for the callback-causing character */ @@ -2388,7 +2388,7 @@ unrolled: } /* set offsets since the start or the last callback */ - if(offsets!=NULL) { + if(offsets!=nullptr) { size_t count=source-lastSource; while(count>0) { *offsets++=sourceIndex++; @@ -2558,7 +2558,7 @@ ucnv_MBCSToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, if(byteIndex==0) { /* optimized loop for 1/2-byte input and BMP output */ - if(offsets==NULL) { + if(offsets==nullptr) { do { entry=stateTable[state][*source]; if(MBCS_ENTRY_IS_TRANSITION(entry)) { @@ -2593,7 +2593,7 @@ ucnv_MBCSToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, } } } while(sourcesharedData->mbcs, offset))!=0xfffe) { /* output fallback BMP code point */ *target++=(UChar)entry; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } byteIndex=0; @@ -2702,7 +2702,7 @@ ucnv_MBCSToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, } else if(action==MBCS_STATE_VALID_DIRECT_16) { /* output BMP code point */ *target++=(UChar)MBCS_ENTRY_FINAL_VALUE_16(entry); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } byteIndex=0; @@ -2712,20 +2712,20 @@ ucnv_MBCSToUnicodeWithOffsets(UConverterToUnicodeArgs *pArgs, if(c<0xd800) { /* output BMP code point below 0xd800 */ *target++=c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } byteIndex=0; } else if(UCNV_TO_U_USE_FALLBACK(cnv) ? c<=0xdfff : c<=0xdbff) { /* output roundtrip or fallback surrogate pair */ *target++=(UChar)(c&0xdbff); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } byteIndex=0; if(target>10)); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } byteIndex=0; c=(UChar)(0xdc00|(UChar)(entry&0x3ff)); if(targetmbcs.extIndexes; - if(cx!=NULL) { + if(cx!=nullptr) { return ucnv_extSimpleMatchToU(cx, source, length, useFallback); } } @@ -3475,7 +3475,7 @@ ucnv_MBCSDoubleFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, ++nextSourceIndex; if(c<=0x7f && IS_ASCII_ROUNDTRIP(c, asciiRoundtrips)) { *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; sourceIndex=nextSourceIndex; } @@ -3585,7 +3585,7 @@ unassigned: if(value<=0xff) { /* this is easy because we know that there is enough space */ *target++=(uint8_t)value; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } --targetCapacity; @@ -3593,13 +3593,13 @@ unassigned: *target++=(uint8_t)(value>>8); if(2<=targetCapacity) { *target++=(uint8_t)value; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex; } targetCapacity-=2; } else { - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } cnv->charErrorBuffer[0]=(char)value; @@ -3750,7 +3750,7 @@ getTrail: /* length==1 */ /* this is easy because we know that there is enough space */ *target++=(uint8_t)value; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } --targetCapacity; @@ -3908,7 +3908,7 @@ unrolled: count=loops-count; targetCapacity-=4*count; - if(offsets!=NULL) { + if(offsets!=nullptr) { lastSource+=4*count; while(count>0) { *offsets++=sourceIndex++; @@ -3992,7 +3992,7 @@ getTrail: length=U16_LENGTH(c); /* set offsets since the start or the last extension */ - if(offsets!=NULL) { + if(offsets!=nullptr) { int32_t count=(int32_t)(source-lastSource); /* do not set the offset for this character */ @@ -4042,7 +4042,7 @@ getTrail: } /* set offsets since the start or the last callback */ - if(offsets!=NULL) { + if(offsets!=nullptr) { size_t count=source-lastSource; if (count > 0 && *pErrorCode == U_TRUNCATED_CHAR_FOUND) { /* @@ -4135,7 +4135,7 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, if(cnv->sharedData->mbcs.utf8Friendly) { mbcsIndex=cnv->sharedData->mbcs.mbcsIndex; } else { - mbcsIndex=NULL; + mbcsIndex=nullptr; } if((cnv->options&UCNV_OPTION_SWAP_LFNL)!=0) { bytes=cnv->sharedData->mbcs.swapLFNLFromUnicodeBytes; @@ -4204,7 +4204,7 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, ++nextSourceIndex; if(c<=0x7f && IS_ASCII_ROUNDTRIP(c, asciiRoundtrips)) { *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; prevSourceIndex=sourceIndex; sourceIndex=nextSourceIndex; @@ -4218,7 +4218,7 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs, * to avoid dealing with surrogates. * MBCS_FAST_MAX must be >=0xd7ff. */ - if(c<=0xd7ff && mbcsIndex!=NULL) { + if(c<=0xd7ff && mbcsIndex!=nullptr) { value=mbcsIndex[c>>6]; /* get the bytes and the length for the output (copied from below and adapted for utf8Friendly data) */ @@ -4628,7 +4628,7 @@ unassigned: targetCapacity=(int32_t)(pArgs->targetLimit-(char *)target); /* normal end of conversion: prepare for a new character */ - if(offsets!=NULL) { + if(offsets!=nullptr) { prevSourceIndex=sourceIndex; sourceIndex=nextSourceIndex; } @@ -4640,7 +4640,7 @@ unassigned: /* write the output character bytes from value and length */ /* from the first if in the loop we know that targetCapacity>0 */ if(length<=targetCapacity) { - if(offsets==NULL) { + if(offsets==nullptr) { switch(length) { /* each branch falls through to the next one */ case 4: @@ -4719,19 +4719,19 @@ unassigned: /* each branch falls through to the next one */ case 3: *target++=(uint8_t)(value>>16); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; case 2: *target++=(uint8_t)(value>>8); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; case 1: *target++=(uint8_t)value; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; @@ -4749,7 +4749,7 @@ unassigned: /* normal end of conversion: prepare for a new character */ c=0; - if(offsets!=NULL) { + if(offsets!=nullptr) { prevSourceIndex=sourceIndex; sourceIndex=nextSourceIndex; } @@ -4787,7 +4787,7 @@ unassigned: *target++=(uint8_t)siBytes[1]; } } - if(offsets!=NULL) { + if(offsets!=nullptr) { /* set the last source character's index (sourceIndex points at sourceLimit now) */ *offsets++=prevSourceIndex; } @@ -4961,7 +4961,7 @@ ucnv_MBCSFromUChar32(UConverterSharedData *sharedData, } cx=sharedData->mbcs.extIndexes; - if(cx!=NULL) { + if(cx!=nullptr) { length=ucnv_extSimpleMatchFromU(cx, c, pValue, useFallback); return length>=0 ? length : -length; /* return abs(length); */ } @@ -5262,7 +5262,7 @@ moreBytes: c=_extFromU(cnv, cnv->sharedData, c, &noSource, noSource, &target, target+targetCapacity, - NULL, -1, + nullptr, -1, pFromUArgs->flush, pErrorCode); @@ -5565,7 +5565,7 @@ unassigned: c=_extFromU(cnv, cnv->sharedData, c, &noSource, noSource, &target, target+targetCapacity, - NULL, -1, + nullptr, -1, pFromUArgs->flush, pErrorCode); @@ -5658,7 +5658,7 @@ ucnv_MBCSWriteSub(UConverterFromUnicodeArgs *pArgs, /* first, select between subChar and subChar1 */ if( cnv->subChar1!=0 && - (cnv->sharedData->mbcs.extIndexes!=NULL ? + (cnv->sharedData->mbcs.extIndexes!=nullptr ? cnv->useSubChar1 : (cnv->invalidUCharBuffer[0]<=0xff)) ) { diff --git a/icu4c/source/common/ucnvscsu.cpp b/icu4c/source/common/ucnvscsu.cpp index 86e850a998a..7faccd35baa 100644 --- a/icu4c/source/common/ucnvscsu.cpp +++ b/icu4c/source/common/ucnvscsu.cpp @@ -200,8 +200,8 @@ _SCSUOpen(UConverter *cnv, return; } cnv->extraInfo=uprv_malloc(sizeof(SCSUData)); - if(cnv->extraInfo!=NULL) { - if(locale!=NULL && locale[0]=='j' && locale[1]=='a' && (locale[2]==0 || locale[2]=='_')) { + if(cnv->extraInfo!=nullptr) { + if(locale!=nullptr && locale[0]=='j' && locale[1]=='a' && (locale[2]==0 || locale[2]=='_')) { ((SCSUData *)cnv->extraInfo)->locale=l_ja; } else { ((SCSUData *)cnv->extraInfo)->locale=lGeneric; @@ -218,11 +218,11 @@ _SCSUOpen(UConverter *cnv, static void U_CALLCONV _SCSUClose(UConverter *cnv) { - if(cnv->extraInfo!=NULL) { + if(cnv->extraInfo!=nullptr) { if(!cnv->isExtraLocal) { uprv_free(cnv->extraInfo); } - cnv->extraInfo=NULL; + cnv->extraInfo=nullptr; } } @@ -295,7 +295,7 @@ fastSingle: if(b<=0x7f) { /* write US-ASCII graphic character or DEL */ *target++=(UChar)b; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } } else { @@ -303,7 +303,7 @@ fastSingle: uint32_t c=scsu->toUDynamicOffsets[dynamicWindow]+(b&0x7f); if(c<=0xffff) { *target++=(UChar)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } } else { @@ -311,13 +311,13 @@ fastSingle: *target++=(UChar)(0xd7c0+(c>>10)); if(targetUCharErrorBuffer[0]=(UChar)(0xdc00|(c&0x3ff)); @@ -348,7 +348,7 @@ singleByteMode: if((1UL<toUDynamicOffsets[quoteWindow]+(b&0x7f); if(c<=0xffff) { *target++=(UChar)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } } else { @@ -419,13 +419,13 @@ singleByteMode: *target++=(UChar)(0xd7c0+(c>>10)); if(targetUCharErrorBuffer[0]=(UChar)(0xdc00|(c&0x3ff)); @@ -479,7 +479,7 @@ singleByteMode: fastUnicode: while(source+1(Urs-UC0)) { *target++=(UChar)((b<<8)|source[1]); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } sourceIndex=nextSourceIndex; @@ -543,7 +543,7 @@ fastUnicode: break; case quotePairTwo: *target++=(UChar)((byteOne<<8)|b); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } sourceIndex=nextSourceIndex; @@ -1076,7 +1076,7 @@ loop: if((c-0x20)<=0x5f) { /* pass US-ASCII graphic character through */ *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } --targetCapacity; @@ -1084,7 +1084,7 @@ loop: if((1UL<=2) { *target++=(uint8_t)(c>>8); *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; *offsets++=sourceIndex; } @@ -1392,7 +1392,7 @@ outputBytes: /* write the output character bytes from c and length [code copied from ucnvmbcs.c] */ /* from the first if in the loop we know that targetCapacity>0 */ if(length<=targetCapacity) { - if(offsets==NULL) { + if(offsets==nullptr) { switch(length) { /* each branch falls through to the next one */ case 4: @@ -1480,19 +1480,19 @@ outputBytes: /* each branch falls through to the next one */ case 3: *target++=(uint8_t)(c>>16); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; case 2: *target++=(uint8_t)(c>>8); - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; case 1: *target++=(uint8_t)c; - if(offsets!=NULL) { + if(offsets!=nullptr) { *offsets++=sourceIndex; } U_FALLTHROUGH; @@ -2000,8 +2000,8 @@ U_CDECL_END static const UConverterImpl _SCSUImpl={ UCNV_SCSU, - NULL, - NULL, + nullptr, + nullptr, _SCSUOpen, _SCSUClose, @@ -2011,15 +2011,15 @@ static const UConverterImpl _SCSUImpl={ _SCSUToUnicodeWithOffsets, _SCSUFromUnicode, _SCSUFromUnicodeWithOffsets, - NULL, + nullptr, - NULL, + nullptr, _SCSUGetName, - NULL, + nullptr, _SCSUSafeClone, ucnv_getCompleteUnicodeSet, - NULL, - NULL + nullptr, + nullptr }; static const UConverterStaticData _SCSUStaticData={ diff --git a/icu4c/source/common/ucnvsel.cpp b/icu4c/source/common/ucnvsel.cpp index 15ee596a23c..63b7a7cc60d 100644 --- a/icu4c/source/common/ucnvsel.cpp +++ b/icu4c/source/common/ucnvsel.cpp @@ -104,7 +104,7 @@ static void generateSelectorData(UConverterSelector* result, UChar32 start_char; UChar32 end_char; UErrorCode smallStatus = U_ZERO_ERROR; - uset_getItem(unicode_point_set, j, &start_char, &end_char, NULL, 0, + uset_getItem(unicode_point_set, j, &start_char, &end_char, nullptr, 0, &smallStatus); if (U_FAILURE(smallStatus)) { // this will be reached for the converters that fill the set with @@ -128,7 +128,7 @@ static void generateSelectorData(UConverterSelector* result, UChar32 start_char; UChar32 end_char; - uset_getItem(excludedCodePoints, j, &start_char, &end_char, NULL, 0, + uset_getItem(excludedCodePoints, j, &start_char, &end_char, nullptr, 0, status); for (int32_t col = 0; col < columns; col++) { upvec_setValue(upvec, start_char, end_char, col, static_cast(~0), static_cast(~0), @@ -140,25 +140,25 @@ static void generateSelectorData(UConverterSelector* result, // alright. Now, let's put things in the same exact form you'd get when you // unserialize things. result->trie = upvec_compactToUTrie2WithRowIndexes(upvec, status); - result->pv = upvec_cloneArray(upvec, &result->pvCount, NULL, status); + result->pv = upvec_cloneArray(upvec, &result->pvCount, nullptr, status); result->pvCount *= columns; // number of uint32_t = rows * columns result->ownPv = true; } /* open a selector. If converterListSize is 0, build for all converters. - If excludedCodePoints is NULL, don't exclude any codepoints */ + If excludedCodePoints is nullptr, don't exclude any codepoints */ U_CAPI UConverterSelector* U_EXPORT2 ucnvsel_open(const char* const* converterList, int32_t converterListSize, const USet* excludedCodePoints, const UConverterUnicodeSet whichSet, UErrorCode* status) { // check if already failed if (U_FAILURE(*status)) { - return NULL; + return nullptr; } // ensure args make sense! - if (converterListSize < 0 || (converterList == NULL && converterListSize != 0)) { + if (converterListSize < 0 || (converterList == nullptr && converterListSize != 0)) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } // allocate a new converter @@ -166,28 +166,28 @@ ucnvsel_open(const char* const* converterList, int32_t converterListSize, (UConverterSelector*)uprv_malloc(sizeof(UConverterSelector))); if (newSelector.isNull()) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(newSelector.getAlias(), 0, sizeof(UConverterSelector)); if (converterListSize == 0) { - converterList = NULL; + converterList = nullptr; converterListSize = ucnv_countAvailable(); } newSelector->encodings = (char**)uprv_malloc(converterListSize * sizeof(char*)); if (!newSelector->encodings) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - newSelector->encodings[0] = NULL; // now we can call ucnvsel_close() + newSelector->encodings[0] = nullptr; // now we can call ucnvsel_close() // make a backup copy of the list of converters int32_t totalSize = 0; int32_t i; for (i = 0; i < converterListSize; i++) { totalSize += - (int32_t)uprv_strlen(converterList != NULL ? converterList[i] : ucnv_getAvailableName(i)) + 1; + (int32_t)uprv_strlen(converterList != nullptr ? converterList[i] : ucnv_getAvailableName(i)) + 1; } // 4-align the totalSize to 4-align the size of the serialized form int32_t encodingStrPadding = totalSize & 3; @@ -198,13 +198,13 @@ ucnvsel_open(const char* const* converterList, int32_t converterListSize, char* allStrings = (char*) uprv_malloc(totalSize); if (!allStrings) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } for (i = 0; i < converterListSize; i++) { newSelector->encodings[i] = allStrings; uprv_strcpy(newSelector->encodings[i], - converterList != NULL ? converterList[i] : ucnv_getAvailableName(i)); + converterList != nullptr ? converterList[i] : ucnv_getAvailableName(i)); allStrings += uprv_strlen(newSelector->encodings[i]) + 1; } while (encodingStrPadding > 0) { @@ -219,7 +219,7 @@ ucnvsel_open(const char* const* converterList, int32_t converterListSize, upvec_close(upvec); if (U_FAILURE(*status)) { - return NULL; + return nullptr; } return newSelector.orphan(); @@ -289,13 +289,13 @@ ucnvsel_serialize(const UConverterSelector* sel, // ensure args make sense! uint8_t *p = (uint8_t *)buffer; if (bufferCapacity < 0 || - (bufferCapacity > 0 && (p == NULL || (U_POINTER_MASK_LSB(p, 3) != 0))) + (bufferCapacity > 0 && (p == nullptr || (U_POINTER_MASK_LSB(p, 3) != 0))) ) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } // add up the size of the serialized form - int32_t serializedTrieSize = utrie2_serialize(sel->trie, NULL, 0, status); + int32_t serializedTrieSize = utrie2_serialize(sel->trie, nullptr, 0, status); if (*status != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(*status)) { return 0; } @@ -466,21 +466,21 @@ U_CAPI UConverterSelector* U_EXPORT2 ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* status) { // check if already failed if (U_FAILURE(*status)) { - return NULL; + return nullptr; } // ensure args make sense! const uint8_t *p = (const uint8_t *)buffer; if (length <= 0 || - (length > 0 && (p == NULL || (U_POINTER_MASK_LSB(p, 3) != 0))) + (length > 0 && (p == nullptr || (U_POINTER_MASK_LSB(p, 3) != 0))) ) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } // header if (length < 32) { // not even enough space for a minimal header *status = U_INDEX_OUTOFBOUNDS_ERROR; - return NULL; + return nullptr; } const DataHeader *pHeader = (const DataHeader *)p; if (!( @@ -493,40 +493,40 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu )) { /* header not valid or dataFormat not recognized */ *status = U_INVALID_FORMAT_ERROR; - return NULL; + return nullptr; } if (pHeader->info.formatVersion[0] != 1) { *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } - uint8_t* swapped = NULL; + uint8_t* swapped = nullptr; if (pHeader->info.isBigEndian != U_IS_BIG_ENDIAN || pHeader->info.charsetFamily != U_CHARSET_FAMILY ) { // swap the data UDataSwapper *ds = udata_openSwapperForInputData(p, length, U_IS_BIG_ENDIAN, U_CHARSET_FAMILY, status); - int32_t totalSize = ucnvsel_swap(ds, p, -1, NULL, status); + int32_t totalSize = ucnvsel_swap(ds, p, -1, nullptr, status); if (U_FAILURE(*status)) { udata_closeSwapper(ds); - return NULL; + return nullptr; } if (length < totalSize) { udata_closeSwapper(ds); *status = U_INDEX_OUTOFBOUNDS_ERROR; - return NULL; + return nullptr; } swapped = (uint8_t*)uprv_malloc(totalSize); - if (swapped == NULL) { + if (swapped == nullptr) { udata_closeSwapper(ds); *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } ucnvsel_swap(ds, p, length, swapped, status); udata_closeSwapper(ds); if (U_FAILURE(*status)) { uprv_free(swapped); - return NULL; + return nullptr; } p = swapped; pHeader = (const DataHeader *)p; @@ -535,7 +535,7 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu // not even enough space for the header and the indexes uprv_free(swapped); *status = U_INDEX_OUTOFBOUNDS_ERROR; - return NULL; + return nullptr; } p += pHeader->dataHeader.headerSize; length -= pHeader->dataHeader.headerSize; @@ -544,7 +544,7 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu if (length < indexes[UCNVSEL_INDEX_SIZE]) { uprv_free(swapped); *status = U_INDEX_OUTOFBOUNDS_ERROR; - return NULL; + return nullptr; } p += UCNVSEL_INDEX_COUNT * 4; // create and populate the selector object @@ -552,12 +552,12 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu char **encodings = (char **)uprv_malloc( indexes[UCNVSEL_INDEX_NAMES_COUNT] * sizeof(char *)); - if (sel == NULL || encodings == NULL) { + if (sel == nullptr || encodings == nullptr) { uprv_free(swapped); uprv_free(sel); uprv_free(encodings); *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(sel, 0, sizeof(UConverterSelector)); sel->pvCount = indexes[UCNVSEL_INDEX_PV_COUNT]; @@ -567,12 +567,12 @@ ucnvsel_openFromSerialized(const void* buffer, int32_t length, UErrorCode* statu sel->swapped = swapped; // trie sel->trie = utrie2_openFromSerialized(UTRIE2_16_VALUE_BITS, - p, indexes[UCNVSEL_INDEX_TRIE_SIZE], NULL, + p, indexes[UCNVSEL_INDEX_TRIE_SIZE], nullptr, status); p += indexes[UCNVSEL_INDEX_TRIE_SIZE]; if (U_FAILURE(*status)) { ucnvsel_close(sel); - return NULL; + return nullptr; } // bit vectors sel->pv = (uint32_t *)p; @@ -622,14 +622,14 @@ static const char* U_CALLCONV ucnvsel_next_encoding(UEnumeration* enumerator, UErrorCode* status) { // check if already failed if (U_FAILURE(*status)) { - return NULL; + return nullptr; } int16_t cur = ((Enumerator*)(enumerator->context))->cur; const UConverterSelector* sel; const char* result; if (cur >= ((Enumerator*)(enumerator->context))->length) { - return NULL; + return nullptr; } sel = ((Enumerator*)(enumerator->context))->sel; result = sel->encodings[((Enumerator*)(enumerator->context))->index[cur] ]; @@ -653,8 +653,8 @@ U_CDECL_END static const UEnumeration defaultEncodings = { - NULL, - NULL, + nullptr, + nullptr, ucnvsel_close_selector_iterator, ucnvsel_count_encodings, uenum_unextDefault, @@ -732,7 +732,7 @@ static UEnumeration *selectForMask(const UConverterSelector* sel, v >>= 1; } } - } //otherwise, index will remain NULL (and will never be touched by + } //otherwise, index will remain nullptr (and will never be touched by //the enumerator code anyway) en->context = result.orphan(); return en.orphan(); @@ -744,31 +744,31 @@ ucnvsel_selectForString(const UConverterSelector* sel, const UChar *s, int32_t length, UErrorCode *status) { // check if already failed if (U_FAILURE(*status)) { - return NULL; + return nullptr; } // ensure args make sense! - if (sel == NULL || (s == NULL && length != 0)) { + if (sel == nullptr || (s == nullptr && length != 0)) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } int32_t columns = (sel->encodingsCount+31)/32; uint32_t* mask = (uint32_t*) uprv_malloc(columns * 4); - if (mask == NULL) { + if (mask == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(mask, ~0, columns *4); - if(s!=NULL) { + if(s!=nullptr) { const UChar *limit; if (length >= 0) { limit = s + length; } else { - limit = NULL; + limit = nullptr; } - while (limit == NULL ? *s != 0 : s != limit) { + while (limit == nullptr ? *s != 0 : s != limit) { UChar32 c; uint16_t pvIndex; UTRIE2_U16_NEXT16(sel->trie, s, limit, c, pvIndex); @@ -786,19 +786,19 @@ ucnvsel_selectForUTF8(const UConverterSelector* sel, const char *s, int32_t length, UErrorCode *status) { // check if already failed if (U_FAILURE(*status)) { - return NULL; + return nullptr; } // ensure args make sense! - if (sel == NULL || (s == NULL && length != 0)) { + if (sel == nullptr || (s == nullptr && length != 0)) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } int32_t columns = (sel->encodingsCount+31)/32; uint32_t* mask = (uint32_t*) uprv_malloc(columns * 4); - if (mask == NULL) { + if (mask == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(mask, ~0, columns *4); @@ -806,7 +806,7 @@ ucnvsel_selectForUTF8(const UConverterSelector* sel, length = (int32_t)uprv_strlen(s); } - if(s!=NULL) { + if(s!=nullptr) { const char *limit = s + length; while (s != limit) { diff --git a/icu4c/source/common/ucol_swp.cpp b/icu4c/source/common/ucol_swp.cpp index 59704ff8f67..4b1a857fcfe 100644 --- a/icu4c/source/common/ucol_swp.cpp +++ b/icu4c/source/common/ucol_swp.cpp @@ -33,13 +33,13 @@ U_CAPI UBool U_EXPORT2 ucol_looksLikeCollationBinary(const UDataSwapper *ds, const void *inData, int32_t length) { - if(ds==NULL || inData==NULL || length<-1) { + if(ds==nullptr || inData==nullptr || length<-1) { return false; } // First check for format version 4+ which has a standard data header. UErrorCode errorCode=U_ZERO_ERROR; - (void)udata_swapDataHeader(ds, inData, -1, NULL, &errorCode); + (void)udata_swapDataHeader(ds, inData, -1, nullptr, &errorCode); if(U_SUCCESS(errorCode)) { const UDataInfo &info=*(const UDataInfo *)((const char *)inData+4); if(info.dataFormat[0]==0x55 && // dataFormat="UCol" @@ -103,7 +103,7 @@ swapFormatVersion3(const UDataSwapper *ds, if(U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<-1 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<-1 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -336,7 +336,7 @@ swapFormatVersion4(const UDataSwapper *ds, for(int32_t i=indexesLength; i<=IX_TOTAL_SIZE; ++i) { indexes[i]=-1; } - inIndexes=NULL; // Make sure we do not accidentally use these instead of indexes[]. + inIndexes=nullptr; // Make sure we do not accidentally use these instead of indexes[]. // Get the total length of the data. int32_t size; @@ -537,7 +537,7 @@ ucol_swapInverseUCA(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } diff --git a/icu4c/source/common/ucurr.cpp b/icu4c/source/common/ucurr.cpp index 928d049fb55..cde8ec3ba7d 100644 --- a/icu4c/source/common/ucurr.cpp +++ b/icu4c/source/common/ucurr.cpp @@ -96,11 +96,11 @@ static const char CURRENCIES_VARIANT[] = "Currencies%variant"; static const char CURRENCYPLURALS[] = "CurrencyPlurals"; // ISO codes mapping table -static const UHashtable* gIsoCodes = NULL; +static const UHashtable* gIsoCodes = nullptr; static icu::UInitOnce gIsoCodesInitOnce {}; // Currency symbol equivalances -static const icu::Hashtable* gCurrSymbolsEquiv = NULL; +static const icu::Hashtable* gCurrSymbolsEquiv = nullptr; static icu::UInitOnce gCurrSymbolsEquivInitOnce {}; U_NAMESPACE_BEGIN @@ -117,8 +117,8 @@ public: } inline ~EquivIterator() { } - // next returns the next equivalent string or NULL if there are no more. - // If s has no equivalent strings, next returns NULL on the first call. + // next returns the next equivalent string or nullptr if there are no more. + // If s has no equivalent strings, next returns nullptr on the first call. const icu::UnicodeString *next(); private: const icu::Hashtable& _hash; @@ -129,12 +129,12 @@ private: const icu::UnicodeString * EquivIterator::next() { const icu::UnicodeString* _next = (const icu::UnicodeString*) _hash.get(*_current); - if (_next == NULL) { + if (_next == nullptr) { U_ASSERT(_current == _start); - return NULL; + return nullptr; } if (*_next == *_start) { - return NULL; + return nullptr; } _current = _next; return _next; @@ -161,7 +161,7 @@ static void makeEquivalent( const icu::UnicodeString *firstRight = rightIter.next(); const icu::UnicodeString *nextLeft = firstLeft; const icu::UnicodeString *nextRight = firstRight; - while (nextLeft != NULL && nextRight != NULL) { + while (nextLeft != nullptr && nextRight != nullptr) { if (*nextLeft == rhs || *nextRight == lhs) { // Already equivalent return; @@ -172,17 +172,17 @@ static void makeEquivalent( // Not equivalent. Must join. icu::UnicodeString *newFirstLeft; icu::UnicodeString *newFirstRight; - if (firstRight == NULL && firstLeft == NULL) { + if (firstRight == nullptr && firstLeft == nullptr) { // Neither lhs or rhs belong to an equivalence circle, so we form // a new equivalnce circle of just lhs and rhs. newFirstLeft = new icu::UnicodeString(rhs); newFirstRight = new icu::UnicodeString(lhs); - } else if (firstRight == NULL) { + } else if (firstRight == nullptr) { // lhs belongs to an equivalence circle, but rhs does not, so we link // rhs into lhs' circle. newFirstLeft = new icu::UnicodeString(rhs); newFirstRight = new icu::UnicodeString(*firstLeft); - } else if (firstLeft == NULL) { + } else if (firstLeft == nullptr) { // rhs belongs to an equivlance circle, but lhs does not, so we link // lhs into rhs' circle. newFirstLeft = new icu::UnicodeString(*firstRight); @@ -193,7 +193,7 @@ static void makeEquivalent( newFirstLeft = new icu::UnicodeString(*firstRight); newFirstRight = new icu::UnicodeString(*firstLeft); } - if (newFirstLeft == NULL || newFirstRight == NULL) { + if (newFirstLeft == nullptr || newFirstRight == nullptr) { delete newFirstLeft; delete newFirstRight; status = U_MEMORY_ALLOCATION_ERROR; @@ -209,7 +209,7 @@ static void makeEquivalent( static int32_t countEquivalent(const icu::Hashtable &hash, const icu::UnicodeString &s) { int32_t result = 0; icu::EquivIterator iter(hash, s); - while (iter.next() != NULL) { + while (iter.next() != nullptr) { ++result; } #ifdef UCURR_DEBUG_EQUIV @@ -233,9 +233,9 @@ static const icu::Hashtable* getCurrSymbolsEquiv(); static UBool U_CALLCONV isoCodes_cleanup(void) { - if (gIsoCodes != NULL) { + if (gIsoCodes != nullptr) { uhash_close(const_cast(gIsoCodes)); - gIsoCodes = NULL; + gIsoCodes = nullptr; } gIsoCodesInitOnce.reset(); return true; @@ -248,7 +248,7 @@ static UBool U_CALLCONV currSymbolsEquiv_cleanup(void) { delete const_cast(gCurrSymbolsEquiv); - gCurrSymbolsEquiv = NULL; + gCurrSymbolsEquiv = nullptr; gCurrSymbolsEquivInitOnce.reset(); return true; } @@ -315,10 +315,10 @@ _findMetaData(const UChar* currency, UErrorCode& ec) { // Look up our currency, or if that's not available, then DEFAULT char buf[ISO_CURRENCY_CODE_LENGTH+1]; UErrorCode ec2 = U_ZERO_ERROR; // local error code: soft failure - UResourceBundle* rb = ures_getByKey(currencyMeta, myUCharsToChars(buf, currency), NULL, &ec2); + UResourceBundle* rb = ures_getByKey(currencyMeta, myUCharsToChars(buf, currency), nullptr, &ec2); if (U_FAILURE(ec2)) { ures_close(rb); - rb = ures_getByKey(currencyMeta,DEFAULT_META, NULL, &ec); + rb = ures_getByKey(currencyMeta,DEFAULT_META, nullptr, &ec); if (U_FAILURE(ec)) { ures_close(currencyMeta); ures_close(rb); @@ -428,7 +428,7 @@ struct CReg : public icu::UMemory { } static const UChar* get(const char* id) { - const UChar* result = NULL; + const UChar* result = nullptr; umtx_lock(&gCRegLock); CReg* p = gCRegHead; @@ -465,7 +465,7 @@ ucurr_register(const UChar* isoCode, const char* locale, UErrorCode *status) idForLocale(locale, id, sizeof(id), status); return CReg::reg(isoCode, id, status); } - return NULL; + return nullptr; } // ------------------------------------- @@ -555,7 +555,7 @@ ucurr_forLocale(const char* locale, idDelim[0] = 0; } - const UChar* s = NULL; // Currency code from data file. + const UChar* s = nullptr; // Currency code from data file. if (id[0] == 0) { // No point looking in the data for an empty string. // This is what we would get. @@ -641,7 +641,7 @@ static UBool fallback(char *loc) { } /* char *i = uprv_strrchr(loc, '_'); - if (i == NULL) { + if (i == nullptr) { i = loc; } *i = 0; @@ -705,7 +705,7 @@ ucurr_getName(const UChar* currency, /* Normalize the keyword value to uppercase */ T_CString_toUpperCase(buf); - const UChar* s = NULL; + const UChar* s = nullptr; ec2 = U_ZERO_ERROR; LocalUResourceBundlePointer rb(ures_open(U_ICUDATA_CURR, loc, &ec2)); @@ -734,7 +734,7 @@ ucurr_getName(const UChar* currency, choice = UCURR_SYMBOL_NAME; } } - if (s == NULL) { + if (s == nullptr) { ures_getByKey(rb.getAlias(), CURRENCIES, rb.getAlias(), &ec2); ures_getByKeyWithFallback(rb.getAlias(), buf, rb.getAlias(), &ec2); s = ures_getStringByIndex(rb.getAlias(), choice, len, &ec2); @@ -751,11 +751,11 @@ ucurr_getName(const UChar* currency, // We no longer support choice format data in names. Data should not contain // choice patterns. - if (isChoiceFormat != NULL) { + if (isChoiceFormat != nullptr) { *isChoiceFormat = false; } if (U_SUCCESS(ec2)) { - U_ASSERT(s != NULL); + U_ASSERT(s != nullptr); return s; } @@ -801,7 +801,7 @@ ucurr_getPluralName(const UChar* currency, char buf[ISO_CURRENCY_CODE_LENGTH+1]; myUCharsToChars(buf, currency); - const UChar* s = NULL; + const UChar* s = nullptr; ec2 = U_ZERO_ERROR; UResourceBundle* rb = ures_open(U_ICUDATA_CURR, loc, &ec2); @@ -831,7 +831,7 @@ ucurr_getPluralName(const UChar* currency, || (ec2 == U_USING_FALLBACK_WARNING && *ec != U_USING_DEFAULT_WARNING)) { *ec = ec2; } - U_ASSERT(s != NULL); + U_ASSERT(s != nullptr); return s; } @@ -903,7 +903,7 @@ getCurrencyNameCount(const char* loc, int32_t* total_currency_name_count, int32_ U_NAMESPACE_USE *total_currency_name_count = 0; *total_currency_symbol_count = 0; - const UChar* s = NULL; + const UChar* s = nullptr; char locale[ULOC_FULLNAME_CAPACITY] = ""; uprv_strcpy(locale, loc); const icu::Hashtable *currencySymbolsEquiv = getCurrSymbolsEquiv(); @@ -911,14 +911,14 @@ getCurrencyNameCount(const char* loc, int32_t* total_currency_name_count, int32_ UErrorCode ec2 = U_ZERO_ERROR; // TODO: ures_openDirect? UResourceBundle* rb = ures_open(U_ICUDATA_CURR, locale, &ec2); - UResourceBundle* curr = ures_getByKey(rb, CURRENCIES, NULL, &ec2); + UResourceBundle* curr = ures_getByKey(rb, CURRENCIES, nullptr, &ec2); int32_t n = ures_getSize(curr); for (int32_t i=0; i(symbol->getBuffer()); @@ -1074,16 +1074,16 @@ collectCurrencyNames(const char* locale, // currency plurals UErrorCode ec5 = U_ZERO_ERROR; - UResourceBundle* curr_p = ures_getByKey(rb, CURRENCYPLURALS, NULL, &ec5); + UResourceBundle* curr_p = ures_getByKey(rb, CURRENCYPLURALS, nullptr, &ec5); n = ures_getSize(curr_p); for (int32_t i=0; ilocale) == 0) { found = i; break; @@ -1461,12 +1461,12 @@ getCacheEntry(const char* locale, UErrorCode& ec) { if (found == -1) { collectCurrencyNames(locale, ¤cyNames, &total_currency_name_count, ¤cySymbols, &total_currency_symbol_count, ec); if (U_FAILURE(ec)) { - return NULL; + return nullptr; } umtx_lock(&gCurrencyCacheMutex); // check again. for (int8_t i = 0; i < CURRENCY_NAME_CACHE_NUM; ++i) { - if (currCache[i]!= NULL && + if (currCache[i]!= nullptr && uprv_strcmp(locale, currCache[i]->locale) == 0) { found = i; break; @@ -2032,7 +2032,7 @@ static const struct CurrencyList { {"ZWD", UCURR_COMMON|UCURR_DEPRECATED}, {"ZWL", UCURR_COMMON|UCURR_DEPRECATED}, {"ZWR", UCURR_COMMON|UCURR_DEPRECATED}, - { NULL, 0 } // Leave here to denote the end of the list. + { nullptr, 0 } // Leave here to denote the end of the list. }; #define UCURR_MATCHES_BITMASK(variable, typeToMatch) \ @@ -2045,7 +2045,7 @@ ucurr_countCurrencyList(UEnumeration *enumerator, UErrorCode * /*pErrorCode*/) { int32_t count = 0; /* Count the number of items matching the type we are looking for. */ - for (int32_t idx = 0; gCurrencyList[idx].currency != NULL; idx++) { + for (int32_t idx = 0; gCurrencyList[idx].currency != nullptr; idx++) { if (UCURR_MATCHES_BITMASK(gCurrencyList[idx].currType, currType)) { count++; } @@ -2075,7 +2075,7 @@ ucurr_nextCurrencyList(UEnumeration *enumerator, if (resultLength) { *resultLength = 0; } - return NULL; + return nullptr; } static void U_CALLCONV @@ -2101,29 +2101,29 @@ ucurr_createCurrencyList(UHashtable *isoCodes, UErrorCode* status){ // process each entry in currency map for (int32_t i=0; i to) { *eErrorCode = U_ILLEGAL_ARGUMENT_ERROR; @@ -2267,20 +2267,20 @@ static const icu::Hashtable* getCurrSymbolsEquiv() { U_CAPI UEnumeration * U_EXPORT2 ucurr_openISOCurrencies(uint32_t currType, UErrorCode *pErrorCode) { - UEnumeration *myEnum = NULL; + UEnumeration *myEnum = nullptr; UCurrencyContext *myContext; myEnum = (UEnumeration*)uprv_malloc(sizeof(UEnumeration)); - if (myEnum == NULL) { + if (myEnum == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(myEnum, &gEnumCurrencyList, sizeof(UEnumeration)); myContext = (UCurrencyContext*)uprv_malloc(sizeof(UCurrencyContext)); - if (myContext == NULL) { + if (myContext == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; uprv_free(myEnum); - return NULL; + return nullptr; } myContext->currType = currType; myContext->listIdx = 0; @@ -2295,7 +2295,7 @@ ucurr_countCurrencies(const char* locale, { int32_t currCount = 0; - if (ec != NULL && U_SUCCESS(*ec)) + if (ec != nullptr && U_SUCCESS(*ec)) { // local variables UErrorCode localStatus = U_ZERO_ERROR; @@ -2329,11 +2329,11 @@ ucurr_countCurrencies(const char* locale, for (int32_t i=0; i 2) { int32_t toLength = 0; - UResourceBundle *toRes = ures_getByKey(currencyRes, "to", NULL, &localStatus); + UResourceBundle *toRes = ures_getByKey(currencyRes, "to", nullptr, &localStatus); const int32_t *toArray = ures_getIntVector(toRes, &toLength, &localStatus); currDate64 = (int64_t)toArray[0] << 32; @@ -2405,9 +2405,9 @@ ucurr_forLocaleAndDate(const char* locale, { int32_t resLen = 0; int32_t currIndex = 0; - const UChar* s = NULL; + const UChar* s = nullptr; - if (ec != NULL && U_SUCCESS(*ec)) + if (ec != nullptr && U_SUCCESS(*ec)) { // check the arguments passed if ((buff && buffCapacity) || !buffCapacity ) @@ -2451,12 +2451,12 @@ ucurr_forLocaleAndDate(const char* locale, for (int32_t i=0; i 2) { int32_t toLength = 0; - UResourceBundle *toRes = ures_getByKey(currencyRes, "to", NULL, &localStatus); + UResourceBundle *toRes = ures_getByKey(currencyRes, "to", nullptr, &localStatus); const int32_t *toArray = ures_getIntVector(toRes, &toLength, &localStatus); currDate64 = (int64_t)toArray[0] << 32; @@ -2550,8 +2550,8 @@ ucurr_forLocaleAndDate(const char* locale, } static const UEnumeration defaultKeywordValues = { - NULL, - NULL, + nullptr, + nullptr, ulist_close_keyword_values_iterator, ulist_count_keyword_values, uenum_unextDefault, @@ -2568,15 +2568,15 @@ U_CAPI UEnumeration *U_EXPORT2 ucurr_getKeywordValuesForLocale(const char *key, UList *values = ulist_createEmptyList(status); UList *otherValues = ulist_createEmptyList(status); UEnumeration *en = (UEnumeration *)uprv_malloc(sizeof(UEnumeration)); - if (U_FAILURE(*status) || en == NULL) { - if (en == NULL) { + if (U_FAILURE(*status) || en == nullptr) { + if (en == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { uprv_free(en); } ulist_deleteList(values); ulist_deleteList(otherValues); - return NULL; + return nullptr; } memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); en->context = values; @@ -2614,7 +2614,7 @@ U_CAPI UEnumeration *U_EXPORT2 ucurr_getKeywordValuesForLocale(const char *key, } char *curID = (char *)uprv_malloc(sizeof(char) * ULOC_KEYWORDS_CAPACITY); int32_t curIDLength = ULOC_KEYWORDS_CAPACITY; - if (curID == NULL) { + if (curID == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -2667,9 +2667,9 @@ U_CAPI UEnumeration *U_EXPORT2 ucurr_getKeywordValuesForLocale(const char *key, } } else { // Consolidate the list - char *value = NULL; + char *value = nullptr; ulist_resetList(otherValues); - while ((value = (char *)ulist_getNext(otherValues)) != NULL) { + while ((value = (char *)ulist_getNext(otherValues)) != nullptr) { if (!ulist_containsString(values, value, (int32_t)uprv_strlen(value))) { char *tmpValue = (char *)uprv_malloc(sizeof(char) * ULOC_KEYWORDS_CAPACITY); uprv_memcpy(tmpValue, value, uprv_strlen(value) + 1); @@ -2685,8 +2685,8 @@ U_CAPI UEnumeration *U_EXPORT2 ucurr_getKeywordValuesForLocale(const char *key, } else { ulist_deleteList(values); uprv_free(en); - values = NULL; - en = NULL; + values = nullptr; + en = nullptr; } ures_close(&to); ures_close(&curbndl); diff --git a/icu4c/source/common/udata.cpp b/icu4c/source/common/udata.cpp index c5d0a9feb7b..b983bbd7a3e 100644 --- a/icu4c/source/common/udata.cpp +++ b/icu4c/source/common/udata.cpp @@ -104,11 +104,11 @@ static UDataMemory *udata_findCachedData(const char *path, UErrorCode &err); * that they really need, reducing the size of binaries that take advantage * of this. */ -static UDataMemory *gCommonICUDataArray[10] = { NULL }; // Access protected by icu global mutex. +static UDataMemory *gCommonICUDataArray[10] = { nullptr }; // Access protected by icu global mutex. static u_atomic_int32_t gHaveTriedToLoadCommonData {0}; // See extendICUData(). -static UHashtable *gCommonDataCache = NULL; /* Global hash table of opened ICU data files. */ +static UHashtable *gCommonDataCache = nullptr; /* Global hash table of opened ICU data files. */ static icu::UInitOnce gCommonDataCacheInitOnce {}; #if !defined(ICU_DATA_DIR_WINDOWS) @@ -126,13 +126,13 @@ udata_cleanup(void) if (gCommonDataCache) { /* Delete the cache of user data mappings. */ uhash_close(gCommonDataCache); /* Table owns the contents, and will delete them. */ - gCommonDataCache = NULL; /* Cleanup is not thread safe. */ + gCommonDataCache = nullptr; /* Cleanup is not thread safe. */ } gCommonDataCacheInitOnce.reset(); - for (i = 0; i < UPRV_LENGTHOF(gCommonICUDataArray) && gCommonICUDataArray[i] != NULL; ++i) { + for (i = 0; i < UPRV_LENGTHOF(gCommonICUDataArray) && gCommonICUDataArray[i] != nullptr; ++i) { udata_close(gCommonICUDataArray[i]); - gCommonICUDataArray[i] = NULL; + gCommonICUDataArray[i] = nullptr; } gHaveTriedToLoadCommonData = 0; @@ -146,13 +146,13 @@ findCommonICUDataByName(const char *inBasename, UErrorCode &err) int32_t i; UDataMemory *pData = udata_findCachedData(inBasename, err); - if (U_FAILURE(err) || pData == NULL) + if (U_FAILURE(err) || pData == nullptr) return false; { Mutex lock; for (i = 0; i < UPRV_LENGTHOF(gCommonICUDataArray); ++i) { - if ((gCommonICUDataArray[i] != NULL) && (gCommonICUDataArray[i]->pHeader == pData->pHeader)) { + if ((gCommonICUDataArray[i] != nullptr) && (gCommonICUDataArray[i]->pHeader == pData->pHeader)) { /* The data pointer is already in the array. */ found = true; break; @@ -184,9 +184,9 @@ setCommonICUData(UDataMemory *pData, /* The new common data. Belongs to ca /* deleted - someone may still have a pointer to it lying around in */ /* their locals. */ UDatamemory_assign(newCommonData, pData); - umtx_lock(NULL); + umtx_lock(nullptr); for (i = 0; i < UPRV_LENGTHOF(gCommonICUDataArray); ++i) { - if (gCommonICUDataArray[i] == NULL) { + if (gCommonICUDataArray[i] == nullptr) { gCommonICUDataArray[i] = newCommonData; didUpdate = true; break; @@ -195,7 +195,7 @@ setCommonICUData(UDataMemory *pData, /* The new common data. Belongs to ca break; } } - umtx_unlock(NULL); + umtx_unlock(nullptr); if (i == UPRV_LENGTHOF(gCommonICUDataArray) && warn) { *pErr = U_USING_DEFAULT_WARNING; @@ -224,7 +224,7 @@ setCommonICUDataPointer(const void *pData, UBool /*warn*/, UErrorCode *pErrorCod static const char * findBasename(const char *path) { const char *basename=uprv_strrchr(path, U_FILE_SEP_CHAR); - if(basename==NULL) { + if(basename==nullptr) { return path; } else { return basename+1; @@ -235,13 +235,13 @@ findBasename(const char *path) { static const char * packageNameFromPath(const char *path) { - if((path == NULL) || (*path == 0)) { + if((path == nullptr) || (*path == 0)) { return U_ICUDATA_NAME; } path = findBasename(path); - if((path == NULL) || (*path == 0)) { + if((path == nullptr) || (*path == 0)) { return U_ICUDATA_NAME; } @@ -281,12 +281,12 @@ static void U_CALLCONV DataCacheElement_deleter(void *pDCEl) { } static void U_CALLCONV udata_initHashTable(UErrorCode &err) { - U_ASSERT(gCommonDataCache == NULL); - gCommonDataCache = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &err); + U_ASSERT(gCommonDataCache == nullptr); + gCommonDataCache = uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &err); if (U_FAILURE(err)) { return; } - U_ASSERT(gCommonDataCache != NULL); + U_ASSERT(gCommonDataCache != nullptr); uhash_setValueDeleter(gCommonDataCache, DataCacheElement_deleter); ucln_common_registerCleanup(UCLN_COMMON_UDATA, udata_cleanup); } @@ -305,20 +305,20 @@ static UHashtable *udata_getHashTable(UErrorCode &err) { static UDataMemory *udata_findCachedData(const char *path, UErrorCode &err) { UHashtable *htable; - UDataMemory *retVal = NULL; + UDataMemory *retVal = nullptr; DataCacheElement *el; const char *baseName; htable = udata_getHashTable(err); if (U_FAILURE(err)) { - return NULL; + return nullptr; } baseName = findBasename(path); /* Cache remembers only the base name, not the full path. */ - umtx_lock(NULL); + umtx_lock(nullptr); el = (DataCacheElement *)uhash_get(htable, baseName); - umtx_unlock(NULL); - if (el != NULL) { + umtx_unlock(nullptr); + if (el != nullptr) { retVal = el->item; } #ifdef UDATA_DEBUG @@ -333,45 +333,45 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr const char *baseName; int32_t nameLen; UHashtable *htable; - DataCacheElement *oldValue = NULL; + DataCacheElement *oldValue = nullptr; UErrorCode subErr = U_ZERO_ERROR; htable = udata_getHashTable(*pErr); if (U_FAILURE(*pErr)) { - return NULL; + return nullptr; } /* Create a new DataCacheElement - the thingy we store in the hash table - * and copy the supplied path and UDataMemoryItems into it. */ newElement = (DataCacheElement *)uprv_malloc(sizeof(DataCacheElement)); - if (newElement == NULL) { + if (newElement == nullptr) { *pErr = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } newElement->item = UDataMemory_createNewInstance(pErr); if (U_FAILURE(*pErr)) { uprv_free(newElement); - return NULL; + return nullptr; } UDatamemory_assign(newElement->item, item); baseName = findBasename(path); nameLen = (int32_t)uprv_strlen(baseName); newElement->name = (char *)uprv_malloc(nameLen+1); - if (newElement->name == NULL) { + if (newElement->name == nullptr) { *pErr = U_MEMORY_ALLOCATION_ERROR; uprv_free(newElement->item); uprv_free(newElement); - return NULL; + return nullptr; } uprv_strcpy(newElement->name, baseName); /* Stick the new DataCacheElement into the hash table. */ - umtx_lock(NULL); + umtx_lock(nullptr); oldValue = (DataCacheElement *)uhash_get(htable, path); - if (oldValue != NULL) { + if (oldValue != nullptr) { subErr = U_USING_DEFAULT_WARNING; } else { @@ -381,7 +381,7 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr newElement, /* Value */ &subErr); } - umtx_unlock(NULL); + umtx_unlock(nullptr); #ifdef UDATA_DEBUG fprintf(stderr, "Cache: [%s] <<< %p : %s. vFunc=%p\n", newElement->name, @@ -393,7 +393,7 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr uprv_free(newElement->name); uprv_free(newElement->item); uprv_free(newElement); - return oldValue ? oldValue->item : NULL; + return oldValue ? oldValue->item : nullptr; } return newElement->item; @@ -436,7 +436,7 @@ private: /** * @param iter The iterator to be initialized. Its current state does not matter. - * @param inPath The full pathname to be iterated over. If NULL, defaults to U_ICUDATA_NAME + * @param inPath The full pathname to be iterated over. If nullptr, defaults to U_ICUDATA_NAME * @param pkg Package which is being searched for, ex "icudt28l". Will ignore leaf directories such as /icudt28l * @param item Item to be searched for. Can include full path, such as /a/b/foo.dat * @param inSuffix Optional item suffix, if not-null (ex. ".dat") then 'path' can contain 'item' explicitly. @@ -453,14 +453,14 @@ UDataPathIterator::UDataPathIterator(const char *inPath, const char *pkg, fprintf(stderr, "SUFFIX1=%s PATH=%s\n", inSuffix, inPath); #endif /** Path **/ - if(inPath == NULL) { + if(inPath == nullptr) { path = u_getDataDirectory(); } else { path = inPath; } /** Package **/ - if(pkg != NULL) { + if(pkg != nullptr) { packageStub.append(U_FILE_SEP_CHAR, *pErrorCode).append(pkg, *pErrorCode); #ifdef UDATA_DEBUG fprintf(stderr, "STUB=%s [%d]\n", packageStub.data(), packageStub.length()); @@ -483,7 +483,7 @@ UDataPathIterator::UDataPathIterator(const char *inPath, const char *pkg, #endif /** Suffix **/ - if(inSuffix != NULL) { + if(inSuffix != nullptr) { suffix = inSuffix; } else { suffix = ""; @@ -510,21 +510,21 @@ UDataPathIterator::UDataPathIterator(const char *inPath, const char *pkg, * * @param iter The Iter to be used * @param len If set, pointer to the length of the returned path, for convenience. - * @return Pointer to the next path segment, or NULL if there are no more. + * @return Pointer to the next path segment, or nullptr if there are no more. */ const char *UDataPathIterator::next(UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - const char *currentPath = NULL; + const char *currentPath = nullptr; int32_t pathLen = 0; const char *pathBasename; do { - if( nextPath == NULL ) { + if( nextPath == nullptr ) { break; } currentPath = nextPath; @@ -535,7 +535,7 @@ const char *UDataPathIterator::next(UErrorCode *pErrorCode) } else { /* fix up next for next time */ nextPath = uprv_strchr(currentPath, U_PATH_SEP_CHAR); - if(nextPath == NULL) { + if(nextPath == nullptr) { /* segment: entire path */ pathLen = (int32_t)uprv_strlen(currentPath); } else { @@ -626,7 +626,7 @@ const char *UDataPathIterator::next(UErrorCode *pErrorCode) } while(path); /* fell way off the end */ - return NULL; + return nullptr; } U_NAMESPACE_END @@ -668,7 +668,7 @@ extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; *----------------------------------------------------------------------*/ static UDataMemory * openCommonData(const char *path, /* Path from OpenChoice? */ - int32_t commonDataIndex, /* ICU Data (index >= 0) if path == NULL */ + int32_t commonDataIndex, /* ICU Data (index >= 0) if path == nullptr */ UErrorCode *pErrorCode) { UDataMemory tData; @@ -676,7 +676,7 @@ openCommonData(const char *path, /* Path from OpenChoice? */ const char *inBasename; if (U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } UDataMemory_init(&tData); @@ -685,11 +685,11 @@ openCommonData(const char *path, /* Path from OpenChoice? */ if (commonDataIndex >= 0) { /* "mini-cache" for common ICU data */ if(commonDataIndex >= UPRV_LENGTHOF(gCommonICUDataArray)) { - return NULL; + return nullptr; } { Mutex lock; - if(gCommonICUDataArray[commonDataIndex] != NULL) { + if(gCommonICUDataArray[commonDataIndex] != nullptr) { return gCommonICUDataArray[commonDataIndex]; } #if !defined(ICU_DATA_DIR_WINDOWS) @@ -698,7 +698,7 @@ openCommonData(const char *path, /* Path from OpenChoice? */ for(i = 0; i < commonDataIndex; ++i) { if(gCommonICUDataArray[i]->pHeader == &U_ICUDATA_ENTRY_POINT) { /* The linked-in data is already in the list. */ - return NULL; + return nullptr; } } #endif @@ -746,14 +746,14 @@ openCommonData(const char *path, /* Path from OpenChoice? */ if (U_SUCCESS(*pErrorCode)) { *pErrorCode=U_FILE_ACCESS_ERROR; } - return NULL; + return nullptr; } /* Is the requested common data file already open and cached? */ /* Note that the cache is keyed by the base name only. The rest of the path, */ /* if any, is not considered. */ UDataMemory *dataToReturn = udata_findCachedData(inBasename, *pErrorCode); - if (dataToReturn != NULL || U_FAILURE(*pErrorCode)) { + if (dataToReturn != nullptr || U_FAILURE(*pErrorCode)) { return dataToReturn; } @@ -763,7 +763,7 @@ openCommonData(const char *path, /* Path from OpenChoice? */ UDataPathIterator iter(u_getDataDirectory(), inBasename, path, ".dat", true, pErrorCode); - while ((UDataMemory_isLoaded(&tData)==false) && (pathBuffer = iter.next(pErrorCode)) != NULL) + while ((UDataMemory_isLoaded(&tData)==false) && (pathBuffer = iter.next(pErrorCode)) != nullptr) { #ifdef UDATA_DEBUG fprintf(stderr, "ocd: trying path %s - ", pathBuffer); @@ -774,7 +774,7 @@ openCommonData(const char *path, /* Path from OpenChoice? */ #endif } if (U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } #if defined(OS390_STUBDATA) && defined(OS390BATCH) @@ -789,12 +789,12 @@ openCommonData(const char *path, /* Path from OpenChoice? */ #endif if (U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } if (!UDataMemory_isLoaded(&tData)) { /* no common data */ *pErrorCode=U_FILE_ACCESS_ERROR; - return NULL; + return nullptr; } /* we have mapped a file, check its header */ @@ -848,7 +848,7 @@ static UBool extendICUData(UErrorCode *pErr) /* How about if there is no pData, eh... */ UDataMemory_init(©PData); - if(pData != NULL) { + if(pData != nullptr) { UDatamemory_assign(©PData, pData); copyPData.map = 0; /* The mapping for this data is owned by the hash table */ copyPData.mapAddr = 0; /* which will unmap it when ICU is shut down. */ @@ -889,11 +889,11 @@ U_CAPI void U_EXPORT2 udata_setCommonData(const void *data, UErrorCode *pErrorCode) { UDataMemory dataMemory; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } - if(data==NULL) { + if(data==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -919,10 +919,10 @@ udata_setAppData(const char *path, const void *data, UErrorCode *err) { UDataMemory udm; - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return; } - if(data==NULL) { + if(data==nullptr) { *err=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -941,7 +941,7 @@ udata_setAppData(const char *path, const void *data, UErrorCode *err) * acceptable to the app. * * If the data is good, create and return a UDataMemory * * object that can be returned to the application. * - * Return NULL on any sort of failure. * + * Return nullptr on any sort of failure. * * * *----------------------------------------------------------------------------*/ static UDataMemory * @@ -958,19 +958,19 @@ checkDataItem UErrorCode *fatalErr /* Bad error, caller should return immediately */ ) { - UDataMemory *rDataMem = NULL; /* the new UDataMemory, to be returned. */ + UDataMemory *rDataMem = nullptr; /* the new UDataMemory, to be returned. */ if (U_FAILURE(*fatalErr)) { - return NULL; + return nullptr; } if(pHeader->dataHeader.magic1==0xda && pHeader->dataHeader.magic2==0x27 && - (isAcceptable==NULL || isAcceptable(context, type, name, &pHeader->info)) + (isAcceptable==nullptr || isAcceptable(context, type, name, &pHeader->info)) ) { rDataMem=UDataMemory_createNewInstance(fatalErr); if (U_FAILURE(*fatalErr)) { - return NULL; + return nullptr; } rDataMem->pHeader = pHeader; } else { @@ -1001,7 +1001,7 @@ static UDataMemory *doLoadFromIndividualFiles(const char *pkgName, /* init path iterator for individual files */ UDataPathIterator iter(dataPath, pkgName, path, tocEntryPathSuffix, false, pErrorCode); - while ((pathBuffer = iter.next(pErrorCode)) != NULL) + while ((pathBuffer = iter.next(pErrorCode)) != nullptr) { #ifdef UDATA_DEBUG fprintf(stderr, "UDATA: trying individual file %s\n", pathBuffer); @@ -1009,7 +1009,7 @@ static UDataMemory *doLoadFromIndividualFiles(const char *pkgName, if (uprv_mapFile(&dataMemory, pathBuffer, pErrorCode)) { pEntryData = checkDataItem(dataMemory.pHeader, isAcceptable, context, type, name, subErrorCode, pErrorCode); - if (pEntryData != NULL) { + if (pEntryData != nullptr) { /* Data is good. * Hand off ownership of the backing memory to the user's UDataMemory. * and return it. */ @@ -1027,7 +1027,7 @@ static UDataMemory *doLoadFromIndividualFiles(const char *pkgName, /* If we had a nasty error, bail out completely. */ if (U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } /* Otherwise remember that we found data but didn't like it for some reason */ @@ -1037,7 +1037,7 @@ static UDataMemory *doLoadFromIndividualFiles(const char *pkgName, fprintf(stderr, "%s\n", UDataMemory_isLoaded(&dataMemory)?"LOADED":"not loaded"); #endif } - return NULL; + return nullptr; } /** @@ -1068,7 +1068,7 @@ static UDataMemory *doLoadFromCommonData(UBool isICUData, const char * /*pkgName for (commonDataIndex = isICUData ? 0 : -1;;) { pCommonData=openCommonData(path, commonDataIndex, subErrorCode); /** search for pkg **/ - if(U_SUCCESS(*subErrorCode) && pCommonData!=NULL) { + if(U_SUCCESS(*subErrorCode) && pCommonData!=nullptr) { int32_t length; /* look up the data piece in the common data */ @@ -1077,15 +1077,15 @@ static UDataMemory *doLoadFromCommonData(UBool isICUData, const char * /*pkgName fprintf(stderr, "%s: pHeader=%p - %s\n", tocEntryName, (void*) pHeader, u_errorName(*subErrorCode)); #endif - if(pHeader!=NULL) { + if(pHeader!=nullptr) { pEntryData = checkDataItem(pHeader, isAcceptable, context, type, name, subErrorCode, pErrorCode); #ifdef UDATA_DEBUG fprintf(stderr, "pEntryData=%p\n", (void*) pEntryData); #endif if (U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if (pEntryData != NULL) { + if (pEntryData != nullptr) { pEntryData->length = length; return pEntryData; } @@ -1094,20 +1094,20 @@ static UDataMemory *doLoadFromCommonData(UBool isICUData, const char * /*pkgName // If we failed due to being out-of-memory, then stop early and report the error. if (*subErrorCode == U_MEMORY_ALLOCATION_ERROR) { *pErrorCode = *subErrorCode; - return NULL; + return nullptr; } /* Data wasn't found. If we were looking for an ICUData item and there is * more data available, load it and try again, * otherwise break out of this loop. */ if (!isICUData) { - return NULL; - } else if (pCommonData != NULL) { + return nullptr; + } else if (pCommonData != nullptr) { ++commonDataIndex; /* try the next data package */ } else if ((!checkedExtendedICUData) && extendICUData(subErrorCode)) { checkedExtendedICUData = true; - /* try this data package slot again: it changed from NULL to non-NULL */ + /* try this data package slot again: it changed from nullptr to non-nullptr */ } else { - return NULL; + return nullptr; } } } @@ -1160,7 +1160,7 @@ doOpenChoice(const char *path, const char *type, const char *name, UDataMemoryIsAcceptable *isAcceptable, void *context, UErrorCode *pErrorCode) { - UDataMemory *retVal = NULL; + UDataMemory *retVal = nullptr; const char *dataPath; @@ -1176,7 +1176,7 @@ doOpenChoice(const char *path, const char *type, const char *name, /* Is this path ICU data? */ - if(path == NULL || + if(path == nullptr || !strcmp(path, U_ICUDATA_ALIAS) || /* "ICUDATA" */ !uprv_strncmp(path, U_ICUDATA_NAME U_TREE_SEPARATOR_STRING, /* "icudt26e-" */ uprv_strlen(U_ICUDATA_NAME U_TREE_SEPARATOR_STRING)) || @@ -1189,10 +1189,10 @@ doOpenChoice(const char *path, const char *type, const char *name, /* remap from alternate path char to the main one */ CharString altSepPath; if(path) { - if(uprv_strchr(path,U_FILE_ALT_SEP_CHAR) != NULL) { + if(uprv_strchr(path,U_FILE_ALT_SEP_CHAR) != nullptr) { altSepPath.append(path, *pErrorCode); char *p; - while ((p = uprv_strchr(altSepPath.data(), U_FILE_ALT_SEP_CHAR)) != NULL) { + while ((p = uprv_strchr(altSepPath.data(), U_FILE_ALT_SEP_CHAR)) != nullptr) { *p = U_FILE_SEP_CHAR; } #if defined (UDATA_DEBUG) @@ -1210,7 +1210,7 @@ doOpenChoice(const char *path, const char *type, const char *name, CharString treeName; /* ======= Set up strings */ - if(path==NULL) { + if(path==nullptr) { pkgName.append(U_ICUDATA_NAME, *pErrorCode); } else { const char *pkg; @@ -1232,7 +1232,7 @@ doOpenChoice(const char *path, const char *type, const char *name, pkgName.append(U_ICUDATA_NAME, *pErrorCode); } else { pkgName.append(path, (int32_t)(treeChar-path), *pErrorCode); - if (first == NULL) { + if (first == nullptr) { /* This user data has no path, but there is a tree name. Look up the correct path from the data cache later. @@ -1271,7 +1271,7 @@ doOpenChoice(const char *path, const char *type, const char *name, tocEntryName.append(U_TREE_ENTRY_SEP_CHAR, *pErrorCode).append(name, *pErrorCode); tocEntryPath.append(U_FILE_SEP_CHAR, *pErrorCode).append(name, *pErrorCode); - if(type!=NULL && *type!=0) { + if(type!=nullptr && *type!=0) { tocEntryName.append(".", *pErrorCode).append(type, *pErrorCode); tocEntryPath.append(".", *pErrorCode).append(type, *pErrorCode); } @@ -1284,7 +1284,7 @@ doOpenChoice(const char *path, const char *type, const char *name, #endif #if !defined(ICU_DATA_DIR_WINDOWS) - if(path == NULL) { + if(path == nullptr) { path = COMMON_DATA_NAME; /* "icudt26e" */ } #else @@ -1309,7 +1309,7 @@ doOpenChoice(const char *path, const char *type, const char *name, #endif retVal = doLoadFromIndividualFiles(/* pkgName.data() */ "", tzFilesDir, tocEntryPathSuffix, /* path */ "", type, name, isAcceptable, context, &subErrorCode, pErrorCode); - if((retVal != NULL) || U_FAILURE(*pErrorCode)) { + if((retVal != nullptr) || U_FAILURE(*pErrorCode)) { return retVal; } } @@ -1324,7 +1324,7 @@ doOpenChoice(const char *path, const char *type, const char *name, retVal = doLoadFromCommonData(isICUData, pkgName.data(), dataPath, tocEntryPathSuffix, tocEntryName.data(), path, type, name, isAcceptable, context, &subErrorCode, pErrorCode); - if((retVal != NULL) || U_FAILURE(*pErrorCode)) { + if((retVal != nullptr) || U_FAILURE(*pErrorCode)) { return retVal; } } @@ -1339,7 +1339,7 @@ doOpenChoice(const char *path, const char *type, const char *name, if ((dataPath && *dataPath) || !isICUData) { retVal = doLoadFromIndividualFiles(pkgName.data(), dataPath, tocEntryPathSuffix, path, type, name, isAcceptable, context, &subErrorCode, pErrorCode); - if((retVal != NULL) || U_FAILURE(*pErrorCode)) { + if((retVal != nullptr) || U_FAILURE(*pErrorCode)) { return retVal; } } @@ -1354,7 +1354,7 @@ doOpenChoice(const char *path, const char *type, const char *name, retVal = doLoadFromCommonData(isICUData, pkgName.data(), dataPath, tocEntryPathSuffix, tocEntryName.data(), path, type, name, isAcceptable, context, &subErrorCode, pErrorCode); - if((retVal != NULL) || U_FAILURE(*pErrorCode)) { + if((retVal != nullptr) || U_FAILURE(*pErrorCode)) { return retVal; } } @@ -1369,7 +1369,7 @@ doOpenChoice(const char *path, const char *type, const char *name, retVal = doLoadFromCommonData(isICUData, pkgName.data(), "", tocEntryPathSuffix, tocEntryName.data(), path, type, name, isAcceptable, context, &subErrorCode, pErrorCode); - if((retVal != NULL) || U_FAILURE(*pErrorCode)) { + if((retVal != nullptr) || U_FAILURE(*pErrorCode)) { return retVal; } } @@ -1395,17 +1395,17 @@ U_CAPI UDataMemory * U_EXPORT2 udata_open(const char *path, const char *type, const char *name, UErrorCode *pErrorCode) { #ifdef UDATA_DEBUG - fprintf(stderr, "udata_open(): Opening: %s : %s . %s\n", (path?path:"NULL"), name, type); + fprintf(stderr, "udata_open(): Opening: %s : %s . %s\n", (path?path:"nullptr"), name, type); fflush(stderr); #endif - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { - return NULL; - } else if(name==NULL || *name==0) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; + } else if(name==nullptr || *name==0) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } else { - return doOpenChoice(path, type, name, NULL, NULL, pErrorCode); + return doOpenChoice(path, type, name, nullptr, nullptr, pErrorCode); } } @@ -1416,14 +1416,14 @@ udata_openChoice(const char *path, const char *type, const char *name, UDataMemoryIsAcceptable *isAcceptable, void *context, UErrorCode *pErrorCode) { #ifdef UDATA_DEBUG - fprintf(stderr, "udata_openChoice(): Opening: %s : %s . %s\n", (path?path:"NULL"), name, type); + fprintf(stderr, "udata_openChoice(): Opening: %s : %s . %s\n", (path?path:"nullptr"), name, type); #endif - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { - return NULL; - } else if(name==NULL || *name==0 || isAcceptable==NULL) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; + } else if(name==nullptr || *name==0 || isAcceptable==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } else { return doOpenChoice(path, type, name, isAcceptable, context, pErrorCode); } @@ -1433,8 +1433,8 @@ udata_openChoice(const char *path, const char *type, const char *name, U_CAPI void U_EXPORT2 udata_getInfo(UDataMemory *pData, UDataInfo *pInfo) { - if(pInfo!=NULL) { - if(pData!=NULL && pData->pHeader!=NULL) { + if(pInfo!=nullptr) { + if(pData!=nullptr && pData->pHeader!=nullptr) { const UDataInfo *info=&pData->pHeader->info; uint16_t dataInfoSize=udata_getInfoSize(info); if(pInfo->size>dataInfoSize) { diff --git a/icu4c/source/common/udatamem.cpp b/icu4c/source/common/udatamem.cpp index 0f80de28eb8..02be852320d 100644 --- a/icu4c/source/common/udatamem.cpp +++ b/icu4c/source/common/udatamem.cpp @@ -42,10 +42,10 @@ U_CFUNC UDataMemory *UDataMemory_createNewInstance(UErrorCode *pErr) { UDataMemory *This; if (U_FAILURE(*pErr)) { - return NULL; + return nullptr; } This = (UDataMemory *)uprv_malloc(sizeof(UDataMemory)); - if (This == NULL) { + if (This == nullptr) { *pErr = U_MEMORY_ALLOCATION_ERROR; } else { UDataMemory_init(This); @@ -59,7 +59,7 @@ U_CFUNC const DataHeader * UDataMemory_normalizeDataPointer(const void *p) { /* allow the data to be optionally prepended with an alignment-forcing double value */ const DataHeader *pdh = (const DataHeader *)p; - if(pdh==NULL || (pdh->dataHeader.magic1==0xda && pdh->dataHeader.magic2==0x27)) { + if(pdh==nullptr || (pdh->dataHeader.magic1==0xda && pdh->dataHeader.magic2==0x27)) { return pdh; } else { #if U_PLATFORM == U_PF_OS400 @@ -90,7 +90,7 @@ U_CFUNC void UDataMemory_setData (UDataMemory *This, const void *dataAddr) { U_CAPI void U_EXPORT2 udata_close(UDataMemory *pData) { - if(pData!=NULL) { + if(pData!=nullptr) { uprv_unmapFile(pData); if(pData->heapAllocated ) { uprv_free(pData); @@ -102,10 +102,10 @@ udata_close(UDataMemory *pData) { U_CAPI const void * U_EXPORT2 udata_getMemory(UDataMemory *pData) { - if(pData!=NULL && pData->pHeader!=NULL) { + if(pData!=nullptr && pData->pHeader!=nullptr) { return (char *)(pData->pHeader)+udata_getHeaderSize(pData->pHeader); } else { - return NULL; + return nullptr; } } @@ -131,7 +131,7 @@ udata_getMemory(UDataMemory *pData) { */ U_CAPI int32_t U_EXPORT2 udata_getLength(const UDataMemory *pData) { - if(pData!=NULL && pData->pHeader!=NULL && pData->length>=0) { + if(pData!=nullptr && pData->pHeader!=nullptr && pData->length>=0) { /* * subtract the header size, * return only the size of the actual data starting at udata_getMemory() @@ -149,13 +149,13 @@ udata_getLength(const UDataMemory *pData) { */ U_CAPI const void * U_EXPORT2 udata_getRawMemory(const UDataMemory *pData) { - if(pData!=NULL && pData->pHeader!=NULL) { + if(pData!=nullptr && pData->pHeader!=nullptr) { return pData->pHeader; } else { - return NULL; + return nullptr; } } U_CFUNC UBool UDataMemory_isLoaded(const UDataMemory *This) { - return This->pHeader != NULL; + return This->pHeader != nullptr; } diff --git a/icu4c/source/common/udataswp.cpp b/icu4c/source/common/udataswp.cpp index 86f302bd9c3..bbce1a8ecd7 100644 --- a/icu4c/source/common/udataswp.cpp +++ b/icu4c/source/common/udataswp.cpp @@ -38,10 +38,10 @@ uprv_swapArray16(const UDataSwapper *ds, int32_t count; uint16_t x; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&1)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&1)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -63,10 +63,10 @@ static int32_t U_CALLCONV uprv_copyArray16(const UDataSwapper *ds, const void *inData, int32_t length, void *outData, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&1)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&1)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -86,10 +86,10 @@ uprv_swapArray32(const UDataSwapper *ds, int32_t count; uint32_t x; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&3)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&3)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -111,10 +111,10 @@ static int32_t U_CALLCONV uprv_copyArray32(const UDataSwapper *ds, const void *inData, int32_t length, void *outData, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&3)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&3)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -133,10 +133,10 @@ uprv_swapArray64(const UDataSwapper *ds, uint64_t *q; int32_t count; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&7)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&7)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -160,10 +160,10 @@ static int32_t U_CALLCONV uprv_copyArray64(const UDataSwapper *ds, const void *inData, int32_t length, void *outData, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length&7)!=0 || outData==NULL) { + if(ds==nullptr || inData==nullptr || length<0 || (length&7)!=0 || outData==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -236,10 +236,10 @@ udata_swapInvStringBlock(const UDataSwapper *ds, const char *inChars; int32_t stringsLength; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<0 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -273,7 +273,7 @@ udata_printError(const UDataSwapper *ds, ...) { va_list args; - if(ds->printError!=NULL) { + if(ds->printError!=nullptr) { va_start(args, fmt); ds->printError(ds->printErrorContext, fmt, args); va_end(args); @@ -290,10 +290,10 @@ udata_swapDataHeader(const UDataSwapper *ds, uint16_t headerSize, infoSize; /* argument checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<-1 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<-1 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -365,19 +365,19 @@ udata_openSwapper(UBool inIsBigEndian, uint8_t inCharset, UErrorCode *pErrorCode) { UDataSwapper *swapper; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { - return NULL; + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; } if(inCharset>U_EBCDIC_FAMILY || outCharset>U_EBCDIC_FAMILY) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } /* allocate the swapper */ swapper=(UDataSwapper *)uprv_malloc(sizeof(UDataSwapper)); - if(swapper==NULL) { + if(swapper==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(swapper, 0, sizeof(UDataSwapper)); @@ -423,15 +423,15 @@ udata_openSwapperForInputData(const void *data, int32_t length, UBool inIsBigEndian; int8_t inCharset; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { - return NULL; + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; } - if( data==NULL || + if( data==nullptr || (length>=0 && length<(int32_t)sizeof(DataHeader)) || outCharset>U_EBCDIC_FAMILY ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } pHeader=(const DataHeader *)data; diff --git a/icu4c/source/common/uenum.cpp b/icu4c/source/common/uenum.cpp index 11d895ebcd7..7f01fe394db 100644 --- a/icu4c/source/common/uenum.cpp +++ b/icu4c/source/common/uenum.cpp @@ -33,21 +33,21 @@ static const int32_t PAD = 8; or reallocating it if at least 'capacity' bytes are not available. */ static void* _getBuffer(UEnumeration* en, int32_t capacity) { - if (en->baseContext != NULL) { + if (en->baseContext != nullptr) { if (((_UEnumBuffer*) en->baseContext)->len < capacity) { capacity += PAD; en->baseContext = uprv_realloc(en->baseContext, sizeof(int32_t) + capacity); - if (en->baseContext == NULL) { - return NULL; + if (en->baseContext == nullptr) { + return nullptr; } ((_UEnumBuffer*) en->baseContext)->len = capacity; } } else { capacity += PAD; en->baseContext = uprv_malloc(sizeof(int32_t) + capacity); - if (en->baseContext == NULL) { - return NULL; + if (en->baseContext == nullptr) { + return nullptr; } ((_UEnumBuffer*) en->baseContext)->len = capacity; } @@ -59,7 +59,7 @@ U_CAPI void U_EXPORT2 uenum_close(UEnumeration* en) { if (en) { - if (en->close != NULL) { + if (en->close != nullptr) { if (en->baseContext) { uprv_free(en->baseContext); } @@ -76,7 +76,7 @@ uenum_count(UEnumeration* en, UErrorCode* status) if (!en || U_FAILURE(*status)) { return -1; } - if (en->count != NULL) { + if (en->count != nullptr) { return en->count(en, status); } else { *status = U_UNSUPPORTED_ERROR; @@ -90,13 +90,13 @@ uenum_unextDefault(UEnumeration* en, int32_t* resultLength, UErrorCode* status) { - UChar *ustr = NULL; + UChar *ustr = nullptr; int32_t len = 0; - if (en->next != NULL) { + if (en->next != nullptr) { const char *cstr = en->next(en, &len, status); - if (cstr != NULL) { + if (cstr != nullptr) { ustr = (UChar*) _getBuffer(en, (len+1) * sizeof(UChar)); - if (ustr == NULL) { + if (ustr == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { u_charsToUChars(cstr, ustr, len+1); @@ -117,23 +117,23 @@ uenum_nextDefault(UEnumeration* en, int32_t* resultLength, UErrorCode* status) { - if (en->uNext != NULL) { + if (en->uNext != nullptr) { char *tempCharVal; const UChar *tempUCharVal = en->uNext(en, resultLength, status); - if (tempUCharVal == NULL) { - return NULL; + if (tempUCharVal == nullptr) { + return nullptr; } tempCharVal = (char*) _getBuffer(en, (*resultLength+1) * sizeof(char)); if (!tempCharVal) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } u_UCharsToChars(tempUCharVal, tempCharVal, *resultLength + 1); return tempCharVal; } else { *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } } @@ -143,13 +143,13 @@ uenum_unext(UEnumeration* en, UErrorCode* status) { if (!en || U_FAILURE(*status)) { - return NULL; + return nullptr; } - if (en->uNext != NULL) { + if (en->uNext != nullptr) { return en->uNext(en, resultLength, status); } else { *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } } @@ -159,10 +159,10 @@ uenum_next(UEnumeration* en, UErrorCode* status) { if (!en || U_FAILURE(*status)) { - return NULL; + return nullptr; } - if (en->next != NULL) { - if (resultLength != NULL) { + if (en->next != nullptr) { + if (resultLength != nullptr) { return en->next(en, resultLength, status); } else { @@ -171,7 +171,7 @@ uenum_next(UEnumeration* en, } } else { *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } } @@ -181,7 +181,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status) if (!en || U_FAILURE(*status)) { return; } - if (en->reset != NULL) { + if (en->reset != nullptr) { en->reset(en, status); } else { *status = U_UNSUPPORTED_ERROR; diff --git a/icu4c/source/common/uhash.cpp b/icu4c/source/common/uhash.cpp index a04f9606c57..d042a882190 100644 --- a/icu4c/source/common/uhash.cpp +++ b/icu4c/source/common/uhash.cpp @@ -44,9 +44,9 @@ * The central function is _uhash_find(). This function looks for a * slot matching the given key and hashcode. If one is found, it * returns a pointer to that slot. If the table is full, and no match - * is found, it returns NULL -- in theory. This would make the code + * is found, it returns nullptr -- in theory. This would make the code * more complicated, since all callers of _uhash_find() would then - * have to check for a NULL result. To keep this from happening, we + * have to check for a nullptr result. To keep this from happening, we * don't allow the table to fill. When there is only one * empty/deleted slot left, uhash_put() will refuse to increase the * count, and fail. This simplifies the code. In practice, one will @@ -120,10 +120,10 @@ static const float RESIZE_POLICY_RATIO_TABLE[6] = { /* This macro expects a UHashTok.pointer as its keypointer and valuepointer parameters */ #define HASH_DELETE_KEY_VALUE(hash, keypointer, valuepointer) UPRV_BLOCK_MACRO_BEGIN { \ - if (hash->keyDeleter != NULL && keypointer != NULL) { \ + if (hash->keyDeleter != nullptr && keypointer != nullptr) { \ (*hash->keyDeleter)(keypointer); \ } \ - if (hash->valueDeleter != NULL && valuepointer != NULL) { \ + if (hash->valueDeleter != nullptr && valuepointer != nullptr) { \ (*hash->valueDeleter)(valuepointer); \ } \ } UPRV_BLOCK_MACRO_END @@ -148,16 +148,16 @@ _uhash_setElement(UHashtable *hash, UHashElement* e, UHashTok key, UHashTok value, int8_t hint) { UHashTok oldValue = e->value; - if (hash->keyDeleter != NULL && e->key.pointer != NULL && + if (hash->keyDeleter != nullptr && e->key.pointer != nullptr && e->key.pointer != key.pointer) { /* Avoid double deletion */ (*hash->keyDeleter)(e->key.pointer); } - if (hash->valueDeleter != NULL) { - if (oldValue.pointer != NULL && + if (hash->valueDeleter != nullptr) { + if (oldValue.pointer != nullptr && oldValue.pointer != value.pointer) { /* Avoid double deletion */ (*hash->valueDeleter)(oldValue.pointer); } - oldValue.pointer = NULL; + oldValue.pointer = nullptr; } /* Compilers should copy the UHashTok union correctly, but even if * they do, memory heap tools (e.g. BoundsChecker) can get @@ -187,13 +187,13 @@ _uhash_internalRemoveElement(UHashtable *hash, UHashElement* e) { UHashTok empty; U_ASSERT(!IS_EMPTY_OR_DELETED(e->hashcode)); --hash->count; - empty.pointer = NULL; empty.integer = 0; + empty.pointer = nullptr; empty.integer = 0; return _uhash_setElement(hash, e, HASH_DELETED, empty, empty, 0); } static void _uhash_internalSetResizePolicy(UHashtable *hash, enum UHashResizePolicy policy) { - U_ASSERT(hash != NULL); + U_ASSERT(hash != nullptr); U_ASSERT(((int32_t)policy) >= 0); U_ASSERT(((int32_t)policy) < 3); hash->lowWaterRatio = RESIZE_POLICY_RATIO_TABLE[policy * 2]; @@ -227,12 +227,12 @@ _uhash_allocate(UHashtable *hash, p = hash->elements = (UHashElement*) uprv_malloc(sizeof(UHashElement) * hash->length); - if (hash->elements == NULL) { + if (hash->elements == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } - emptytok.pointer = NULL; /* Only one of these two is needed */ + emptytok.pointer = nullptr; /* Only one of these two is needed */ emptytok.integer = 0; /* but we don't know which one. */ limit = p + hash->length; @@ -256,22 +256,22 @@ _uhash_init(UHashtable *result, int32_t primeIndex, UErrorCode *status) { - if (U_FAILURE(*status)) return NULL; - U_ASSERT(keyHash != NULL); - U_ASSERT(keyComp != NULL); + if (U_FAILURE(*status)) return nullptr; + U_ASSERT(keyHash != nullptr); + U_ASSERT(keyComp != nullptr); result->keyHasher = keyHash; result->keyComparator = keyComp; result->valueComparator = valueComp; - result->keyDeleter = NULL; - result->valueDeleter = NULL; + result->keyDeleter = nullptr; + result->valueDeleter = nullptr; result->allocated = false; _uhash_internalSetResizePolicy(result, U_GROW); _uhash_allocate(result, primeIndex, status); if (U_FAILURE(*status)) { - return NULL; + return nullptr; } return result; @@ -285,12 +285,12 @@ _uhash_create(UHashFunction *keyHash, UErrorCode *status) { UHashtable *result; - if (U_FAILURE(*status)) return NULL; + if (U_FAILURE(*status)) return nullptr; result = (UHashtable*) uprv_malloc(sizeof(UHashtable)); - if (result == NULL) { + if (result == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } _uhash_init(result, keyHash, keyComp, valueComp, primeIndex, status); @@ -298,7 +298,7 @@ _uhash_create(UHashFunction *keyHash, if (U_FAILURE(*status)) { uprv_free(result); - return NULL; + return nullptr; } return result; @@ -323,7 +323,7 @@ _uhash_create(UHashFunction *keyHash, * values so that the searches stop within a reasonable amount of time. * This can be changed by changing the high/low water marks. * - * In theory, this function can return NULL, if it is full (no empty + * In theory, this function can return nullptr, if it is full (no empty * or deleted slots) and if no matching key is found. In practice, we * prevent this elsewhere (in uhash_put) by making sure the last slot * in the table is never filled. @@ -424,7 +424,7 @@ _uhash_rehash(UHashtable *hash, UErrorCode *status) { for (i = oldLength - 1; i >= 0; --i) { if (!IS_EMPTY_OR_DELETED(old[i].hashcode)) { UHashElement *e = _uhash_find(hash, old[i].key, old[i].hashcode); - U_ASSERT(e != NULL); + U_ASSERT(e != nullptr); U_ASSERT(e->hashcode == HASH_EMPTY); e->key = old[i].key; e->value = old[i].value; @@ -448,8 +448,8 @@ _uhash_remove(UHashtable *hash, */ UHashTok result; UHashElement* e = _uhash_find(hash, key, hash->keyHasher(key)); - U_ASSERT(e != NULL); - result.pointer = NULL; + U_ASSERT(e != nullptr); + result.pointer = nullptr; result.integer = 0; if (!IS_EMPTY_OR_DELETED(e->hashcode)) { result = _uhash_internalRemoveElement(hash, e); @@ -470,7 +470,7 @@ _uhash_put(UHashtable *hash, /* Put finds the position in the table for the new value. If the * key is already in the table, it is deleted, if there is a - * non-NULL keyDeleter. Then the key, the hash and the value are + * non-nullptr keyDeleter. Then the key, the hash and the value are * all put at the position in their respective arrays. */ int32_t hashcode; @@ -480,12 +480,12 @@ _uhash_put(UHashtable *hash, if (U_FAILURE(*status)) { goto err; } - U_ASSERT(hash != NULL); + U_ASSERT(hash != nullptr); if ((hint & HINT_VALUE_POINTER) ? - value.pointer == NULL : + value.pointer == nullptr : value.integer == 0 && (hint & HINT_ALLOW_ZERO) == 0) { - /* Disallow storage of NULL values, since NULL is returned by - * get() to indicate an absent key. Storing NULL == removing. + /* Disallow storage of nullptr values, since nullptr is returned by + * get() to indicate an absent key. Storing nullptr == removing. */ return _uhash_remove(hash, key); } @@ -498,12 +498,12 @@ _uhash_put(UHashtable *hash, hashcode = (*hash->keyHasher)(key); e = _uhash_find(hash, key, hashcode); - U_ASSERT(e != NULL); + U_ASSERT(e != nullptr); if (IS_EMPTY_OR_DELETED(e->hashcode)) { /* Important: We must never actually fill the table up. If we - * do so, then _uhash_find() will return NULL, and we'll have - * to check for NULL after every call to _uhash_find(). To + * do so, then _uhash_find() will return nullptr, and we'll have + * to check for nullptr after every call to _uhash_find(). To * avoid this we make sure there is always at least one empty * or deleted slot in the table. This only is a problem if we * are out of memory and rehash isn't working. @@ -518,18 +518,18 @@ _uhash_put(UHashtable *hash, } /* We must in all cases handle storage properly. If there was an - * old key, then it must be deleted (if the deleter != NULL). + * old key, then it must be deleted (if the deleter != nullptr). * Make hashcodes stored in table positive. */ return _uhash_setElement(hash, e, hashcode & 0x7FFFFFFF, key, value, hint); err: - /* If the deleters are non-NULL, this method adopts its key and/or + /* If the deleters are non-nullptr, this method adopts its key and/or * value arguments, and we must be sure to delete the key and/or * value in all cases, even upon failure. */ HASH_DELETE_KEY_VALUE(hash, key.pointer, value.pointer); - emptytok.pointer = NULL; emptytok.integer = 0; + emptytok.pointer = nullptr; emptytok.integer = 0; return emptytok; } @@ -591,19 +591,19 @@ uhash_initSize(UHashtable *fillinResult, U_CAPI void U_EXPORT2 uhash_close(UHashtable *hash) { - if (hash == NULL) { + if (hash == nullptr) { return; } - if (hash->elements != NULL) { - if (hash->keyDeleter != NULL || hash->valueDeleter != NULL) { + if (hash->elements != nullptr) { + if (hash->keyDeleter != nullptr || hash->valueDeleter != nullptr) { int32_t pos=UHASH_FIRST; UHashElement *e; - while ((e = (UHashElement*) uhash_nextElement(hash, &pos)) != NULL) { + while ((e = (UHashElement*) uhash_nextElement(hash, &pos)) != nullptr) { HASH_DELETE_KEY_VALUE(hash, e->key.pointer, e->value.pointer); } } uprv_free(hash->elements); - hash->elements = NULL; + hash->elements = nullptr; } if (hash->allocated) { uprv_free(hash); @@ -828,9 +828,9 @@ U_CAPI void U_EXPORT2 uhash_removeAll(UHashtable *hash) { int32_t pos = UHASH_FIRST; const UHashElement *e; - U_ASSERT(hash != NULL); + U_ASSERT(hash != nullptr); if (hash->count != 0) { - while ((e = uhash_nextElement(hash, &pos)) != NULL) { + while ((e = uhash_nextElement(hash, &pos)) != nullptr) { uhash_removeElement(hash, e); } } @@ -866,7 +866,7 @@ uhash_find(const UHashtable *hash, const void* key) { const UHashElement *e; keyholder.pointer = (void*) key; e = _uhash_find(hash, keyholder, hash->keyHasher(keyholder)); - return IS_EMPTY_OR_DELETED(e->hashcode) ? NULL : e; + return IS_EMPTY_OR_DELETED(e->hashcode) ? nullptr : e; } U_CAPI const UHashElement* U_EXPORT2 @@ -875,7 +875,7 @@ uhash_nextElement(const UHashtable *hash, int32_t *pos) { * EMPTY and not DELETED. */ int32_t i; - U_ASSERT(hash != NULL); + U_ASSERT(hash != nullptr); for (i = *pos + 1; i < hash->length; ++i) { if (!IS_EMPTY_OR_DELETED(hash->elements[i].hashcode)) { *pos = i; @@ -884,18 +884,18 @@ uhash_nextElement(const UHashtable *hash, int32_t *pos) { } /* No more elements */ - return NULL; + return nullptr; } U_CAPI void* U_EXPORT2 uhash_removeElement(UHashtable *hash, const UHashElement* e) { - U_ASSERT(hash != NULL); - U_ASSERT(e != NULL); + U_ASSERT(hash != nullptr); + U_ASSERT(e != nullptr); if (!IS_EMPTY_OR_DELETED(e->hashcode)) { UHashElement *nce = (UHashElement *)e; return _uhash_internalRemoveElement(hash, nce).pointer; } - return NULL; + return nullptr; } /******************************************************************** @@ -929,19 +929,19 @@ uhash_tokp(void* p) { U_CAPI int32_t U_EXPORT2 uhash_hashUChars(const UHashTok key) { const UChar *s = (const UChar *)key.pointer; - return s == NULL ? 0 : ustr_hashUCharsN(s, u_strlen(s)); + return s == nullptr ? 0 : ustr_hashUCharsN(s, u_strlen(s)); } U_CAPI int32_t U_EXPORT2 uhash_hashChars(const UHashTok key) { const char *s = (const char *)key.pointer; - return s == NULL ? 0 : static_cast(ustr_hashCharsN(s, static_cast(uprv_strlen(s)))); + return s == nullptr ? 0 : static_cast(ustr_hashCharsN(s, static_cast(uprv_strlen(s)))); } U_CAPI int32_t U_EXPORT2 uhash_hashIChars(const UHashTok key) { const char *s = (const char *)key.pointer; - return s == NULL ? 0 : ustr_hashICharsN(s, static_cast(uprv_strlen(s))); + return s == nullptr ? 0 : ustr_hashICharsN(s, static_cast(uprv_strlen(s))); } U_CAPI UBool U_EXPORT2 @@ -960,10 +960,10 @@ uhash_equals(const UHashtable* hash1, const UHashtable* hash2){ * with 64-bit pointers and 32-bit integer hashes. * A valueComparator is normally optional. */ - if (hash1==NULL || hash2==NULL || + if (hash1==nullptr || hash2==nullptr || hash1->keyComparator != hash2->keyComparator || hash1->valueComparator != hash2->valueComparator || - hash1->valueComparator == NULL) + hash1->valueComparator == nullptr) { /* Normally we would return an error here about incompatible hash tables, @@ -1007,7 +1007,7 @@ uhash_compareUChars(const UHashTok key1, const UHashTok key2) { if (p1 == p2) { return true; } - if (p1 == NULL || p2 == NULL) { + if (p1 == nullptr || p2 == nullptr) { return false; } while (*p1 != 0 && *p1 == *p2) { @@ -1024,7 +1024,7 @@ uhash_compareChars(const UHashTok key1, const UHashTok key2) { if (p1 == p2) { return true; } - if (p1 == NULL || p2 == NULL) { + if (p1 == nullptr || p2 == nullptr) { return false; } while (*p1 != 0 && *p1 == *p2) { @@ -1041,7 +1041,7 @@ uhash_compareIChars(const UHashTok key1, const UHashTok key2) { if (p1 == p2) { return true; } - if (p1 == NULL || p2 == NULL) { + if (p1 == nullptr || p2 == nullptr) { return false; } while (*p1 != 0 && uprv_tolower(*p1) == uprv_tolower(*p2)) { diff --git a/icu4c/source/common/uidna.cpp b/icu4c/source/common/uidna.cpp index 7135a166f21..26cbc3fe4cc 100644 --- a/icu4c/source/common/uidna.cpp +++ b/icu4c/source/common/uidna.cpp @@ -209,7 +209,7 @@ _internal_toASCII(const UChar* src, int32_t srcLength, reqLength=0; int32_t namePrepOptions = ((options & UIDNA_ALLOW_UNASSIGNED) != 0) ? USPREP_ALLOW_UNASSIGNED: 0; - UBool* caseFlags = NULL; + UBool* caseFlags = nullptr; // the source contains all ascii codepoints UBool srcIsASCII = true; @@ -229,7 +229,7 @@ _internal_toASCII(const UChar* src, int32_t srcLength, if(srcLength > b1Capacity){ b1 = (UChar*) uprv_malloc(srcLength * U_SIZEOF_UCHAR); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -257,7 +257,7 @@ _internal_toASCII(const UChar* src, int32_t srcLength, uprv_free(b1); } b1 = (UChar*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -339,7 +339,7 @@ _internal_toASCII(const UChar* src, int32_t srcLength, // redo processing of string /* we do not have enough room so grow the buffer*/ b2 = (UChar*) uprv_malloc(b2Len * U_SIZEOF_UCHAR); - if(b2 == NULL){ + if(b2 == nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -407,14 +407,14 @@ _internal_toUnicode(const UChar* src, int32_t srcLength, UChar b1Stack[MAX_LABEL_BUFFER_SIZE], b2Stack[MAX_LABEL_BUFFER_SIZE], b3Stack[MAX_LABEL_BUFFER_SIZE]; //initialize pointers to stack buffers - UChar *b1 = b1Stack, *b2 = b2Stack, *b1Prime=NULL, *b3=b3Stack; + UChar *b1 = b1Stack, *b2 = b2Stack, *b1Prime=nullptr, *b3=b3Stack; int32_t b1Len = 0, b2Len, b1PrimeLen, b3Len, b1Capacity = MAX_LABEL_BUFFER_SIZE, b2Capacity = MAX_LABEL_BUFFER_SIZE, b3Capacity = MAX_LABEL_BUFFER_SIZE, reqLength=0; - UBool* caseFlags = NULL; + UBool* caseFlags = nullptr; UBool srcIsASCII = true; /*UBool srcIsLDH = true; @@ -459,7 +459,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength, // redo processing of string /* we do not have enough room so grow the buffer*/ b1 = (UChar*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -499,7 +499,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength, // redo processing of string /* we do not have enough room so grow the buffer*/ b2 = (UChar*) uprv_malloc(b2Len * U_SIZEOF_UCHAR); - if(b2==NULL){ + if(b2==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -517,7 +517,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength, // redo processing of string /* we do not have enough room so grow the buffer*/ b3 = (UChar*) uprv_malloc(b3Len * U_SIZEOF_UCHAR); - if(b3==NULL){ + if(b3==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -614,10 +614,10 @@ uidna_toASCII(const UChar* src, int32_t srcLength, UParseError* parseError, UErrorCode* status){ - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return 0; } - if((src==NULL) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ + if((src==nullptr) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -643,10 +643,10 @@ uidna_toUnicode(const UChar* src, int32_t srcLength, UParseError* parseError, UErrorCode* status){ - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return 0; } - if( (src==NULL) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ + if( (src==nullptr) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -672,10 +672,10 @@ uidna_IDNToASCII( const UChar *src, int32_t srcLength, UParseError *parseError, UErrorCode *status){ - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return 0; } - if((src==NULL) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ + if((src==nullptr) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -765,10 +765,10 @@ uidna_IDNToUnicode( const UChar* src, int32_t srcLength, UParseError* parseError, UErrorCode* status){ - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return 0; } - if((src==NULL) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ + if((src==nullptr) || (srcLength < -1) || (destCapacity<0) || (!dest && destCapacity > 0)){ *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -863,7 +863,7 @@ uidna_compare( const UChar *s1, int32_t length1, int32_t options, UErrorCode* status){ - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return -1; } @@ -878,7 +878,7 @@ uidna_compare( const UChar *s1, int32_t length1, if(*status == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string b1 = (UChar*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } @@ -893,7 +893,7 @@ uidna_compare( const UChar *s1, int32_t length1, if(*status == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string b2 = (UChar*) uprv_malloc(b2Len * U_SIZEOF_UCHAR); - if(b2==NULL){ + if(b2==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } diff --git a/icu4c/source/common/uinvchar.cpp b/icu4c/source/common/uinvchar.cpp index ffce3ec158d..3fe92a48cd5 100644 --- a/icu4c/source/common/uinvchar.cpp +++ b/icu4c/source/common/uinvchar.cpp @@ -303,10 +303,10 @@ uprv_ebcdicFromAscii(const UDataSwapper *ds, int32_t count; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<0 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -340,10 +340,10 @@ uprv_copyAscii(const UDataSwapper *ds, int32_t count; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<0 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -380,10 +380,10 @@ uprv_asciiFromEbcdic(const UDataSwapper *ds, int32_t count; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<0 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -417,10 +417,10 @@ uprv_copyEbcdic(const UDataSwapper *ds, int32_t count; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || length<0 || (length>0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || length<0 || (length>0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -463,7 +463,7 @@ uprv_compareInvAscii(const UDataSwapper *ds, UChar32 c1, c2; uint8_t c; - if(outString==NULL || outLength<-1 || localString==NULL || localLength<-1) { + if(outString==nullptr || outLength<-1 || localString==nullptr || localLength<-1) { return 0; } @@ -509,7 +509,7 @@ uprv_compareInvEbcdic(const UDataSwapper *ds, UChar32 c1, c2; uint8_t c; - if(outString==NULL || outLength<-1 || localString==NULL || localLength<-1) { + if(outString==nullptr || outLength<-1 || localString==nullptr || localLength<-1) { return 0; } diff --git a/icu4c/source/common/uiter.cpp b/icu4c/source/common/uiter.cpp index c4ab7d6d565..4c2f4bdf49f 100644 --- a/icu4c/source/common/uiter.cpp +++ b/icu4c/source/common/uiter.cpp @@ -74,7 +74,7 @@ static const UCharIterator noopIterator={ noopCurrent, noopCurrent, noopCurrent, - NULL, + nullptr, noopGetState, noopSetState }; @@ -185,9 +185,9 @@ stringIteratorGetState(const UCharIterator *iter) { static void U_CALLCONV stringIteratorSetState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { /* do nothing */ - } else if(iter==NULL) { + } else if(iter==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } else if((int32_t)statestart || iter->limit<(int32_t)state) { *pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR; @@ -205,7 +205,7 @@ static const UCharIterator stringIterator={ stringIteratorCurrent, stringIteratorNext, stringIteratorPrevious, - NULL, + nullptr, stringIteratorGetState, stringIteratorSetState }; @@ -291,7 +291,7 @@ static const UCharIterator utf16BEIterator={ utf16BEIteratorCurrent, utf16BEIteratorNext, utf16BEIteratorPrevious, - NULL, + nullptr, stringIteratorGetState, stringIteratorSetState }; @@ -323,9 +323,9 @@ utf16BE_strlen(const char *s) { U_CAPI void U_EXPORT2 uiter_setUTF16BE(UCharIterator *iter, const char *s, int32_t length) { - if(iter!=NULL) { + if(iter!=nullptr) { /* allow only even-length strings (the input length counts bytes) */ - if(s!=NULL && (length==-1 || (length>=0 && IS_EVEN(length)))) { + if(s!=nullptr && (length==-1 || (length>=0 && IS_EVEN(length)))) { /* length/=2, except that >>=1 also works for -1 (-1/2==0, -1>>1==-1) */ length>>=1; @@ -445,9 +445,9 @@ characterIteratorGetState(const UCharIterator *iter) { static void U_CALLCONV characterIteratorSetState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { /* do nothing */ - } else if(iter==NULL || iter->context==NULL) { + } else if(iter==nullptr || iter->context==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } else if((int32_t)state<((CharacterIterator *)(iter->context))->startIndex() || ((CharacterIterator *)(iter->context))->endIndex()<(int32_t)state) { *pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR; @@ -465,7 +465,7 @@ static const UCharIterator characterIteratorWrapper={ characterIteratorCurrent, characterIteratorNext, characterIteratorPrevious, - NULL, + nullptr, characterIteratorGetState, characterIteratorSetState }; @@ -529,7 +529,7 @@ static const UCharIterator replaceableIterator={ replaceableIteratorCurrent, replaceableIteratorNext, replaceableIteratorPrevious, - NULL, + nullptr, stringIteratorGetState, stringIteratorSetState }; @@ -951,9 +951,9 @@ utf8IteratorSetState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { /* do nothing */ - } else if(iter==NULL) { + } else if(iter==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } else if(state==utf8IteratorGetState(iter)) { /* setting to the current state: no-op */ @@ -995,7 +995,7 @@ static const UCharIterator utf8Iterator={ utf8IteratorCurrent, utf8IteratorNext, utf8IteratorPrevious, - NULL, + nullptr, utf8IteratorGetState, utf8IteratorSetState }; @@ -1085,7 +1085,7 @@ uiter_previous32(UCharIterator *iter) { U_CAPI uint32_t U_EXPORT2 uiter_getState(const UCharIterator *iter) { - if(iter==NULL || iter->getState==NULL) { + if(iter==nullptr || iter->getState==nullptr) { return UITER_NO_STATE; } else { return iter->getState(iter); @@ -1094,11 +1094,11 @@ uiter_getState(const UCharIterator *iter) { U_CAPI void U_EXPORT2 uiter_setState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { /* do nothing */ - } else if(iter==NULL) { + } else if(iter==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - } else if(iter->setState==NULL) { + } else if(iter->setState==nullptr) { *pErrorCode=U_UNSUPPORTED_ERROR; } else { iter->setState(iter, state, pErrorCode); diff --git a/icu4c/source/common/ulist.cpp b/icu4c/source/common/ulist.cpp index 57344715de5..5bdf534c84d 100644 --- a/icu4c/source/common/ulist.cpp +++ b/icu4c/source/common/ulist.cpp @@ -34,21 +34,21 @@ struct UList { static void ulist_addFirstItem(UList *list, UListNode *newItem); U_CAPI UList *U_EXPORT2 ulist_createEmptyList(UErrorCode *status) { - UList *newList = NULL; + UList *newList = nullptr; if (U_FAILURE(*status)) { - return NULL; + return nullptr; } newList = (UList *)uprv_malloc(sizeof(UList)); - if (newList == NULL) { + if (newList == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - newList->curr = NULL; - newList->head = NULL; - newList->tail = NULL; + newList->curr = nullptr; + newList->head = nullptr; + newList->tail = nullptr; newList->size = 0; return newList; @@ -59,20 +59,20 @@ U_CAPI UList *U_EXPORT2 ulist_createEmptyList(UErrorCode *status) { * This function properly sets the pointers for the first item added. */ static void ulist_addFirstItem(UList *list, UListNode *newItem) { - newItem->next = NULL; - newItem->previous = NULL; + newItem->next = nullptr; + newItem->previous = nullptr; list->head = newItem; list->tail = newItem; } static void ulist_removeItem(UList *list, UListNode *p) { - if (p->previous == NULL) { + if (p->previous == nullptr) { // p is the list head. list->head = p->next; } else { p->previous->next = p->next; } - if (p->next == NULL) { + if (p->next == nullptr) { // p is the list tail. list->tail = p->previous; } else { @@ -89,9 +89,9 @@ static void ulist_removeItem(UList *list, UListNode *p) { } U_CAPI void U_EXPORT2 ulist_addItemEndList(UList *list, const void *data, UBool forceDelete, UErrorCode *status) { - UListNode *newItem = NULL; + UListNode *newItem = nullptr; - if (U_FAILURE(*status) || list == NULL || data == NULL) { + if (U_FAILURE(*status) || list == nullptr || data == nullptr) { if (forceDelete) { uprv_free((void *)data); } @@ -99,7 +99,7 @@ U_CAPI void U_EXPORT2 ulist_addItemEndList(UList *list, const void *data, UBool } newItem = (UListNode *)uprv_malloc(sizeof(UListNode)); - if (newItem == NULL) { + if (newItem == nullptr) { if (forceDelete) { uprv_free((void *)data); } @@ -112,7 +112,7 @@ U_CAPI void U_EXPORT2 ulist_addItemEndList(UList *list, const void *data, UBool if (list->size == 0) { ulist_addFirstItem(list, newItem); } else { - newItem->next = NULL; + newItem->next = nullptr; newItem->previous = list->tail; list->tail->next = newItem; list->tail = newItem; @@ -122,9 +122,9 @@ U_CAPI void U_EXPORT2 ulist_addItemEndList(UList *list, const void *data, UBool } U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList *list, const void *data, UBool forceDelete, UErrorCode *status) { - UListNode *newItem = NULL; + UListNode *newItem = nullptr; - if (U_FAILURE(*status) || list == NULL || data == NULL) { + if (U_FAILURE(*status) || list == nullptr || data == nullptr) { if (forceDelete) { uprv_free((void *)data); } @@ -132,7 +132,7 @@ U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList *list, const void *data, UBoo } newItem = (UListNode *)uprv_malloc(sizeof(UListNode)); - if (newItem == NULL) { + if (newItem == nullptr) { if (forceDelete) { uprv_free((void *)data); } @@ -145,7 +145,7 @@ U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList *list, const void *data, UBoo if (list->size == 0) { ulist_addFirstItem(list, newItem); } else { - newItem->previous = NULL; + newItem->previous = nullptr; newItem->next = list->head; list->head->previous = newItem; list->head = newItem; @@ -155,9 +155,9 @@ U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList *list, const void *data, UBoo } U_CAPI UBool U_EXPORT2 ulist_containsString(const UList *list, const char *data, int32_t length) { - if (list != NULL) { + if (list != nullptr) { const UListNode *pointer; - for (pointer = list->head; pointer != NULL; pointer = pointer->next) { + for (pointer = list->head; pointer != nullptr; pointer = pointer->next) { if (length == (int32_t)uprv_strlen((const char *)pointer->data)) { if (uprv_memcmp(data, pointer->data, length) == 0) { return true; @@ -169,9 +169,9 @@ U_CAPI UBool U_EXPORT2 ulist_containsString(const UList *list, const char *data, } U_CAPI UBool U_EXPORT2 ulist_removeString(UList *list, const char *data) { - if (list != NULL) { + if (list != nullptr) { UListNode *pointer; - for (pointer = list->head; pointer != NULL; pointer = pointer->next) { + for (pointer = list->head; pointer != nullptr; pointer = pointer->next) { if (uprv_strcmp(data, (const char *)pointer->data) == 0) { ulist_removeItem(list, pointer); // Remove only the first occurrence, like Java LinkedList.remove(Object). @@ -183,10 +183,10 @@ U_CAPI UBool U_EXPORT2 ulist_removeString(UList *list, const char *data) { } U_CAPI void *U_EXPORT2 ulist_getNext(UList *list) { - UListNode *curr = NULL; + UListNode *curr = nullptr; - if (list == NULL || list->curr == NULL) { - return NULL; + if (list == nullptr || list->curr == nullptr) { + return nullptr; } curr = list->curr; @@ -196,7 +196,7 @@ U_CAPI void *U_EXPORT2 ulist_getNext(UList *list) { } U_CAPI int32_t U_EXPORT2 ulist_getListSize(const UList *list) { - if (list != NULL) { + if (list != nullptr) { return list->size; } @@ -204,17 +204,17 @@ U_CAPI int32_t U_EXPORT2 ulist_getListSize(const UList *list) { } U_CAPI void U_EXPORT2 ulist_resetList(UList *list) { - if (list != NULL) { + if (list != nullptr) { list->curr = list->head; } } U_CAPI void U_EXPORT2 ulist_deleteList(UList *list) { - UListNode *listHead = NULL; + UListNode *listHead = nullptr; - if (list != NULL) { + if (list != nullptr) { listHead = list->head; - while (listHead != NULL) { + while (listHead != nullptr) { UListNode *listPointer = listHead->next; if (listHead->forceDelete) { @@ -225,12 +225,12 @@ U_CAPI void U_EXPORT2 ulist_deleteList(UList *list) { listHead = listPointer; } uprv_free(list); - list = NULL; + list = nullptr; } } U_CAPI void U_EXPORT2 ulist_close_keyword_values_iterator(UEnumeration *en) { - if (en != NULL) { + if (en != nullptr) { ulist_deleteList((UList *)(en->context)); uprv_free(en); } @@ -247,11 +247,11 @@ U_CAPI int32_t U_EXPORT2 ulist_count_keyword_values(UEnumeration *en, UErrorCode U_CAPI const char * U_EXPORT2 ulist_next_keyword_value(UEnumeration *en, int32_t *resultLength, UErrorCode *status) { const char *s; if (U_FAILURE(*status)) { - return NULL; + return nullptr; } s = (const char *)ulist_getNext((UList *)(en->context)); - if (s != NULL && resultLength != NULL) { + if (s != nullptr && resultLength != nullptr) { *resultLength = static_cast(uprv_strlen(s)); } return s; diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp index 1da2abc361d..b53cd2a1a1c 100644 --- a/icu4c/source/common/uloc.cpp +++ b/icu4c/source/common/uloc.cpp @@ -71,8 +71,8 @@ U_CFUNC const char *locale_get_default(void); * This list must be kept in sync with LANGUAGES_3, with corresponding * entries matched. * - * This table should be terminated with a NULL entry, followed by a - * second list, and another NULL entry. The first list is visible to + * This table should be terminated with a nullptr entry, followed by a + * second list, and another nullptr entry. The first list is visible to * user code when this array is returned by API. The second list * contains codes we support, but do not expose through user API. * @@ -180,16 +180,16 @@ static const char * const LANGUAGES[] = { "yao", "yap", "yav", "ybb", "yi", "yo", "yrl", "yue", "za", "zap", "zbl", "zea", "zen", "zgh", "zh", "zu", "zun", "zxx", "zza", -NULL, +nullptr, "in", "iw", "ji", "jw", "mo", "sh", "swc", "tl", /* obsolete language codes */ -NULL +nullptr }; static const char* const DEPRECATED_LANGUAGES[]={ - "in", "iw", "ji", "jw", "mo", NULL, NULL + "in", "iw", "ji", "jw", "mo", nullptr, nullptr }; static const char* const REPLACEMENT_LANGUAGES[]={ - "id", "he", "yi", "jv", "ro", NULL, NULL + "id", "he", "yi", "jv", "ro", nullptr, nullptr }; /** @@ -204,8 +204,8 @@ static const char* const REPLACEMENT_LANGUAGES[]={ * Where a 3-letter language code has no 2-letter equivalent, the * 3-letter code occupies both LANGUAGES[i] and LANGUAGES_3[i]. * - * This table should be terminated with a NULL entry, followed by a - * second list, and another NULL entry. The two lists correspond to + * This table should be terminated with a nullptr entry, followed by a + * second list, and another nullptr entry. The two lists correspond to * the two lists in LANGUAGES. */ /* Generated using org.unicode.cldr.icu.GenerateISO639LanguageTables */ @@ -297,10 +297,10 @@ static const char * const LANGUAGES_3[] = { "yao", "yap", "yav", "ybb", "yid", "yor", "yrl", "yue", "zha", "zap", "zbl", "zea", "zen", "zgh", "zho", "zul", "zun", "zxx", "zza", -NULL, +nullptr, /* "in", "iw", "ji", "jw", "mo", "sh", "swc", "tl", */ "ind", "heb", "yid", "jaw", "mol", "srp", "swc", "tgl", -NULL +nullptr }; /** @@ -312,8 +312,8 @@ NULL * This list must be kept in sync with COUNTRIES_3, with corresponding * entries matched. * - * This table should be terminated with a NULL entry, followed by a - * second list, and another NULL entry. The first list is visible to + * This table should be terminated with a nullptr entry, followed by a + * second list, and another nullptr entry. The first list is visible to * user code when this array is returned by API. The second list * contains codes we support, but do not expose through user API. * @@ -358,17 +358,17 @@ static const char * const COUNTRIES[] = { "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "XK", "YE", "YT", "ZA", "ZM", "ZW", -NULL, +nullptr, "AN", "BU", "CS", "FX", "RO", "SU", "TP", "YD", "YU", "ZR", /* obsolete country codes */ -NULL +nullptr }; static const char* const DEPRECATED_COUNTRIES[] = { - "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR", NULL, NULL /* deprecated country list */ + "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR", nullptr, nullptr /* deprecated country list */ }; static const char* const REPLACEMENT_COUNTRIES[] = { /* "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR" */ - "CW", "MM", "RS", "DE", "BJ", "FR", "BF", "VU", "ZW", "RU", "TL", "GB", "VN", "YE", "RS", "CD", NULL, NULL /* replacement country codes */ + "CW", "MM", "RS", "DE", "BJ", "FR", "BF", "VU", "ZW", "RU", "TL", "GB", "VN", "YE", "RS", "CD", nullptr, nullptr /* replacement country codes */ }; /** @@ -380,8 +380,8 @@ static const char* const REPLACEMENT_COUNTRIES[] = { * COUNTRIES_3[i]. The commented-out lines are copied from COUNTRIES * to make eyeballing this baby easier. * - * This table should be terminated with a NULL entry, followed by a - * second list, and another NULL entry. The two lists correspond to + * This table should be terminated with a nullptr entry, followed by a + * second list, and another nullptr entry. The two lists correspond to * the two lists in COUNTRIES. */ static const char * const COUNTRIES_3[] = { @@ -445,10 +445,10 @@ static const char * const COUNTRIES_3[] = { "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", /* "WS", "XK", "YE", "YT", "ZA", "ZM", "ZW", */ "WSM", "XKK", "YEM", "MYT", "ZAF", "ZMB", "ZWE", -NULL, +nullptr, /* "AN", "BU", "CS", "FX", "RO", "SU", "TP", "YD", "YU", "ZR" */ "ANT", "BUR", "SCG", "FXX", "ROM", "SUN", "TMP", "YMD", "YUG", "ZAR", -NULL +nullptr }; typedef struct CanonicalizationMap { @@ -476,13 +476,13 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = { /* ### BCP47 Conversion *******************************************/ /* Test if the locale id has BCP47 u extension and does not have '@' */ -#define _hasBCP47Extension(id) (id && uprv_strstr(id, "@") == NULL && getShortestSubtagLength(localeID) == 1) +#define _hasBCP47Extension(id) (id && uprv_strstr(id, "@") == nullptr && getShortestSubtagLength(localeID) == 1) /* Converts the BCP47 id to Unicode id. Does nothing to id if conversion fails */ static const char* _ConvertBCP47( const char* id, char* buffer, int32_t length, UErrorCode* err, int32_t* pLocaleIdSize) { const char* finalID; - int32_t localeIDSize = uloc_forLanguageTag(id, buffer, length, NULL, err); + int32_t localeIDSize = uloc_forLanguageTag(id, buffer, length, nullptr, err); if (localeIDSize <= 0 || U_FAILURE(*err) || *err == U_STRING_NOT_TERMINATED_WARNING) { finalID=id; if (*err == U_STRING_NOT_TERMINATED_WARNING) { @@ -533,8 +533,8 @@ static int32_t getShortestSubtagLength(const char *localeID) { U_CAPI const char * U_EXPORT2 locale_getKeywordsStart(const char *localeID) { - const char *result = NULL; - if((result = uprv_strchr(localeID, '@')) != NULL) { + const char *result = nullptr; + if((result = uprv_strchr(localeID, '@')) != nullptr) { return result; } #if (U_CHARSET_FAMILY == U_EBCDIC_FAMILY) @@ -545,14 +545,14 @@ locale_getKeywordsStart(const char *localeID) { static const uint8_t ebcdicSigns[] = { 0x7C, 0x44, 0x66, 0x80, 0xAC, 0xAE, 0xAF, 0xB5, 0xEC, 0xEF, 0x00 }; const uint8_t *charToFind = ebcdicSigns; while(*charToFind) { - if((result = uprv_strchr(localeID, *charToFind)) != NULL) { + if((result = uprv_strchr(localeID, *charToFind)) != nullptr) { return result; } charToFind++; } } #endif - return NULL; + return nullptr; } /** @@ -613,8 +613,8 @@ ulocimp_getKeywords(const char *localeID, int32_t maxKeywords = ULOC_MAX_NO_KEYWORDS; int32_t numKeywords = 0; const char* pos = localeID; - const char* equalSign = NULL; - const char* semicolon = NULL; + const char* equalSign = nullptr; + const char* semicolon = nullptr; int32_t i = 0, j, n; if(prev == '@') { /* start of keyword definition */ @@ -704,7 +704,7 @@ ulocimp_getKeywords(const char *localeID, /* now we have a list of keywords */ /* we need to sort it */ - uprv_sortArray(keywordList, numKeywords, sizeof(KeywordStruct), compareKeywordStructs, NULL, false, status); + uprv_sortArray(keywordList, numKeywords, sizeof(KeywordStruct), compareKeywordStructs, nullptr, false, status); /* Now construct the keyword part */ for(i = 0; i < numKeywords; i++) { @@ -756,8 +756,8 @@ ulocimp_getKeywordValue(const char* localeID, icu::ByteSink& sink, UErrorCode* status) { - const char* startSearchHere = NULL; - const char* nextSeparator = NULL; + const char* startSearchHere = nullptr; + const char* nextSeparator = nullptr; char keywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN]; char localeKeywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN]; @@ -765,7 +765,7 @@ ulocimp_getKeywordValue(const char* localeID, char tempBuffer[ULOC_FULLNAME_CAPACITY]; const char* tmpLocaleID; - if (keywordName == NULL || keywordName[0] == 0) { + if (keywordName == nullptr || keywordName[0] == 0) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -783,7 +783,7 @@ ulocimp_getKeywordValue(const char* localeID, } startSearchHere = locale_getKeywordsStart(tmpLocaleID); - if(startSearchHere == NULL) { + if(startSearchHere == nullptr) { /* no keywords, return at once */ return; } @@ -876,10 +876,10 @@ uloc_setKeywordValue(const char* keywordName, char keywordValueBuffer[ULOC_KEYWORDS_CAPACITY+1]; char localeKeywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN]; int32_t rc; - char* nextSeparator = NULL; - char* nextEqualsign = NULL; - char* startSearchHere = NULL; - char* keywordStart = NULL; + char* nextSeparator = nullptr; + char* nextEqualsign = nullptr; + char* startSearchHere = nullptr; + char* keywordStart = nullptr; CharString updatedKeysAndValues; UBool handledInputKeyAndValue = false; char keyValuePrefix = '@'; @@ -890,13 +890,13 @@ uloc_setKeywordValue(const char* keywordName, if (*status == U_STRING_NOT_TERMINATED_WARNING) { *status = U_ZERO_ERROR; } - if (keywordName == NULL || keywordName[0] == 0 || bufferCapacity <= 1) { + if (keywordName == nullptr || keywordName[0] == 0 || bufferCapacity <= 1) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } bufLen = (int32_t)uprv_strlen(buffer); if(bufferCapacity= 1) { @@ -1254,7 +1254,7 @@ ulocimp_getCountry(const char *localeID, result.clear(); } - if(pEnd!=NULL) { + if(pEnd!=nullptr) { *pEnd=localeID; } @@ -1292,7 +1292,7 @@ _getVariant(const char *localeID, if(!hasVariant) { if(prev=='@') { /* keep localeID */ - } else if((localeID=locale_getKeywordsStart(localeID))!=NULL) { + } else if((localeID=locale_getKeywordsStart(localeID))!=nullptr) { ++localeID; /* point after the '@' */ } else { return; @@ -1347,7 +1347,7 @@ uloc_kw_nextKeyword(UEnumeration* en, len = (int32_t)uprv_strlen(((UKeywordsContext *)en->context)->current); ((UKeywordsContext *)en->context)->current += len+1; } else { - result = NULL; + result = nullptr; } if (resultLength) { *resultLength = len; @@ -1365,8 +1365,8 @@ U_CDECL_END static const UEnumeration gKeywordsEnum = { - NULL, - NULL, + nullptr, + nullptr, uloc_kw_closeKeywords, uloc_kw_countKeywords, uenum_unextDefault, @@ -1409,7 +1409,7 @@ uloc_openKeywords(const char* localeID, char tempBuffer[ULOC_FULLNAME_CAPACITY]; const char* tmpLocaleID; - if(status==NULL || U_FAILURE(*status)) { + if(status==nullptr || U_FAILURE(*status)) { return 0; } @@ -1417,7 +1417,7 @@ uloc_openKeywords(const char* localeID, tmpLocaleID = _ConvertBCP47(localeID, tempBuffer, sizeof(tempBuffer), status, nullptr); } else { - if (localeID==NULL) { + if (localeID==nullptr) { localeID=uloc_getDefault(); } tmpLocaleID=localeID; @@ -1450,16 +1450,16 @@ uloc_openKeywords(const char* localeID, } /* keywords are located after '@' */ - if((tmpLocaleID = locale_getKeywordsStart(tmpLocaleID)) != NULL) { + if((tmpLocaleID = locale_getKeywordsStart(tmpLocaleID)) != nullptr) { CharString keywords; CharStringByteSink sink(&keywords); ulocimp_getKeywords(tmpLocaleID+1, '@', sink, false, status); if (U_FAILURE(*status)) { - return NULL; + return nullptr; } return uloc_openKeywordList(keywords.data(), keywords.length(), status); } - return NULL; + return nullptr; } @@ -1493,8 +1493,8 @@ _canonicalize(const char* localeID, CharString localeIDWithHyphens; // if localeID has a BPC47 extension and have _, tmpLocaleID points to this const char* origLocaleID; const char* tmpLocaleID; - const char* keywordAssign = NULL; - const char* separatorIndicator = NULL; + const char* keywordAssign = nullptr; + const char* separatorIndicator = nullptr; if (_hasBCP47Extension(localeID)) { const char* localeIDPtr = localeID; @@ -1520,7 +1520,7 @@ _canonicalize(const char* localeID, &(tempBuffer.requestedCapacity)); } while (tempBuffer.needToTryAgain(err)); } else { - if (localeID==NULL) { + if (localeID==nullptr) { localeID=uloc_getDefault(); } tmpLocaleID=localeID; @@ -1602,15 +1602,15 @@ _canonicalize(const char* localeID, } /* Scan ahead to next '@' and determine if it is followed by '=' and/or ';' - After this, tmpLocaleID either points to '@' or is NULL */ - if ((tmpLocaleID=locale_getKeywordsStart(tmpLocaleID))!=NULL) { + After this, tmpLocaleID either points to '@' or is nullptr */ + if ((tmpLocaleID=locale_getKeywordsStart(tmpLocaleID))!=nullptr) { keywordAssign = uprv_strchr(tmpLocaleID, '='); separatorIndicator = uprv_strchr(tmpLocaleID, ';'); } /* Copy POSIX-style variant, if any [mr@FOO] */ if (!OPTION_SET(options, _ULOC_CANONICALIZE) && - tmpLocaleID != NULL && keywordAssign == NULL) { + tmpLocaleID != nullptr && keywordAssign == nullptr) { for (;;) { char c = *tmpLocaleID; if (c == 0) { @@ -1623,7 +1623,7 @@ _canonicalize(const char* localeID, if (OPTION_SET(options, _ULOC_CANONICALIZE)) { /* Handle @FOO variant if @ is present and not followed by = */ - if (tmpLocaleID!=NULL && keywordAssign==NULL) { + if (tmpLocaleID!=nullptr && keywordAssign==nullptr) { /* Add missing '_' if needed */ if (fieldCount < 2 || (fieldCount < 3 && scriptSize > 0)) { do { @@ -1647,7 +1647,7 @@ _canonicalize(const char* localeID, for (j=0; j keywordAssign)) { sink.Append("@", 1); ++fieldCount; @@ -1683,11 +1683,11 @@ uloc_getParent(const char* localeID, if (U_FAILURE(*err)) return 0; - if (localeID == NULL) + if (localeID == nullptr) localeID = uloc_getDefault(); lastUnderscore=uprv_strrchr(localeID, '_'); - if(lastUnderscore!=NULL) { + if(lastUnderscore!=nullptr) { i=(int32_t)(lastUnderscore-localeID); } else { i=0; @@ -1714,15 +1714,15 @@ uloc_getLanguage(const char* localeID, { /* uloc_getLanguage will return a 2 character iso-639 code if one exists. *CWB*/ - if (err==NULL || U_FAILURE(*err)) { + if (err==nullptr || U_FAILURE(*err)) { return 0; } - if(localeID==NULL) { + if(localeID==nullptr) { localeID=uloc_getDefault(); } - return ulocimp_getLanguage(localeID, NULL, *err).extract(language, languageCapacity, *err); + return ulocimp_getLanguage(localeID, nullptr, *err).extract(language, languageCapacity, *err); } U_CAPI int32_t U_EXPORT2 @@ -1731,11 +1731,11 @@ uloc_getScript(const char* localeID, int32_t scriptCapacity, UErrorCode* err) { - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return 0; } - if(localeID==NULL) { + if(localeID==nullptr) { localeID=uloc_getDefault(); } @@ -1746,7 +1746,7 @@ uloc_getScript(const char* localeID, } if(_isIDSeparator(*localeID)) { - return ulocimp_getScript(localeID+1, NULL, *err).extract(script, scriptCapacity, *err); + return ulocimp_getScript(localeID+1, nullptr, *err).extract(script, scriptCapacity, *err); } return u_terminateChars(script, scriptCapacity, 0, err); } @@ -1757,11 +1757,11 @@ uloc_getCountry(const char* localeID, int32_t countryCapacity, UErrorCode* err) { - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return 0; } - if(localeID==NULL) { + if(localeID==nullptr) { localeID=uloc_getDefault(); } @@ -1783,7 +1783,7 @@ uloc_getCountry(const char* localeID, localeID = scriptID; } if(_isIDSeparator(*localeID)) { - return ulocimp_getCountry(localeID+1, NULL, *err).extract(country, countryCapacity, *err); + return ulocimp_getCountry(localeID+1, nullptr, *err).extract(country, countryCapacity, *err); } } return u_terminateChars(country, countryCapacity, 0, err); @@ -1799,14 +1799,14 @@ uloc_getVariant(const char* localeID, const char* tmpLocaleID; int32_t i=0; - if(err==NULL || U_FAILURE(*err)) { + if(err==nullptr || U_FAILURE(*err)) { return 0; } if (_hasBCP47Extension(localeID)) { tmpLocaleID =_ConvertBCP47(localeID, tempBuffer, sizeof(tempBuffer), err, nullptr); } else { - if (localeID==NULL) { + if (localeID==nullptr) { localeID=uloc_getDefault(); } tmpLocaleID=localeID; @@ -1981,7 +1981,7 @@ uloc_getISO3Language(const char* localeID) char lang[ULOC_LANG_CAPACITY]; UErrorCode err = U_ZERO_ERROR; - if (localeID == NULL) + if (localeID == nullptr) { localeID = uloc_getDefault(); } @@ -2001,7 +2001,7 @@ uloc_getISO3Country(const char* localeID) char cntry[ULOC_LANG_CAPACITY]; UErrorCode err = U_ZERO_ERROR; - if (localeID == NULL) + if (localeID == nullptr) { localeID = uloc_getDefault(); } @@ -2134,7 +2134,7 @@ U_CAPI const char* U_EXPORT2 uloc_toUnicodeLocaleKey(const char* keyword) { const char* bcpKey = ulocimp_toBcpKey(keyword); - if (bcpKey == NULL && ultag_isUnicodeLocaleKey(keyword, -1)) { + if (bcpKey == nullptr && ultag_isUnicodeLocaleKey(keyword, -1)) { // unknown keyword, but syntax is fine.. return keyword; } @@ -2144,8 +2144,8 @@ uloc_toUnicodeLocaleKey(const char* keyword) U_CAPI const char* U_EXPORT2 uloc_toUnicodeLocaleType(const char* keyword, const char* value) { - const char* bcpType = ulocimp_toBcpType(keyword, value, NULL, NULL); - if (bcpType == NULL && ultag_isUnicodeLocaleType(value, -1)) { + const char* bcpType = ulocimp_toBcpType(keyword, value, nullptr, nullptr); + if (bcpType == nullptr && ultag_isUnicodeLocaleType(value, -1)) { // unknown keyword, but syntax is fine.. return value; } @@ -2190,7 +2190,7 @@ U_CAPI const char* U_EXPORT2 uloc_toLegacyKey(const char* keyword) { const char* legacyKey = ulocimp_toLegacyKey(keyword); - if (legacyKey == NULL) { + if (legacyKey == nullptr) { // Checks if the specified locale key is well-formed with the legacy locale syntax. // // Note: @@ -2208,8 +2208,8 @@ uloc_toLegacyKey(const char* keyword) U_CAPI const char* U_EXPORT2 uloc_toLegacyType(const char* keyword, const char* value) { - const char* legacyType = ulocimp_toLegacyType(keyword, value, NULL, NULL); - if (legacyType == NULL) { + const char* legacyType = ulocimp_toLegacyType(keyword, value, nullptr, nullptr); + if (legacyType == nullptr) { // Checks if the specified locale type is well-formed with the legacy locale syntax. // // Note: diff --git a/icu4c/source/common/uloc_keytype.cpp b/icu4c/source/common/uloc_keytype.cpp index 12dc3004924..83785d336bc 100644 --- a/icu4c/source/common/uloc_keytype.cpp +++ b/icu4c/source/common/uloc_keytype.cpp @@ -23,7 +23,7 @@ #include "uvector.h" #include "udataswp.h" /* for InvChar functions */ -static UHashtable* gLocExtKeyMap = NULL; +static UHashtable* gLocExtKeyMap = nullptr; static icu::UInitOnce gLocExtKeyMapInitOnce {}; // bit flags for special types @@ -46,27 +46,27 @@ struct LocExtType : public icu::UMemory { const char* bcpId; }; -static icu::MemoryPool* gKeyTypeStringPool = NULL; -static icu::MemoryPool* gLocExtKeyDataEntries = NULL; -static icu::MemoryPool* gLocExtTypeEntries = NULL; +static icu::MemoryPool* gKeyTypeStringPool = nullptr; +static icu::MemoryPool* gLocExtKeyDataEntries = nullptr; +static icu::MemoryPool* gLocExtTypeEntries = nullptr; U_CDECL_BEGIN static UBool U_CALLCONV uloc_key_type_cleanup(void) { - if (gLocExtKeyMap != NULL) { + if (gLocExtKeyMap != nullptr) { uhash_close(gLocExtKeyMap); - gLocExtKeyMap = NULL; + gLocExtKeyMap = nullptr; } delete gLocExtKeyDataEntries; - gLocExtKeyDataEntries = NULL; + gLocExtKeyDataEntries = nullptr; delete gLocExtTypeEntries; - gLocExtTypeEntries = NULL; + gLocExtTypeEntries = nullptr; delete gKeyTypeStringPool; - gKeyTypeStringPool = NULL; + gKeyTypeStringPool = nullptr; gLocExtKeyMapInitOnce.reset(); return true; @@ -80,34 +80,34 @@ initFromResourceBundle(UErrorCode& sts) { U_NAMESPACE_USE ucln_common_registerCleanup(UCLN_COMMON_LOCALE_KEY_TYPE, uloc_key_type_cleanup); - gLocExtKeyMap = uhash_open(uhash_hashIChars, uhash_compareIChars, NULL, &sts); + gLocExtKeyMap = uhash_open(uhash_hashIChars, uhash_compareIChars, nullptr, &sts); - LocalUResourceBundlePointer keyTypeDataRes(ures_openDirect(NULL, "keyTypeData", &sts)); - LocalUResourceBundlePointer keyMapRes(ures_getByKey(keyTypeDataRes.getAlias(), "keyMap", NULL, &sts)); - LocalUResourceBundlePointer typeMapRes(ures_getByKey(keyTypeDataRes.getAlias(), "typeMap", NULL, &sts)); + LocalUResourceBundlePointer keyTypeDataRes(ures_openDirect(nullptr, "keyTypeData", &sts)); + LocalUResourceBundlePointer keyMapRes(ures_getByKey(keyTypeDataRes.getAlias(), "keyMap", nullptr, &sts)); + LocalUResourceBundlePointer typeMapRes(ures_getByKey(keyTypeDataRes.getAlias(), "typeMap", nullptr, &sts)); if (U_FAILURE(sts)) { return; } UErrorCode tmpSts = U_ZERO_ERROR; - LocalUResourceBundlePointer typeAliasRes(ures_getByKey(keyTypeDataRes.getAlias(), "typeAlias", NULL, &tmpSts)); + LocalUResourceBundlePointer typeAliasRes(ures_getByKey(keyTypeDataRes.getAlias(), "typeAlias", nullptr, &tmpSts)); tmpSts = U_ZERO_ERROR; - LocalUResourceBundlePointer bcpTypeAliasRes(ures_getByKey(keyTypeDataRes.getAlias(), "bcpTypeAlias", NULL, &tmpSts)); + LocalUResourceBundlePointer bcpTypeAliasRes(ures_getByKey(keyTypeDataRes.getAlias(), "bcpTypeAlias", nullptr, &tmpSts)); // initialize pools storing dynamically allocated objects gKeyTypeStringPool = new icu::MemoryPool; - if (gKeyTypeStringPool == NULL) { + if (gKeyTypeStringPool == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; return; } gLocExtKeyDataEntries = new icu::MemoryPool; - if (gLocExtKeyDataEntries == NULL) { + if (gLocExtKeyDataEntries == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; return; } gLocExtTypeEntries = new icu::MemoryPool; - if (gLocExtTypeEntries == NULL) { + if (gLocExtTypeEntries == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; return; } @@ -130,7 +130,7 @@ initFromResourceBundle(UErrorCode& sts) { const char* bcpKeyId = legacyKeyId; if (!uBcpKeyId.isEmpty()) { icu::CharString* bcpKeyIdBuf = gKeyTypeStringPool->create(); - if (bcpKeyIdBuf == NULL) { + if (bcpKeyIdBuf == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -143,7 +143,7 @@ initFromResourceBundle(UErrorCode& sts) { UBool isTZ = uprv_strcmp(legacyKeyId, "timezone") == 0; - UHashtable* typeDataMap = uhash_open(uhash_hashIChars, uhash_compareIChars, NULL, &sts); + UHashtable* typeDataMap = uhash_open(uhash_hashIChars, uhash_compareIChars, nullptr, &sts); if (U_FAILURE(sts)) { break; } @@ -154,21 +154,21 @@ initFromResourceBundle(UErrorCode& sts) { if (typeAliasRes.isValid()) { tmpSts = U_ZERO_ERROR; - typeAliasResByKey.adoptInstead(ures_getByKey(typeAliasRes.getAlias(), legacyKeyId, NULL, &tmpSts)); + typeAliasResByKey.adoptInstead(ures_getByKey(typeAliasRes.getAlias(), legacyKeyId, nullptr, &tmpSts)); if (U_FAILURE(tmpSts)) { typeAliasResByKey.orphan(); } } if (bcpTypeAliasRes.isValid()) { tmpSts = U_ZERO_ERROR; - bcpTypeAliasResByKey.adoptInstead(ures_getByKey(bcpTypeAliasRes.getAlias(), bcpKeyId, NULL, &tmpSts)); + bcpTypeAliasResByKey.adoptInstead(ures_getByKey(bcpTypeAliasRes.getAlias(), bcpKeyId, nullptr, &tmpSts)); if (U_FAILURE(tmpSts)) { bcpTypeAliasResByKey.orphan(); } } // look up type map for the key, and walk through the mapping data - LocalUResourceBundlePointer typeMapResByKey(ures_getByKey(typeMapRes.getAlias(), legacyKeyId, NULL, &sts)); + LocalUResourceBundlePointer typeMapResByKey(ures_getByKey(typeMapRes.getAlias(), legacyKeyId, nullptr, &sts)); if (U_FAILURE(sts)) { // We fail here if typeMap does not have an entry corresponding to every entry in keyMap (should // not happen for valid keyTypeData), or if ures_getByKeyfails fails for some other reason @@ -202,10 +202,10 @@ initFromResourceBundle(UErrorCode& sts) { if (isTZ) { // a timezone key uses a colon instead of a slash in the resource. // e.g. America:Los_Angeles - if (uprv_strchr(legacyTypeId, ':') != NULL) { + if (uprv_strchr(legacyTypeId, ':') != nullptr) { icu::CharString* legacyTypeIdBuf = gKeyTypeStringPool->create(legacyTypeId, sts); - if (legacyTypeIdBuf == NULL) { + if (legacyTypeIdBuf == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -229,7 +229,7 @@ initFromResourceBundle(UErrorCode& sts) { const char* bcpTypeId = legacyTypeId; if (!uBcpTypeId.isEmpty()) { icu::CharString* bcpTypeIdBuf = gKeyTypeStringPool->create(); - if (bcpTypeIdBuf == NULL) { + if (bcpTypeIdBuf == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -245,7 +245,7 @@ initFromResourceBundle(UErrorCode& sts) { // type under the same key. So we use a single // map for lookup. LocExtType* t = gLocExtTypeEntries->create(); - if (t == NULL) { + if (t == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -274,14 +274,14 @@ initFromResourceBundle(UErrorCode& sts) { break; } // check if this is an alias of canonical legacy type - if (uprv_compareInvWithUChar(NULL, legacyTypeId, -1, to, toLen) == 0) { + if (uprv_compareInvWithUChar(nullptr, legacyTypeId, -1, to, toLen) == 0) { const char* from = ures_getKey(typeAliasDataEntry.getAlias()); if (isTZ) { // replace colon with slash if necessary - if (uprv_strchr(from, ':') != NULL) { + if (uprv_strchr(from, ':') != nullptr) { icu::CharString* fromBuf = gKeyTypeStringPool->create(from, sts); - if (fromBuf == NULL) { + if (fromBuf == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -315,7 +315,7 @@ initFromResourceBundle(UErrorCode& sts) { break; } // check if this is an alias of bcp type - if (uprv_compareInvWithUChar(NULL, bcpTypeId, -1, to, toLen) == 0) { + if (uprv_compareInvWithUChar(nullptr, bcpTypeId, -1, to, toLen) == 0) { const char* from = ures_getKey(bcpTypeAliasDataEntry.getAlias()); uhash_put(typeDataMap, (void*)from, t, &sts); } @@ -331,7 +331,7 @@ initFromResourceBundle(UErrorCode& sts) { } LocExtKeyData* keyData = gLocExtKeyDataEntries->create(); - if (keyData == NULL) { + if (keyData == nullptr) { sts = U_MEMORY_ALLOCATION_ERROR; break; } @@ -422,49 +422,49 @@ isSpecialTypeRgKeyValue(const char* val) { U_CFUNC const char* ulocimp_toBcpKey(const char* key) { if (!init()) { - return NULL; + return nullptr; } LocExtKeyData* keyData = (LocExtKeyData*)uhash_get(gLocExtKeyMap, key); - if (keyData != NULL) { + if (keyData != nullptr) { return keyData->bcpId; } - return NULL; + return nullptr; } U_CFUNC const char* ulocimp_toLegacyKey(const char* key) { if (!init()) { - return NULL; + return nullptr; } LocExtKeyData* keyData = (LocExtKeyData*)uhash_get(gLocExtKeyMap, key); - if (keyData != NULL) { + if (keyData != nullptr) { return keyData->legacyId; } - return NULL; + return nullptr; } U_CFUNC const char* ulocimp_toBcpType(const char* key, const char* type, UBool* isKnownKey, UBool* isSpecialType) { - if (isKnownKey != NULL) { + if (isKnownKey != nullptr) { *isKnownKey = false; } - if (isSpecialType != NULL) { + if (isSpecialType != nullptr) { *isSpecialType = false; } if (!init()) { - return NULL; + return nullptr; } LocExtKeyData* keyData = (LocExtKeyData*)uhash_get(gLocExtKeyMap, key); - if (keyData != NULL) { - if (isKnownKey != NULL) { + if (keyData != nullptr) { + if (isKnownKey != nullptr) { *isKnownKey = true; } LocExtType* t = (LocExtType*)uhash_get(keyData->typeMap.getAlias(), type); - if (t != NULL) { + if (t != nullptr) { return t->bcpId; } if (keyData->specialTypes != SPECIALTYPE_NONE) { @@ -479,37 +479,37 @@ ulocimp_toBcpType(const char* key, const char* type, UBool* isKnownKey, UBool* i matched = isSpecialTypeRgKeyValue(type); } if (matched) { - if (isSpecialType != NULL) { + if (isSpecialType != nullptr) { *isSpecialType = true; } return type; } } } - return NULL; + return nullptr; } U_CFUNC const char* ulocimp_toLegacyType(const char* key, const char* type, UBool* isKnownKey, UBool* isSpecialType) { - if (isKnownKey != NULL) { + if (isKnownKey != nullptr) { *isKnownKey = false; } - if (isSpecialType != NULL) { + if (isSpecialType != nullptr) { *isSpecialType = false; } if (!init()) { - return NULL; + return nullptr; } LocExtKeyData* keyData = (LocExtKeyData*)uhash_get(gLocExtKeyMap, key); - if (keyData != NULL) { - if (isKnownKey != NULL) { + if (keyData != nullptr) { + if (isKnownKey != nullptr) { *isKnownKey = true; } LocExtType* t = (LocExtType*)uhash_get(keyData->typeMap.getAlias(), type); - if (t != NULL) { + if (t != nullptr) { return t->legacyId; } if (keyData->specialTypes != SPECIALTYPE_NONE) { @@ -524,13 +524,13 @@ ulocimp_toLegacyType(const char* key, const char* type, UBool* isKnownKey, UBool matched = isSpecialTypeRgKeyValue(type); } if (matched) { - if (isSpecialType != NULL) { + if (isSpecialType != nullptr) { *isSpecialType = true; } return type; } } } - return NULL; + return nullptr; } diff --git a/icu4c/source/common/uloc_tag.cpp b/icu4c/source/common/uloc_tag.cpp index 01a0e0028f5..43d597549f7 100644 --- a/icu4c/source/common/uloc_tag.cpp +++ b/icu4c/source/common/uloc_tag.cpp @@ -501,7 +501,7 @@ _isVariantSubtag(const char* s, int32_t len) { static UBool _isSepListOf(UBool (*test)(const char*, int32_t), const char* s, int32_t len) { const char *p = s; - const char *pSubtag = NULL; + const char *pSubtag = nullptr; if (len < 0) { len = (int32_t)uprv_strlen(s); @@ -509,19 +509,19 @@ _isSepListOf(UBool (*test)(const char*, int32_t), const char* s, int32_t len) { while ((p - s) < len) { if (*p == SEP) { - if (pSubtag == NULL) { + if (pSubtag == nullptr) { return false; } if (!test(pSubtag, (int32_t)(p - pSubtag))) { return false; } - pSubtag = NULL; - } else if (pSubtag == NULL) { + pSubtag = nullptr; + } else if (pSubtag == nullptr) { pSubtag = p; } p++; } - if (pSubtag == NULL) { + if (pSubtag == nullptr) { return false; } return test(pSubtag, (int32_t)(p - pSubtag)); @@ -837,20 +837,20 @@ static UBool _addVariantToList(VariantListEntry **first, VariantListEntry *var) { UBool bAdded = true; - if (*first == NULL) { - var->next = NULL; + if (*first == nullptr) { + var->next = nullptr; *first = var; } else { VariantListEntry *prev, *cur; int32_t cmp; /* variants order should be preserved */ - prev = NULL; + prev = nullptr; cur = *first; while (true) { - if (cur == NULL) { + if (cur == nullptr) { prev->next = var; - var->next = NULL; + var->next = nullptr; break; } @@ -873,25 +873,25 @@ static UBool _addAttributeToList(AttributeListEntry **first, AttributeListEntry *attr) { UBool bAdded = true; - if (*first == NULL) { - attr->next = NULL; + if (*first == nullptr) { + attr->next = nullptr; *first = attr; } else { AttributeListEntry *prev, *cur; int32_t cmp; /* reorder variants in alphabetical order */ - prev = NULL; + prev = nullptr; cur = *first; while (true) { - if (cur == NULL) { + if (cur == nullptr) { prev->next = attr; - attr->next = NULL; + attr->next = nullptr; break; } cmp = uprv_compareInvCharsAsAscii(attr->attribute, cur->attribute); if (cmp < 0) { - if (prev == NULL) { + if (prev == nullptr) { *first = attr; } else { prev->next = attr; @@ -917,20 +917,20 @@ static UBool _addExtensionToList(ExtensionListEntry **first, ExtensionListEntry *ext, UBool localeToBCP) { UBool bAdded = true; - if (*first == NULL) { - ext->next = NULL; + if (*first == nullptr) { + ext->next = nullptr; *first = ext; } else { ExtensionListEntry *prev, *cur; int32_t cmp; /* reorder variants in alphabetical order */ - prev = NULL; + prev = nullptr; cur = *first; while (true) { - if (cur == NULL) { + if (cur == nullptr) { prev->next = ext; - ext->next = NULL; + ext->next = nullptr; break; } if (localeToBCP) { @@ -969,7 +969,7 @@ _addExtensionToList(ExtensionListEntry **first, ExtensionListEntry *ext, UBool l cmp = uprv_compareInvCharsAsAscii(ext->key, cur->key); } if (cmp < 0) { - if (prev == NULL) { + if (prev == nullptr) { *first = ext; } else { prev->next = ext; @@ -994,18 +994,18 @@ static void _initializeULanguageTag(ULanguageTag* langtag) { int32_t i; - langtag->buf = NULL; + langtag->buf = nullptr; langtag->language = EMPTY; for (i = 0; i < MAXEXTLANG; i++) { - langtag->extlang[i] = NULL; + langtag->extlang[i] = nullptr; } langtag->script = EMPTY; langtag->region = EMPTY; - langtag->variants = NULL; - langtag->extensions = NULL; + langtag->variants = nullptr; + langtag->extensions = nullptr; langtag->legacy = EMPTY; langtag->privateuse = EMPTY; @@ -1132,8 +1132,8 @@ _appendRegionToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool stri } static void _sortVariants(VariantListEntry* first) { - for (VariantListEntry* var1 = first; var1 != NULL; var1 = var1->next) { - for (VariantListEntry* var2 = var1->next; var2 != NULL; var2 = var2->next) { + for (VariantListEntry* var1 = first; var1 != nullptr; var1 = var1->next) { + for (VariantListEntry* var2 = var1->next; var2 != nullptr; var2 = var2->next) { // Swap var1->variant and var2->variant. if (uprv_compareInvCharsAsAscii(var1->variant, var2->variant) > 0) { const char* temp = var1->variant; @@ -1166,9 +1166,9 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st char *p, *pVar; UBool bNext = true; VariantListEntry *var; - VariantListEntry *varFirst = NULL; + VariantListEntry *varFirst = nullptr; - pVar = NULL; + pVar = nullptr; p = buf; while (bNext) { if (*p == SEP || *p == LOCALE_SEP || *p == 0) { @@ -1177,7 +1177,7 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st } else { *p = 0; /* terminate */ } - if (pVar == NULL) { + if (pVar == nullptr) { if (strict) { *status = U_ILLEGAL_ARGUMENT_ERROR; break; @@ -1195,7 +1195,7 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st if (uprv_strcmp(pVar,POSIX_VALUE) || len != (int32_t)uprv_strlen(POSIX_VALUE)) { /* emit the variant to the list */ var = (VariantListEntry*)uprv_malloc(sizeof(VariantListEntry)); - if (var == NULL) { + if (var == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1222,15 +1222,15 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st } } /* reset variant starting position */ - pVar = NULL; - } else if (pVar == NULL) { + pVar = nullptr; + } else if (pVar == nullptr) { pVar = p; } p++; } if (U_SUCCESS(*status)) { - if (varFirst != NULL) { + if (varFirst != nullptr) { int32_t varLen; /* per UTS35, we should sort the variants */ @@ -1238,7 +1238,7 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* write out validated/normalized variants to the target */ var = varFirst; - while (var != NULL) { + while (var != nullptr) { sink.Append("-", 1); varLen = (int32_t)uprv_strlen(var->variant); sink.Append(var->variant, varLen); @@ -1249,7 +1249,7 @@ _appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* clean up */ var = varFirst; - while (var != NULL) { + while (var != nullptr) { VariantListEntry *tmpVar = var->next; uprv_free(var); var = tmpVar; @@ -1278,9 +1278,9 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* reorder extensions */ int32_t len; const char *key; - ExtensionListEntry *firstExt = NULL; + ExtensionListEntry *firstExt = nullptr; ExtensionListEntry *ext; - AttributeListEntry *firstAttr = NULL; + AttributeListEntry *firstAttr = nullptr; AttributeListEntry *attr; icu::MemoryPool extBufPool; const char *bcpKey=nullptr, *bcpValue=nullptr; @@ -1289,8 +1289,8 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st UBool isBcpUExt; while (true) { - key = uenum_next(keywordEnum.getAlias(), NULL, status); - if (key == NULL) { + key = uenum_next(keywordEnum.getAlias(), nullptr, status); + if (key == nullptr) { break; } @@ -1341,13 +1341,13 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* create AttributeListEntry */ attr = attrPool.create(); - if (attr == NULL) { + if (attr == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } icu::CharString* attrValue = strPool.create(attrBuf, attrBufLength, *status); - if (attrValue == NULL) { + if (attrValue == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1365,11 +1365,11 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st } /* for a place holder ExtensionListEntry */ bcpKey = LOCALE_ATTRIBUTE_KEY; - bcpValue = NULL; + bcpValue = nullptr; } } else if (isBcpUExt) { bcpKey = uloc_toUnicodeLocaleKey(key); - if (bcpKey == NULL) { + if (bcpKey == nullptr) { if (strict) { *status = U_ILLEGAL_ARGUMENT_ERROR; break; @@ -1379,7 +1379,7 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* we've checked buf is null-terminated above */ bcpValue = uloc_toUnicodeLocaleType(key, buf.data()); - if (bcpValue == NULL) { + if (bcpValue == nullptr) { if (strict) { *status = U_ILLEGAL_ARGUMENT_ERROR; break; @@ -1441,7 +1441,7 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st /* create ExtensionListEntry */ ext = extPool.create(); - if (ext == NULL) { + if (ext == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1460,7 +1460,7 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st if (hadPosix) { /* create ExtensionListEntry for POSIX */ ext = extPool.create(); - if (ext == NULL) { + if (ext == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1472,7 +1472,7 @@ _appendKeywordsToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool st } } - if (U_SUCCESS(*status) && (firstExt != NULL || firstAttr != NULL)) { + if (U_SUCCESS(*status) && (firstExt != nullptr || firstAttr != nullptr)) { UBool startLDMLExtension = false; for (ext = firstExt; ext; ext = ext->next) { if (!startLDMLExtension && uprv_strlen(ext->key) > 1) { @@ -1514,7 +1514,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT const char *pKwds; /* beginning of key-type pairs */ UBool variantExists = *posixVariant; - ExtensionListEntry *kwdFirst = NULL; /* first LDML keyword */ + ExtensionListEntry *kwdFirst = nullptr; /* first LDML keyword */ ExtensionListEntry *kwd, *nextKwd; int32_t len; @@ -1523,10 +1523,10 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT *posixVariant = false; pTag = ldmlext; - pKwds = NULL; + pKwds = nullptr; { - AttributeListEntry *attrFirst = NULL; /* first attribute */ + AttributeListEntry *attrFirst = nullptr; /* first attribute */ AttributeListEntry *attr, *nextAttr; char attrBuf[ULOC_KEYWORD_AND_VALUES_CAPACITY]; @@ -1546,7 +1546,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* add this attribute to the list */ attr = attrPool.create(); - if (attr == NULL) { + if (attr == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1576,20 +1576,20 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* emit attributes as an LDML keyword, e.g. attribute=attr1-attr2 */ kwd = extPool.create(); - if (kwd == NULL) { + if (kwd == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } icu::CharString* value = kwdBuf.create(); - if (value == NULL) { + if (value == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } /* attribute subtags sorted in alphabetical order as type */ attr = attrFirst; - while (attr != NULL) { + while (attr != nullptr) { nextAttr = attr->next; if (attr != attrFirst) { value->append('-', *status); @@ -1612,8 +1612,8 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT } if (pKwds) { - const char *pBcpKey = NULL; /* u extension key subtag */ - const char *pBcpType = NULL; /* beginning of u extension type subtag(s) */ + const char *pBcpKey = nullptr; /* u extension key subtag */ + const char *pBcpType = nullptr; /* beginning of u extension type subtag(s) */ int32_t bcpKeyLen = 0; int32_t bcpTypeLen = 0; UBool isDone = false; @@ -1621,7 +1621,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT pTag = pKwds; /* BCP47 representation of LDML key/type pairs */ while (!isDone) { - const char *pNextBcpKey = NULL; + const char *pNextBcpKey = nullptr; int32_t nextBcpKeyLen = 0; UBool emitKeyword = false; @@ -1639,7 +1639,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT bcpKeyLen = len; } } else { - U_ASSERT(pBcpKey != NULL); + U_ASSERT(pBcpKey != nullptr); /* within LDML type subtags */ if (pBcpType) { bcpTypeLen += (len + 1); @@ -1662,12 +1662,12 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT } if (emitKeyword) { - const char *pKey = NULL; /* LDML key */ - const char *pType = NULL; /* LDML type */ + const char *pKey = nullptr; /* LDML key */ + const char *pType = nullptr; /* LDML type */ char bcpKeyBuf[3]; /* BCP key length is always 2 for now */ - U_ASSERT(pBcpKey != NULL); + U_ASSERT(pBcpKey != nullptr); if (bcpKeyLen >= (int32_t)sizeof(bcpKeyBuf)) { /* the BCP key is invalid */ @@ -1681,7 +1681,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* u extension key to LDML key */ pKey = uloc_toLegacyKey(bcpKeyBuf); - if (pKey == NULL) { + if (pKey == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1692,7 +1692,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT */ T_CString_toLowerCase(bcpKeyBuf); icu::CharString* key = kwdBuf.create(bcpKeyBuf, bcpKeyLen, *status); - if (key == NULL) { + if (key == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1715,7 +1715,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* BCP type to locale type */ pType = uloc_toLegacyType(pKey, bcpTypeBuf); - if (pType == NULL) { + if (pType == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1727,7 +1727,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* normalize to lower case */ T_CString_toLowerCase(bcpTypeBuf); icu::CharString* type = kwdBuf.create(bcpTypeBuf, bcpTypeLen, *status); - if (type == NULL) { + if (type == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1748,7 +1748,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT } else { /* create an ExtensionListEntry for this keyword */ kwd = extPool.create(); - if (kwd == NULL) { + if (kwd == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1763,15 +1763,15 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT } pBcpKey = pNextBcpKey; - bcpKeyLen = pNextBcpKey != NULL ? nextBcpKeyLen : 0; - pBcpType = NULL; + bcpKeyLen = pNextBcpKey != nullptr ? nextBcpKeyLen : 0; + pBcpType = nullptr; bcpTypeLen = 0; } } } kwd = kwdFirst; - while (kwd != NULL) { + while (kwd != nullptr) { nextKwd = kwd->next; _addExtensionToList(appendTo, kwd, false); kwd = nextKwd; @@ -1783,7 +1783,7 @@ static void _appendKeywords(ULanguageTag* langtag, icu::ByteSink& sink, UErrorCode* status) { int32_t i, n; int32_t len; - ExtensionListEntry *kwdFirst = NULL; + ExtensionListEntry *kwdFirst = nullptr; ExtensionListEntry *kwd; const char *key, *type; icu::MemoryPool extPool; @@ -1812,7 +1812,7 @@ _appendKeywords(ULanguageTag* langtag, icu::ByteSink& sink, UErrorCode* status) } } else { kwd = extPool.create(); - if (kwd == NULL) { + if (kwd == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1830,7 +1830,7 @@ _appendKeywords(ULanguageTag* langtag, icu::ByteSink& sink, UErrorCode* status) if ((int32_t)uprv_strlen(type) > 0) { /* add private use as a keyword */ kwd = extPool.create(); - if (kwd == NULL) { + if (kwd == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { kwd->key = PRIVATEUSE_KEY; @@ -1849,7 +1849,7 @@ _appendKeywords(ULanguageTag* langtag, icu::ByteSink& sink, UErrorCode* status) sink.Append(_POSIX, len); } - if (U_SUCCESS(*status) && kwdFirst != NULL) { + if (U_SUCCESS(*status) && kwdFirst != nullptr) { /* write out the sorted keywords */ UBool firstValue = true; kwd = kwdFirst; @@ -1903,7 +1903,7 @@ _appendPrivateuseToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool UBool firstValue = true; UBool writeValue; - pPriv = NULL; + pPriv = nullptr; p = buf; while (bNext) { writeValue = false; @@ -1913,7 +1913,7 @@ _appendPrivateuseToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool } else { *p = 0; /* terminate */ } - if (pPriv != NULL) { + if (pPriv != nullptr) { /* Private use in the canonical format is lowercase in BCP47 */ for (i = 0; *(pPriv + i) != 0; i++) { *(pPriv + i) = uprv_tolower(*(pPriv + i)); @@ -1970,8 +1970,8 @@ _appendPrivateuseToLanguageTag(const char* localeID, icu::ByteSink& sink, UBool } } /* reset private use starting position */ - pPriv = NULL; - } else if (pPriv == NULL) { + pPriv = nullptr; + } else if (pPriv == nullptr) { pPriv = p; } p++; @@ -2029,12 +2029,12 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta UBool privateuseVar = false; int32_t legacyLen = 0; - if (parsedLen != NULL) { + if (parsedLen != nullptr) { *parsedLen = 0; } if (U_FAILURE(*status)) { - return NULL; + return nullptr; } if (tagLen < 0) { @@ -2043,9 +2043,9 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta /* copy the entire string */ tagBuf = (char*)uprv_malloc(tagLen + 1); - if (tagBuf == NULL) { + if (tagBuf == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } if (tagLen > 0) { @@ -2059,7 +2059,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta if (t.isNull()) { uprv_free(tagBuf); *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } _initializeULanguageTag(t.getAlias()); t->buf = tagBuf; @@ -2093,9 +2093,9 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta if (tagLen < newTagLength) { uprv_free(tagBuf); tagBuf = (char*)uprv_malloc(newTagLength + 1); - if (tagBuf == NULL) { + if (tagBuf == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } t->buf = tagBuf; tagLen = newTagLength; @@ -2154,9 +2154,9 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta next = LANG | PRIV; pNext = pLastGoodPosition = tagBuf; extlangIdx = 0; - pExtension = NULL; - pExtValueSubtag = NULL; - pExtValueSubtagEnd = NULL; + pExtension = nullptr; + pExtValueSubtag = nullptr; + pExtValueSubtagEnd = nullptr; while (pNext) { char *pSep; @@ -2173,7 +2173,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } if (*pSep == 0) { /* last subtag */ - pNext = NULL; + pNext = nullptr; } else { pNext = pSep + 1; } @@ -2244,9 +2244,9 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta UBool isAdded; var = (VariantListEntry*)uprv_malloc(sizeof(VariantListEntry)); - if (var == NULL) { + if (var == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } *pSep = 0; var->variant = T_CString_toUpperCase(pSubtag); @@ -2263,11 +2263,11 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } if (next & EXTS) { if (_isExtensionSingleton(pSubtag, subtagLen)) { - if (pExtension != NULL) { - if (pExtValueSubtag == NULL || pExtValueSubtagEnd == NULL) { + if (pExtension != nullptr) { + if (pExtValueSubtag == nullptr || pExtValueSubtagEnd == nullptr) { /* the previous extension is incomplete */ uprv_free(pExtension); - pExtension = NULL; + pExtension = nullptr; break; } @@ -2281,27 +2281,27 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } else { /* stop parsing here */ uprv_free(pExtension); - pExtension = NULL; + pExtension = nullptr; break; } } /* create a new extension */ pExtension = (ExtensionListEntry*)uprv_malloc(sizeof(ExtensionListEntry)); - if (pExtension == NULL) { + if (pExtension == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } *pSep = 0; pExtension->key = T_CString_toLowerCase(pSubtag); - pExtension->value = NULL; /* will be set later */ + pExtension->value = nullptr; /* will be set later */ /* * reset the start and the end location of extension value * subtags for this extension */ - pExtValueSubtag = NULL; - pExtValueSubtagEnd = NULL; + pExtValueSubtag = nullptr; + pExtValueSubtagEnd = nullptr; next = EXTV; continue; @@ -2309,7 +2309,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } if (next & EXTV) { if (_isExtensionSubtag(pSubtag, subtagLen)) { - if (pExtValueSubtag == NULL) { + if (pExtValueSubtag == nullptr) { /* if the start position of this extension's value is not yet, this one is the first value subtag */ pExtValueSubtag = pSubtag; @@ -2326,12 +2326,12 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta if (uprv_tolower(*pSubtag) == PRIVATEUSE && subtagLen == 1) { char *pPrivuseVal; - if (pExtension != NULL) { + if (pExtension != nullptr) { /* Process the last extension */ - if (pExtValueSubtag == NULL || pExtValueSubtagEnd == NULL) { + if (pExtValueSubtag == nullptr || pExtValueSubtagEnd == nullptr) { /* the previous extension is incomplete */ uprv_free(pExtension); - pExtension = NULL; + pExtension = nullptr; break; } else { /* terminate the previous extension value */ @@ -2341,18 +2341,18 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta /* insert the extension to the list */ if (_addExtensionToList(&(t->extensions), pExtension, false)) { pLastGoodPosition = pExtValueSubtagEnd; - pExtension = NULL; + pExtension = nullptr; } else { /* stop parsing here */ uprv_free(pExtension); - pExtension = NULL; + pExtension = nullptr; break; } } } /* The rest of part will be private use value subtags */ - if (pNext == NULL) { + if (pNext == nullptr) { /* empty private use subtag */ break; } @@ -2371,7 +2371,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } if (*pSep == 0) { /* last subtag */ - pNext = NULL; + pNext = nullptr; } else { pNext = pSep + 1; } @@ -2407,9 +2407,9 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta break; } - if (pExtension != NULL) { + if (pExtension != nullptr) { /* Process the last extension */ - if (pExtValueSubtag == NULL || pExtValueSubtagEnd == NULL) { + if (pExtValueSubtag == nullptr || pExtValueSubtagEnd == nullptr) { /* the previous extension is incomplete */ uprv_free(pExtension); } else { @@ -2425,7 +2425,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta } } - if (parsedLen != NULL) { + if (parsedLen != nullptr) { *parsedLen = (int32_t)(pLastGoodPosition - t->buf + parsedLenDelta); } @@ -2440,7 +2440,7 @@ ultag_parse(const char* tag, int32_t tagLen, int32_t* parsedLen, UErrorCode* sta static void ultag_close(ULanguageTag* langtag) { - if (langtag == NULL) { + if (langtag == nullptr) { return; } @@ -2476,7 +2476,7 @@ ultag_getLanguage(const ULanguageTag* langtag) { static const char* ultag_getJDKLanguage(const ULanguageTag* langtag) { int32_t i; - for (i = 0; DEPRECATEDLANGS[i] != NULL; i += 2) { + for (i = 0; DEPRECATEDLANGS[i] != nullptr; i += 2) { if (uprv_compareInvCharsAsAscii(DEPRECATEDLANGS[i], langtag->language) == 0) { return DEPRECATEDLANGS[i + 1]; } @@ -2490,7 +2490,7 @@ ultag_getExtlang(const ULanguageTag* langtag, int32_t idx) { if (idx >= 0 && idx < MAXEXTLANG) { return langtag->extlang[idx]; } - return NULL; + return nullptr; } static int32_t @@ -2517,7 +2517,7 @@ ultag_getRegion(const ULanguageTag* langtag) { static const char* ultag_getVariant(const ULanguageTag* langtag, int32_t idx) { - const char *var = NULL; + const char *var = nullptr; VariantListEntry *cur = langtag->variants; int32_t i = 0; while (cur) { @@ -2536,7 +2536,7 @@ ultag_getVariantsSize(const ULanguageTag* langtag) { int32_t size = 0; VariantListEntry *cur = langtag->variants; while (true) { - if (cur == NULL) { + if (cur == nullptr) { break; } size++; @@ -2547,7 +2547,7 @@ ultag_getVariantsSize(const ULanguageTag* langtag) { static const char* ultag_getExtensionKey(const ULanguageTag* langtag, int32_t idx) { - const char *key = NULL; + const char *key = nullptr; ExtensionListEntry *cur = langtag->extensions; int32_t i = 0; while (cur) { @@ -2563,7 +2563,7 @@ ultag_getExtensionKey(const ULanguageTag* langtag, int32_t idx) { static const char* ultag_getExtensionValue(const ULanguageTag* langtag, int32_t idx) { - const char *val = NULL; + const char *val = nullptr; ExtensionListEntry *cur = langtag->extensions; int32_t i = 0; while (cur) { @@ -2582,7 +2582,7 @@ ultag_getExtensionsSize(const ULanguageTag* langtag) { int32_t size = 0; ExtensionListEntry *cur = langtag->extensions; while (true) { - if (cur == NULL) { + if (cur == nullptr) { break; } size++; diff --git a/icu4c/source/common/umapfile.cpp b/icu4c/source/common/umapfile.cpp index 145582ea97a..885006977ac 100644 --- a/icu4c/source/common/umapfile.cpp +++ b/icu4c/source/common/umapfile.cpp @@ -171,7 +171,7 @@ typedef HANDLE MemoryMap; return false; } - // Note: We use NULL/nullptr for lpAttributes parameter below. + // Note: We use nullptr/nullptr for lpAttributes parameter below. // This means our handle cannot be inherited and we will get the default security descriptor. /* create an unnamed Windows file-mapping object for the specified file */ map = CreateFileMappingW(file, nullptr, PAGE_READONLY, 0, 0, nullptr); diff --git a/icu4c/source/common/unames.cpp b/icu4c/source/common/unames.cpp index b0ac991e1ba..69693089de7 100644 --- a/icu4c/source/common/unames.cpp +++ b/icu4c/source/common/unames.cpp @@ -101,10 +101,10 @@ typedef struct { UChar32 code; } FindName; -#define DO_FIND_NAME NULL +#define DO_FIND_NAME nullptr -static UDataMemory *uCharNamesData=NULL; -static UCharNames *uCharNames=NULL; +static UDataMemory *uCharNamesData=nullptr; +static UCharNames *uCharNames=nullptr; static icu::UInitOnce gCharNamesInitOnce {}; /* @@ -166,10 +166,10 @@ static UBool U_CALLCONV unames_cleanup(void) { if(uCharNamesData) { udata_close(uCharNamesData); - uCharNamesData = NULL; + uCharNamesData = nullptr; } if(uCharNames) { - uCharNames = NULL; + uCharNames = nullptr; } gCharNamesInitOnce.reset(); gMaxNameLength=0; @@ -193,12 +193,12 @@ isAcceptable(void * /*context*/, static void U_CALLCONV loadCharNames(UErrorCode &status) { - U_ASSERT(uCharNamesData == NULL); - U_ASSERT(uCharNames == NULL); + U_ASSERT(uCharNamesData == nullptr); + U_ASSERT(uCharNames == nullptr); - uCharNamesData = udata_openChoice(NULL, DATA_TYPE, DATA_NAME, isAcceptable, NULL, &status); + uCharNamesData = udata_openChoice(nullptr, DATA_TYPE, DATA_NAME, isAcceptable, nullptr, &status); if(U_FAILURE(status)) { - uCharNamesData = NULL; + uCharNamesData = nullptr; } else { uCharNames = (UCharNames *)udata_getMemory(uCharNamesData); } @@ -801,7 +801,7 @@ writeFactorSuffix(const uint16_t *factors, uint16_t count, /* write each element */ for(;;) { - if(elementBases!=NULL) { + if(elementBases!=nullptr) { *elementBases++=s; } @@ -811,7 +811,7 @@ writeFactorSuffix(const uint16_t *factors, uint16_t count, while(*s++!=0) {} --factor; } - if(elements!=NULL) { + if(elements!=nullptr) { *elements++=s; } @@ -913,7 +913,7 @@ getAlgName(AlgorithmicRange *range, uint32_t code, UCharNameChoice nameChoice, } bufferPos+=writeFactorSuffix(factors, count, - s, code-range->start, indexes, NULL, NULL, buffer, bufferLength); + s, code-range->start, indexes, nullptr, nullptr, buffer, bufferLength); break; } default: @@ -1319,7 +1319,7 @@ calcNameSetLength(const uint16_t *tokens, uint16_t tokenCount, const uint8_t *to ++length; } else { /* count token word */ - if(tokenLengths!=NULL) { + if(tokenLengths!=nullptr) { /* use cached token length */ tokenLength=tokenLengths[c]; if(tokenLength==0) { @@ -1354,7 +1354,7 @@ calcGroupNameSetsLengths(int32_t maxNameLength) { int32_t groupCount, lineNumber, length; tokenLengths=(int8_t *)uprv_malloc(tokenCount); - if(tokenLengths!=NULL) { + if(tokenLengths!=nullptr) { uprv_memset(tokenLengths, 0, tokenCount); } @@ -1402,7 +1402,7 @@ calcGroupNameSetsLengths(int32_t maxNameLength) { --groupCount; } - if(tokenLengths!=NULL) { + if(tokenLengths!=nullptr) { uprv_free(tokenLengths); } @@ -1456,10 +1456,10 @@ u_charName(UChar32 code, UCharNameChoice nameChoice, int32_t length; /* check the argument values */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } else if(nameChoice>=U_CHAR_NAME_CHOICE_COUNT || - bufferLength<0 || (bufferLength>0 && buffer==NULL) + bufferLength<0 || (bufferLength>0 && buffer==nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -1505,9 +1505,9 @@ u_getISOComment(UChar32 /*c*/, char *dest, int32_t destCapacity, UErrorCode *pErrorCode) { /* check the argument values */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; - } else if(destCapacity<0 || (destCapacity>0 && dest==NULL)) { + } else if(destCapacity<0 || (destCapacity>0 && dest==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1529,11 +1529,11 @@ u_charFromName(UCharNameChoice nameChoice, char c0; static constexpr UChar32 error = 0xffff; /* Undefined, but use this for backwards compatibility. */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return error; } - if(nameChoice>=U_CHAR_NAME_CHOICE_COUNT || name==NULL || *name==0) { + if(nameChoice>=U_CHAR_NAME_CHOICE_COUNT || name==nullptr || *name==0) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return error; } @@ -1641,11 +1641,11 @@ u_enumCharNames(UChar32 start, UChar32 limit, uint32_t *p; uint32_t i; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } - if(nameChoice>=U_CHAR_NAME_CHOICE_COUNT || fn==NULL) { + if(nameChoice>=U_CHAR_NAME_CHOICE_COUNT || fn==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -1850,7 +1850,7 @@ uchar_swapNames(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } @@ -1954,7 +1954,7 @@ uchar_swapNames(const UDataSwapper *ds, * go through a temporary array to support in-place swapping */ temp=(uint16_t *)uprv_malloc(tokenCount*2); - if(temp==NULL) { + if(temp==nullptr) { udata_printError(ds, "out of memory swapping %u unames.icu tokens\n", tokenCount); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; diff --git a/icu4c/source/common/unicode/appendable.h b/icu4c/source/common/unicode/appendable.h index f77df88e39c..0e37f4562a5 100644 --- a/icu4c/source/common/unicode/appendable.h +++ b/icu4c/source/common/unicode/appendable.h @@ -79,7 +79,7 @@ public: /** * Appends a string. * The default implementation calls appendCodeUnit(char16_t) for each code unit. - * @param s string, must not be NULL if length!=0 + * @param s string, must not be nullptr if length!=0 * @param length string length, or -1 if NUL-terminated * @return true if the operation succeeded * @stable ICU 4.8 @@ -186,7 +186,7 @@ public: /** * Appends a string to the UnicodeString. - * @param s string, must not be NULL if length!=0 + * @param s string, must not be nullptr if length!=0 * @param length string length, or -1 if NUL-terminated * @return true if the operation succeeded * @stable ICU 4.8 diff --git a/icu4c/source/common/unicode/brkiter.h b/icu4c/source/common/unicode/brkiter.h index 3a121cf703b..108652799e6 100644 --- a/icu4c/source/common/unicode/brkiter.h +++ b/icu4c/source/common/unicode/brkiter.h @@ -162,7 +162,7 @@ public: * access the text without impacting any break iterator operations, * but the underlying text itself must not be altered. * - * @param fillIn A UText to be filled in. If NULL, a new UText will be + * @param fillIn A UText to be filled in. If nullptr, a new UText will be * allocated to hold the result. * @param status receives any error codes. * @return The current UText for this break iterator. If an input @@ -503,7 +503,7 @@ public: * * Thread safe client-buffer-based cloning operation * Do NOT call delete on a safeclone, since 'new' is not used to create it. - * @param stackBuffer user allocated space for the new clone. If NULL new memory will be allocated. + * @param stackBuffer user allocated space for the new clone. If nullptr new memory will be allocated. * If buffer is not large enough, new memory will be allocated. * @param BufferSize reference to size of allocated space. * If BufferSize == 0, a sufficient size for use in cloning will diff --git a/icu4c/source/common/unicode/bytestrie.h b/icu4c/source/common/unicode/bytestrie.h index 8fe66780f51..1719a6bb83e 100644 --- a/icu4c/source/common/unicode/bytestrie.h +++ b/icu4c/source/common/unicode/bytestrie.h @@ -69,7 +69,7 @@ public: * @stable ICU 4.8 */ BytesTrie(const void *trieBytes) - : ownedArray_(NULL), bytes_(static_cast(trieBytes)), + : ownedArray_(nullptr), bytes_(static_cast(trieBytes)), pos_(bytes_), remainingMatchLength_(-1) {} /** @@ -85,7 +85,7 @@ public: * @stable ICU 4.8 */ BytesTrie(const BytesTrie &other) - : ownedArray_(NULL), bytes_(other.bytes_), + : ownedArray_(nullptr), bytes_(other.bytes_), pos_(other.pos_), remainingMatchLength_(other.remainingMatchLength_) {} /** @@ -143,7 +143,7 @@ public: * Constructs an empty State. * @stable ICU 4.8 */ - State() { bytes=NULL; } + State() { bytes=nullptr; } private: friend class BytesTrie; @@ -177,7 +177,7 @@ public: * @stable ICU 4.8 */ BytesTrie &resetToState(const State &state) { - if(bytes_==state.bytes && bytes_!=NULL) { + if(bytes_==state.bytes && bytes_!=nullptr) { pos_=state.pos; remainingMatchLength_=state.remainingMatchLength; } @@ -227,7 +227,7 @@ public: * result=next(c); * return result; * \endcode - * @param s A string or byte sequence. Can be NULL if length is 0. + * @param s A string or byte sequence. Can be nullptr if length is 0. * @param length The length of the byte sequence. Can be -1 if NUL-terminated. * @return The match/value Result. * @stable ICU 4.8 @@ -262,7 +262,7 @@ public: inline UBool hasUniqueValue(int32_t &uniqueValue) const { const uint8_t *pos=pos_; // Skip the rest of a pending linear-match node. - return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); + return pos!=nullptr && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); } /** @@ -397,7 +397,7 @@ private: BytesTrie &operator=(const BytesTrie &other) = delete; inline void stop() { - pos_=NULL; + pos_=nullptr; } // Reads a compact 32-bit integer. @@ -555,7 +555,7 @@ private: // Iterator variables. - // Pointer to next trie byte to read. NULL if no more matches. + // Pointer to next trie byte to read. nullptr if no more matches. const uint8_t *pos_; // Remaining length of a linear-match node, minus 1. Negative if not in such a node. int32_t remainingMatchLength_; diff --git a/icu4c/source/common/unicode/casemap.h b/icu4c/source/common/unicode/casemap.h index 53af84fa74d..d7779f6d67f 100644 --- a/icu4c/source/common/unicode/casemap.h +++ b/icu4c/source/common/unicode/casemap.h @@ -38,7 +38,7 @@ public: * The result may be longer or shorter than the original. * The source string and the destination buffer must not overlap. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -46,13 +46,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of char16_ts). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -74,7 +74,7 @@ public: * The result may be longer or shorter than the original. * The source string and the destination buffer must not overlap. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -82,13 +82,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of char16_ts). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -116,7 +116,7 @@ public: * that are to be titlecased. It titlecases those characters and lowercases * all others. (This can be modified with options bits.) * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT, U_EDITS_NO_RESET, * U_TITLECASE_NO_LOWERCASE, * U_TITLECASE_NO_BREAK_ADJUSTMENT, U_TITLECASE_ADJUST_TO_CASED, @@ -124,7 +124,7 @@ public: * @param iter A break iterator to find the first characters of words that are to be titlecased. * It is set to the source string (setText()) * and used one or more times for iteration (first() and next()). - * If NULL, then a word break iterator for the locale is used + * If nullptr, then a word break iterator for the locale is used * (or something equivalent). * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -132,13 +132,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of char16_ts). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -175,13 +175,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of char16_ts). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -202,7 +202,7 @@ public: * Casing is locale-dependent and context-sensitive. * The result may be longer or shorter than the original. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param sink A ByteSink to which the result string is written. @@ -211,7 +211,7 @@ public: * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @@ -228,7 +228,7 @@ public: * Casing is locale-dependent and context-sensitive. * The result may be longer or shorter than the original. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param sink A ByteSink to which the result string is written. @@ -237,7 +237,7 @@ public: * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @@ -260,7 +260,7 @@ public: * that are to be titlecased. It titlecases those characters and lowercases * all others. (This can be modified with options bits.) * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT, U_EDITS_NO_RESET, * U_TITLECASE_NO_LOWERCASE, * U_TITLECASE_NO_BREAK_ADJUSTMENT, U_TITLECASE_ADJUST_TO_CASED, @@ -268,7 +268,7 @@ public: * @param iter A break iterator to find the first characters of words that are to be titlecased. * It is set to the source string (setUText()) * and used one or more times for iteration (first() and next()). - * If NULL, then a word break iterator for the locale is used + * If nullptr, then a word break iterator for the locale is used * (or something equivalent). * @param src The original string. * @param sink A ByteSink to which the result string is written. @@ -277,7 +277,7 @@ public: * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @@ -308,7 +308,7 @@ public: * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @@ -326,7 +326,7 @@ public: * The result may be longer or shorter than the original. * The source string and the destination buffer must not overlap. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -334,13 +334,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of bytes). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -362,7 +362,7 @@ public: * The result may be longer or shorter than the original. * The source string and the destination buffer must not overlap. * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT and U_EDITS_NO_RESET. * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -370,13 +370,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of bytes). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -404,7 +404,7 @@ public: * that are to be titlecased. It titlecases those characters and lowercases * all others. (This can be modified with options bits.) * - * @param locale The locale ID. ("" = root locale, NULL = default locale.) + * @param locale The locale ID. ("" = root locale, nullptr = default locale.) * @param options Options bit set, usually 0. See U_OMIT_UNCHANGED_TEXT, U_EDITS_NO_RESET, * U_TITLECASE_NO_LOWERCASE, * U_TITLECASE_NO_BREAK_ADJUSTMENT, U_TITLECASE_ADJUST_TO_CASED, @@ -412,7 +412,7 @@ public: * @param iter A break iterator to find the first characters of words that are to be titlecased. * It is set to the source string (setUText()) * and used one or more times for iteration (first() and next()). - * If NULL, then a word break iterator for the locale is used + * If nullptr, then a word break iterator for the locale is used * (or something equivalent). * @param src The original string. * @param srcLength The length of the original string. If -1, then src must be NUL-terminated. @@ -420,13 +420,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of bytes). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. @@ -462,13 +462,13 @@ public: * the buffer is large enough. * The contents is undefined in case of failure. * @param destCapacity The size of the buffer (number of bytes). If it is 0, then - * dest may be NULL and the function will only return the length of the result + * dest may be nullptr and the function will only return the length of the result * without writing any of the result string. * @param edits Records edits for index mapping, working with styled text, * and getting only changes (if any). * The Edits contents is undefined if any error occurs. * This function calls edits->reset() first unless - * options includes U_EDITS_NO_RESET. edits can be NULL. + * options includes U_EDITS_NO_RESET. edits can be nullptr. * @param errorCode Reference to an in/out error code value * which must not indicate a failure before the function call. * @return The length of the result string, if successful. diff --git a/icu4c/source/common/unicode/localpointer.h b/icu4c/source/common/unicode/localpointer.h index 96c659d10ad..7a2ad6b598c 100644 --- a/icu4c/source/common/unicode/localpointer.h +++ b/icu4c/source/common/unicode/localpointer.h @@ -79,7 +79,7 @@ public: * @param p simple pointer to an object that is adopted * @stable ICU 4.4 */ - explicit LocalPointerBase(T *p=NULL) : ptr(p) {} + explicit LocalPointerBase(T *p=nullptr) : ptr(p) {} /** * Destructor deletes the object it owns. * Subclass must override: Base class does nothing. @@ -87,20 +87,20 @@ public: */ ~LocalPointerBase() { /* delete ptr; */ } /** - * NULL check. - * @return true if ==NULL + * nullptr check. + * @return true if ==nullptr * @stable ICU 4.4 */ - UBool isNull() const { return ptr==NULL; } + UBool isNull() const { return ptr==nullptr; } /** - * NULL check. - * @return true if !=NULL + * nullptr check. + * @return true if !=nullptr * @stable ICU 4.4 */ - UBool isValid() const { return ptr!=NULL; } + UBool isValid() const { return ptr!=nullptr; } /** * Comparison with a simple pointer, so that existing code - * with ==NULL need not be changed. + * with ==nullptr need not be changed. * @param other simple pointer for comparison * @return true if this pointer value equals other * @stable ICU 4.4 @@ -108,7 +108,7 @@ public: bool operator==(const T *other) const { return ptr==other; } /** * Comparison with a simple pointer, so that existing code - * with !=NULL need not be changed. + * with !=nullptr need not be changed. * @param other simple pointer for comparison * @return true if this pointer value differs from other * @stable ICU 4.4 @@ -133,14 +133,14 @@ public: */ T *operator->() const { return ptr; } /** - * Gives up ownership; the internal pointer becomes NULL. + * Gives up ownership; the internal pointer becomes nullptr. * @return the pointer value; * caller becomes responsible for deleting the object * @stable ICU 4.4 */ T *orphan() { T *p=ptr; - ptr=NULL; + ptr=nullptr; return p; } /** @@ -197,9 +197,9 @@ public: * @param p simple pointer to an object that is adopted * @stable ICU 4.4 */ - explicit LocalPointer(T *p=NULL) : LocalPointerBase(p) {} + explicit LocalPointer(T *p=nullptr) : LocalPointerBase(p) {} /** - * Constructor takes ownership and reports an error if NULL. + * Constructor takes ownership and reports an error if nullptr. * * This constructor is intended to be used with other-class constructors * that may report a failure UErrorCode, @@ -208,11 +208,11 @@ public: * * @param p simple pointer to an object that is adopted * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR - * if p==NULL and no other failure code had been set + * if p==nullptr and no other failure code had been set * @stable ICU 55 */ LocalPointer(T *p, UErrorCode &errorCode) : LocalPointerBase(p) { - if(p==NULL && U_SUCCESS(errorCode)) { + if(p==nullptr && U_SUCCESS(errorCode)) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -222,7 +222,7 @@ public: * @stable ICU 56 */ LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; + src.ptr=nullptr; } /** @@ -255,7 +255,7 @@ public: LocalPointer &operator=(LocalPointer &&src) U_NOEXCEPT { delete LocalPointerBase::ptr; LocalPointerBase::ptr=src.ptr; - src.ptr=NULL; + src.ptr=nullptr; return *this; } @@ -307,20 +307,20 @@ public: * * If U_FAILURE(errorCode), then the current object is retained and the new one deleted. * - * If U_SUCCESS(errorCode) but the input pointer is NULL, + * If U_SUCCESS(errorCode) but the input pointer is nullptr, * then U_MEMORY_ALLOCATION_ERROR is set, - * the current object is deleted, and NULL is set. + * the current object is deleted, and nullptr is set. * * @param p simple pointer to an object that is adopted * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR - * if p==NULL and no other failure code had been set + * if p==nullptr and no other failure code had been set * @stable ICU 55 */ void adoptInsteadAndCheckErrorCode(T *p, UErrorCode &errorCode) { if(U_SUCCESS(errorCode)) { delete LocalPointerBase::ptr; LocalPointerBase::ptr=p; - if(p==NULL) { + if(p==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } else { @@ -372,9 +372,9 @@ public: * @param p simple pointer to an array of T objects that is adopted * @stable ICU 4.4 */ - explicit LocalArray(T *p=NULL) : LocalPointerBase(p) {} + explicit LocalArray(T *p=nullptr) : LocalPointerBase(p) {} /** - * Constructor takes ownership and reports an error if NULL. + * Constructor takes ownership and reports an error if nullptr. * * This constructor is intended to be used with other-class constructors * that may report a failure UErrorCode, @@ -383,11 +383,11 @@ public: * * @param p simple pointer to an array of T objects that is adopted * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR - * if p==NULL and no other failure code had been set + * if p==nullptr and no other failure code had been set * @stable ICU 56 */ LocalArray(T *p, UErrorCode &errorCode) : LocalPointerBase(p) { - if(p==NULL && U_SUCCESS(errorCode)) { + if(p==nullptr && U_SUCCESS(errorCode)) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } @@ -397,7 +397,7 @@ public: * @stable ICU 56 */ LocalArray(LocalArray &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; + src.ptr=nullptr; } /** @@ -430,7 +430,7 @@ public: LocalArray &operator=(LocalArray &&src) U_NOEXCEPT { delete[] LocalPointerBase::ptr; LocalPointerBase::ptr=src.ptr; - src.ptr=NULL; + src.ptr=nullptr; return *this; } @@ -482,20 +482,20 @@ public: * * If U_FAILURE(errorCode), then the current array is retained and the new one deleted. * - * If U_SUCCESS(errorCode) but the input pointer is NULL, + * If U_SUCCESS(errorCode) but the input pointer is nullptr, * then U_MEMORY_ALLOCATION_ERROR is set, - * the current array is deleted, and NULL is set. + * the current array is deleted, and nullptr is set. * * @param p simple pointer to an array of T objects that is adopted * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR - * if p==NULL and no other failure code had been set + * if p==nullptr and no other failure code had been set * @stable ICU 56 */ void adoptInsteadAndCheckErrorCode(T *p, UErrorCode &errorCode) { if(U_SUCCESS(errorCode)) { delete[] LocalPointerBase::ptr; LocalPointerBase::ptr=p; - if(p==NULL) { + if(p==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } } else { @@ -552,19 +552,19 @@ public: public: \ using LocalPointerBase::operator*; \ using LocalPointerBase::operator->; \ - explicit LocalPointerClassName(Type *p=NULL) : LocalPointerBase(p) {} \ + explicit LocalPointerClassName(Type *p=nullptr) : LocalPointerBase(p) {} \ LocalPointerClassName(LocalPointerClassName &&src) U_NOEXCEPT \ : LocalPointerBase(src.ptr) { \ - src.ptr=NULL; \ + src.ptr=nullptr; \ } \ /* TODO: Be agnostic of the deleter function signature from the user-provided std::unique_ptr? */ \ explicit LocalPointerClassName(std::unique_ptr &&p) \ : LocalPointerBase(p.release()) {} \ - ~LocalPointerClassName() { if (ptr != NULL) { closeFunction(ptr); } } \ + ~LocalPointerClassName() { if (ptr != nullptr) { closeFunction(ptr); } } \ LocalPointerClassName &operator=(LocalPointerClassName &&src) U_NOEXCEPT { \ - if (ptr != NULL) { closeFunction(ptr); } \ + if (ptr != nullptr) { closeFunction(ptr); } \ LocalPointerBase::ptr=src.ptr; \ - src.ptr=NULL; \ + src.ptr=nullptr; \ return *this; \ } \ /* TODO: Be agnostic of the deleter function signature from the user-provided std::unique_ptr? */ \ @@ -581,7 +581,7 @@ public: p1.swap(p2); \ } \ void adoptInstead(Type *p) { \ - if (ptr != NULL) { closeFunction(ptr); } \ + if (ptr != nullptr) { closeFunction(ptr); } \ ptr=p; \ } \ operator std::unique_ptr () && { \ diff --git a/icu4c/source/common/unicode/locid.h b/icu4c/source/common/unicode/locid.h index 2f2b3998a78..62b36b9c56e 100644 --- a/icu4c/source/common/unicode/locid.h +++ b/icu4c/source/common/unicode/locid.h @@ -258,7 +258,7 @@ public: * @param language Lowercase two-letter or three-letter ISO-639 code. * This parameter can instead be an ICU style C locale (e.g. "en_US"), * but the other parameters must not be used. - * This parameter can be NULL; if so, + * This parameter can be nullptr; if so, * the locale is initialized to match the current default locale. * (This is the same as using the default constructor.) * Please note: The Java Locale class does NOT accept the form @@ -344,7 +344,7 @@ public: /** * Clone this object. * Clones can be used concurrently in multiple threads. - * If an error occurs, then NULL is returned. + * If an error occurs, then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object @@ -378,7 +378,7 @@ public: * setDefault() only changes ICU's default locale ID, not * the default locale ID of the runtime environment. * - * @param newLocale Locale to set to. If NULL, set to the value obtained + * @param newLocale Locale to set to. If nullptr, set to the value obtained * from the runtime environment. * @param success The error code. * @system @@ -453,7 +453,7 @@ public: /** * Creates a locale from the given string after canonicalizing * the string according to CLDR by calling uloc_canonicalize(). - * @param name the locale ID to create from. Must not be NULL. + * @param name the locale ID to create from. Must not be nullptr. * @return a new locale object corresponding to the given name * @stable ICU 3.0 * @see uloc_canonicalize @@ -583,7 +583,7 @@ public: * Gets the list of keywords for the specified locale. * * @param status the status code - * @return pointer to StringEnumeration class, or NULL if there are no keywords. + * @return pointer to StringEnumeration class, or nullptr if there are no keywords. * Client must dispose of it by calling delete. * @see getKeywords * @stable ICU 2.8 @@ -594,7 +594,7 @@ public: * Gets the list of Unicode keywords for the specified locale. * * @param status the status code - * @return pointer to StringEnumeration class, or NULL if there are no keywords. + * @return pointer to StringEnumeration class, or nullptr if there are no keywords. * Client must dispose of it by calling delete. * @see getUnicodeKeywords * @stable ICU 63 @@ -722,7 +722,7 @@ public: * * @param keywordName name of the keyword to be set. Case insensitive. * @param keywordValue value of the keyword to be set. If 0-length or - * NULL, will result in the keyword being removed. No error is given if + * nullptr, will result in the keyword being removed. No error is given if * that keyword does not exist. * @param status Returns any error information while performing this operation. * @@ -743,7 +743,7 @@ public: * * @param keywordName name of the keyword to be set. * @param keywordValue value of the keyword to be set. If 0-length or - * NULL, will result in the keyword being removed. No error is given if + * nullptr, will result in the keyword being removed. No error is given if * that keyword does not exist. * @param status Returns any error information while performing this operation. * @stable ICU 63 @@ -763,7 +763,7 @@ public: * * @param keywordName name of the keyword to be set. * @param keywordValue value of the keyword to be set. If 0-length or - * NULL, will result in the keyword being removed. No error is given if + * nullptr, will result in the keyword being removed. No error is given if * that keyword does not exist. * @param status Returns any error information while performing this operation. * @stable ICU 63 diff --git a/icu4c/source/common/unicode/messagepattern.h b/icu4c/source/common/unicode/messagepattern.h index 4c5be13dbc9..55b09bfbd4b 100644 --- a/icu4c/source/common/unicode/messagepattern.h +++ b/icu4c/source/common/unicode/messagepattern.h @@ -388,7 +388,7 @@ public: * @param pattern a MessageFormat pattern string * @param parseError Struct to receive information on the position * of an error within the pattern. - * Can be NULL. + * Can be nullptr. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with @@ -428,7 +428,7 @@ public: * @param pattern a MessageFormat pattern string * @param parseError Struct to receive information on the position * of an error within the pattern. - * Can be NULL. + * Can be nullptr. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with @@ -448,7 +448,7 @@ public: * @param pattern a ChoiceFormat pattern string * @param parseError Struct to receive information on the position * of an error within the pattern. - * Can be NULL. + * Can be nullptr. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with @@ -468,7 +468,7 @@ public: * @param pattern a PluralFormat pattern string * @param parseError Struct to receive information on the position * of an error within the pattern. - * Can be NULL. + * Can be nullptr. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with @@ -488,7 +488,7 @@ public: * @param pattern a SelectFormat pattern string * @param parseError Struct to receive information on the position * of an error within the pattern. - * Can be NULL. + * Can be nullptr. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns * immediately. Check for U_FAILURE() on output or use with diff --git a/icu4c/source/common/unicode/normalizer2.h b/icu4c/source/common/unicode/normalizer2.h index 2d355250c29..174a8c70a42 100644 --- a/icu4c/source/common/unicode/normalizer2.h +++ b/icu4c/source/common/unicode/normalizer2.h @@ -92,7 +92,7 @@ public: /** * Returns a Normalizer2 instance for Unicode NFC normalization. - * Same as getInstance(NULL, "nfc", UNORM2_COMPOSE, errorCode). + * Same as getInstance(nullptr, "nfc", UNORM2_COMPOSE, errorCode). * Returns an unmodifiable singleton instance. Do not delete it. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -106,7 +106,7 @@ public: /** * Returns a Normalizer2 instance for Unicode NFD normalization. - * Same as getInstance(NULL, "nfc", UNORM2_DECOMPOSE, errorCode). + * Same as getInstance(nullptr, "nfc", UNORM2_DECOMPOSE, errorCode). * Returns an unmodifiable singleton instance. Do not delete it. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -120,7 +120,7 @@ public: /** * Returns a Normalizer2 instance for Unicode NFKC normalization. - * Same as getInstance(NULL, "nfkc", UNORM2_COMPOSE, errorCode). + * Same as getInstance(nullptr, "nfkc", UNORM2_COMPOSE, errorCode). * Returns an unmodifiable singleton instance. Do not delete it. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -134,7 +134,7 @@ public: /** * Returns a Normalizer2 instance for Unicode NFKD normalization. - * Same as getInstance(NULL, "nfkc", UNORM2_DECOMPOSE, errorCode). + * Same as getInstance(nullptr, "nfkc", UNORM2_DECOMPOSE, errorCode). * Returns an unmodifiable singleton instance. Do not delete it. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -148,7 +148,7 @@ public: /** * Returns a Normalizer2 instance for Unicode NFKC_Casefold normalization. - * Same as getInstance(NULL, "nfkc_cf", UNORM2_COMPOSE, errorCode). + * Same as getInstance(nullptr, "nfkc_cf", UNORM2_COMPOSE, errorCode). * Returns an unmodifiable singleton instance. Do not delete it. * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -166,12 +166,12 @@ public: * and which composes or decomposes text according to the specified mode. * Returns an unmodifiable singleton instance. Do not delete it. * - * Use packageName=NULL for data files that are part of ICU's own data. + * Use packageName=nullptr for data files that are part of ICU's own data. * Use name="nfc" and UNORM2_COMPOSE/UNORM2_DECOMPOSE for Unicode standard NFC/NFD. * Use name="nfkc" and UNORM2_COMPOSE/UNORM2_DECOMPOSE for Unicode standard NFKC/NFKD. * Use name="nfkc_cf" and UNORM2_COMPOSE for Unicode standard NFKC_CF=NFKC_Casefold. * - * @param packageName NULL for ICU built-in data, otherwise application data package name + * @param packageName nullptr for ICU built-in data, otherwise application data package name * @param name "nfc" or "nfkc" or "nfkc_cf" or name of custom data file * @param mode normalization mode (compose or decompose etc.) * @param errorCode Standard ICU error code. Its input value must diff --git a/icu4c/source/common/unicode/normlzr.h b/icu4c/source/common/unicode/normlzr.h index 14b24698850..03a7aa080d1 100644 --- a/icu4c/source/common/unicode/normlzr.h +++ b/icu4c/source/common/unicode/normlzr.h @@ -755,7 +755,7 @@ private: // Private data //------------------------------------------------------------------------- - FilteredNormalizer2*fFilteredNorm2; // owned if not NULL + FilteredNormalizer2*fFilteredNorm2; // owned if not nullptr const Normalizer2 *fNorm2; // not owned; may be equal to fFilteredNorm2 UNormalizationMode fUMode; // deprecated int32_t fOptions; diff --git a/icu4c/source/common/unicode/parsepos.h b/icu4c/source/common/unicode/parsepos.h index 73945f5f97b..d33a812ad0b 100644 --- a/icu4c/source/common/unicode/parsepos.h +++ b/icu4c/source/common/unicode/parsepos.h @@ -112,7 +112,7 @@ public: /** * Clone this object. * Clones can be used concurrently in multiple threads. - * If an error occurs, then NULL is returned. + * If an error occurs, then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object diff --git a/icu4c/source/common/unicode/rbbi.h b/icu4c/source/common/unicode/rbbi.h index 14d3aa213b0..b4ad51d34f9 100644 --- a/icu4c/source/common/unicode/rbbi.h +++ b/icu4c/source/common/unicode/rbbi.h @@ -372,7 +372,7 @@ public: * access the text without impacting any break iterator operations, * but the underlying text itself must not be altered. * - * @param fillIn A UText to be filled in. If NULL, a new UText will be + * @param fillIn A UText to be filled in. If nullptr, a new UText will be * allocated to hold the result. * @param status receives any error codes. * @return The current UText for this break iterator. If an input @@ -592,7 +592,7 @@ public: * tricky. Use clone() instead. * * @param stackBuffer The pointer to the memory into which the cloned object - * should be placed. If NULL, allocate heap memory + * should be placed. If nullptr, allocate heap memory * for the cloned object. * @param BufferSize The size of the buffer. If zero, return the required * buffer size, but do not clone the object. If the diff --git a/icu4c/source/common/unicode/rep.h b/icu4c/source/common/unicode/rep.h index 6dd4530647e..7115c97b829 100644 --- a/icu4c/source/common/unicode/rep.h +++ b/icu4c/source/common/unicode/rep.h @@ -192,7 +192,7 @@ public: * Clone this object, an instance of a subclass of Replaceable. * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, - * then NULL is returned. + * then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object diff --git a/icu4c/source/common/unicode/resbund.h b/icu4c/source/common/unicode/resbund.h index 6e26a40591f..30fc2ac0ab2 100644 --- a/icu4c/source/common/unicode/resbund.h +++ b/icu4c/source/common/unicode/resbund.h @@ -143,7 +143,7 @@ public: * or equivalent. Typically, packageName will refer to a (.dat) file, or to * a package registered with udata_setAppData(). Using a full file or directory * pathname for packageName is deprecated. - * NULL is used to refer to ICU data. + * nullptr is used to refer to ICU data. * @param locale The locale for which to open a resource bundle. * @param err A UErrorCode value * @stable ICU 2.0 @@ -189,7 +189,7 @@ public: /** * Clone this object. * Clones can be used concurrently in multiple threads. - * If an error occurs, then NULL is returned. + * If an error occurs, then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object @@ -304,7 +304,7 @@ public: * Returns the key associated with this resource. Not all the resources have a key - only * those that are members of a table. * - * @return a key associated to this resource, or NULL if it doesn't have a key + * @return a key associated to this resource, or nullptr if it doesn't have a key * @stable ICU 2.0 */ const char* @@ -331,7 +331,7 @@ public: getType(void) const; /** - * Returns the next resource in a given resource or NULL if there are no more resources + * Returns the next resource in a given resource or nullptr if there are no more resources * * @param status fills in the outgoing error code * @return ResourceBundle object. @@ -341,7 +341,7 @@ public: getNext(UErrorCode& status); /** - * Returns the next string in a resource or NULL if there are no more resources + * Returns the next string in a resource or nullptr if there are no more resources * to iterate over. * * @param status fills in the outgoing error code @@ -352,7 +352,7 @@ public: getNextString(UErrorCode& status); /** - * Returns the next string in a resource or NULL if there are no more resources + * Returns the next string in a resource or nullptr if there are no more resources * to iterate over. * * @param key fill in for key associated with this string diff --git a/icu4c/source/common/unicode/simpleformatter.h b/icu4c/source/common/unicode/simpleformatter.h index 6d9c04ace23..e7bbf8cf2d8 100644 --- a/icu4c/source/common/unicode/simpleformatter.h +++ b/icu4c/source/common/unicode/simpleformatter.h @@ -217,13 +217,13 @@ public: * * @param values The argument values. * An argument value must not be the same object as appendTo. - * Can be NULL if valuesLength==getArgumentLimit()==0. + * Can be nullptr if valuesLength==getArgumentLimit()==0. * @param valuesLength The length of the values array. * Must be at least getArgumentLimit(). * @param appendTo Gets the formatted pattern and values appended. * @param offsets offsets[i] receives the offset of where * values[i] replaced pattern argument {i}. - * Can be shorter or longer than values. Can be NULL if offsetsLength==0. + * Can be shorter or longer than values. Can be nullptr if offsetsLength==0. * If there is no {i} in the pattern, then offsets[i] is set to -1. * @param offsetsLength The length of the offsets array. * @param errorCode ICU error code in/out parameter. @@ -243,13 +243,13 @@ public: * * @param values The argument values. * An argument value may be the same object as result. - * Can be NULL if valuesLength==getArgumentLimit()==0. + * Can be nullptr if valuesLength==getArgumentLimit()==0. * @param valuesLength The length of the values array. * Must be at least getArgumentLimit(). * @param result Gets its contents replaced by the formatted pattern and values. * @param offsets offsets[i] receives the offset of where * values[i] replaced pattern argument {i}. - * Can be shorter or longer than values. Can be NULL if offsetsLength==0. + * Can be shorter or longer than values. Can be nullptr if offsetsLength==0. * If there is no {i} in the pattern, then offsets[i] is set to -1. * @param offsetsLength The length of the offsets array. * @param errorCode ICU error code in/out parameter. diff --git a/icu4c/source/common/unicode/strenum.h b/icu4c/source/common/unicode/strenum.h index 1d1b37940a8..fba5c9b8147 100644 --- a/icu4c/source/common/unicode/strenum.h +++ b/icu4c/source/common/unicode/strenum.h @@ -70,7 +70,7 @@ public: * Clone this object, an instance of a subclass of StringEnumeration. * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, - * then NULL is returned. + * then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object @@ -101,8 +101,8 @@ public: /** *

Returns the next element as a NUL-terminated char*. If there - * are no more elements, returns NULL. If the resultLength pointer - * is not NULL, the length of the string (not counting the + * are no more elements, returns nullptr. If the resultLength pointer + * is not nullptr, the length of the string (not counting the * terminating NUL) is returned at that address. If an error * status is returned, the value at resultLength is undefined.

* @@ -111,21 +111,21 @@ public: * to next, unext, snext, reset, or the enumerator's destructor.

* *

If the iterator is out of sync with its service, status is set - * to U_ENUM_OUT_OF_SYNC_ERROR and NULL is returned.

+ * to U_ENUM_OUT_OF_SYNC_ERROR and nullptr is returned.

* *

If the native service string is a char16_t* string, it is * converted to char* with the invariant converter. If the * conversion fails (because a character cannot be converted) then * status is set to U_INVARIANT_CONVERSION_ERROR and the return - * value is undefined (though not NULL).

+ * value is undefined (though not nullptr).

* * Starting with ICU 2.8, the default implementation calls snext() * and handles the conversion. * Either next() or snext() must be implemented differently by a subclass. * * @param status the error code. - * @param resultLength a pointer to receive the length, can be NULL. - * @return a pointer to the string, or NULL. + * @param resultLength a pointer to receive the length, can be nullptr. + * @return a pointer to the string, or nullptr. * * @stable ICU 2.4 */ @@ -133,8 +133,8 @@ public: /** *

Returns the next element as a NUL-terminated char16_t*. If there - * are no more elements, returns NULL. If the resultLength pointer - * is not NULL, the length of the string (not counting the + * are no more elements, returns nullptr. If the resultLength pointer + * is not nullptr, the length of the string (not counting the * terminating NUL) is returned at that address. If an error * status is returned, the value at resultLength is undefined.

* @@ -143,14 +143,14 @@ public: * to next, unext, snext, reset, or the enumerator's destructor.

* *

If the iterator is out of sync with its service, status is set - * to U_ENUM_OUT_OF_SYNC_ERROR and NULL is returned.

+ * to U_ENUM_OUT_OF_SYNC_ERROR and nullptr is returned.

* * Starting with ICU 2.8, the default implementation calls snext() * and handles the conversion. * * @param status the error code. - * @param resultLength a pointer to receive the length, can be NULL. - * @return a pointer to the string, or NULL. + * @param resultLength a pointer to receive the length, can be nullptr. + * @return a pointer to the string, or nullptr. * * @stable ICU 2.4 */ @@ -158,21 +158,21 @@ public: /** *

Returns the next element a UnicodeString*. If there are no - * more elements, returns NULL.

+ * more elements, returns nullptr.

* *

The returned pointer is owned by this iterator and must not be * deleted by the caller. The pointer is valid until the next call * to next, unext, snext, reset, or the enumerator's destructor.

* *

If the iterator is out of sync with its service, status is set - * to U_ENUM_OUT_OF_SYNC_ERROR and NULL is returned.

+ * to U_ENUM_OUT_OF_SYNC_ERROR and nullptr is returned.

* * Starting with ICU 2.8, the default implementation calls next() * and handles the conversion. * Either next() or snext() must be implemented differently by a subclass. * * @param status the error code. - * @return a pointer to the string, or NULL. + * @return a pointer to the string, or nullptr. * * @stable ICU 2.4 */ diff --git a/icu4c/source/common/unicode/stringtriebuilder.h b/icu4c/source/common/unicode/stringtriebuilder.h index b7a9b23d22b..429d7883f15 100644 --- a/icu4c/source/common/unicode/stringtriebuilder.h +++ b/icu4c/source/common/unicode/stringtriebuilder.h @@ -152,7 +152,7 @@ protected: * equivalent to newNode. * @param newNode Input node. The builder takes ownership. * @param errorCode ICU in/out UErrorCode. - Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==NULL. + Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==nullptr. * @return newNode if it is the first of its kind, or * an equivalent node if newNode is a duplicate. * @internal @@ -164,7 +164,7 @@ protected: * Avoids creating a node if the value is a duplicate. * @param value A final value. * @param errorCode ICU in/out UErrorCode. - Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==NULL. + Set to U_MEMORY_ALLOCATION_ERROR if it was success but newNode==nullptr. * @return A FinalValueNode with the given value. * @internal */ @@ -176,11 +176,11 @@ protected: * registerNode() and registerFinalValue() take ownership of their input nodes, * and only return owned nodes. * If they see a failure UErrorCode, they will delete the input node. - * If they get a NULL pointer, they will record a U_MEMORY_ALLOCATION_ERROR. - * If there is a failure, they return NULL. + * If they get a nullptr pointer, they will record a U_MEMORY_ALLOCATION_ERROR. + * If there is a failure, they return nullptr. * - * NULL Node pointers can be safely passed into other Nodes because - * they call the static Node::hashCode() which checks for a NULL pointer first. + * nullptr Node pointers can be safely passed into other Nodes because + * they call the static Node::hashCode() which checks for a nullptr pointer first. * * Therefore, as long as builder functions register a new node, * they need to check for failures only before explicitly dereferencing @@ -201,8 +201,8 @@ protected: public: Node(int32_t initialHash) : hash(initialHash), offset(0) {} inline int32_t hashCode() const { return hash; } - // Handles node==NULL. - static inline int32_t hashCode(const Node *node) { return node==NULL ? 0 : node->hashCode(); } + // Handles node==nullptr. + static inline int32_t hashCode(const Node *node) { return node==nullptr ? 0 : node->hashCode(); } // Base class operator==() compares the actual class types. virtual bool operator==(const Node &other) const; inline bool operator!=(const Node &other) const { return !operator==(other); } @@ -347,7 +347,7 @@ protected: // Adds a unit with a final value. void add(int32_t c, int32_t value) { units[length]=(char16_t)c; - equal[length]=NULL; + equal[length]=nullptr; values[length]=value; ++length; hash=(hash*37u+c)*37u+value; @@ -361,7 +361,7 @@ protected: hash=(hash*37u+c)*37u+hashCode(node); } protected: - Node *equal[kMaxBranchLinearSubNodeLength]; // NULL means "has final value". + Node *equal[kMaxBranchLinearSubNodeLength]; // nullptr means "has final value". int32_t length; int32_t values[kMaxBranchLinearSubNodeLength]; char16_t units[kMaxBranchLinearSubNodeLength]; diff --git a/icu4c/source/common/unicode/symtable.h b/icu4c/source/common/unicode/symtable.h index b64d877f974..647a3884a00 100644 --- a/icu4c/source/common/unicode/symtable.h +++ b/icu4c/source/common/unicode/symtable.h @@ -73,10 +73,10 @@ public: /** * Lookup the characters associated with this string and return it. - * Return NULL if no such name exists. The resultant + * Return nullptr if no such name exists. The resultant * string may have length zero. * @param s the symbolic name to lookup - * @return a string containing the name's value, or NULL if + * @return a string containing the name's value, or nullptr if * there is no mapping for s. * @stable ICU 2.8 */ @@ -84,10 +84,10 @@ public: /** * Lookup the UnicodeMatcher associated with the given character, and - * return it. Return NULL if not found. + * return it. Return nullptr if not found. * @param ch a 32-bit code point from 0 to 0x10FFFF inclusive. * @return the UnicodeMatcher object represented by the given - * character, or NULL if there is no mapping for ch. + * character, or nullptr if there is no mapping for ch. * @stable ICU 2.8 */ virtual const UnicodeFunctor* lookupMatcher(UChar32 ch) const = 0; diff --git a/icu4c/source/common/unicode/ucharstrie.h b/icu4c/source/common/unicode/ucharstrie.h index 064244a74c1..fa1b55616c6 100644 --- a/icu4c/source/common/unicode/ucharstrie.h +++ b/icu4c/source/common/unicode/ucharstrie.h @@ -67,7 +67,7 @@ public: * @stable ICU 4.8 */ UCharsTrie(ConstChar16Ptr trieUChars) - : ownedArray_(NULL), uchars_(trieUChars), + : ownedArray_(nullptr), uchars_(trieUChars), pos_(uchars_), remainingMatchLength_(-1) {} /** @@ -83,7 +83,7 @@ public: * @stable ICU 4.8 */ UCharsTrie(const UCharsTrie &other) - : ownedArray_(NULL), uchars_(other.uchars_), + : ownedArray_(nullptr), uchars_(other.uchars_), pos_(other.pos_), remainingMatchLength_(other.remainingMatchLength_) {} /** @@ -141,7 +141,7 @@ public: * Constructs an empty State. * @stable ICU 4.8 */ - State() { uchars=NULL; } + State() { uchars=nullptr; } private: friend class UCharsTrie; @@ -175,7 +175,7 @@ public: * @stable ICU 4.8 */ UCharsTrie &resetToState(const State &state) { - if(uchars_==state.uchars && uchars_!=NULL) { + if(uchars_==state.uchars && uchars_!=nullptr) { pos_=state.pos; remainingMatchLength_=state.remainingMatchLength; } @@ -239,7 +239,7 @@ public: * result=next(c); * return result; * \endcode - * @param s A string. Can be NULL if length is 0. + * @param s A string. Can be nullptr if length is 0. * @param length The length of the string. Can be -1 if NUL-terminated. * @return The match/value Result. * @stable ICU 4.8 @@ -275,7 +275,7 @@ public: inline UBool hasUniqueValue(int32_t &uniqueValue) const { const char16_t *pos=pos_; // Skip the rest of a pending linear-match node. - return pos!=NULL && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); + return pos!=nullptr && findUniqueValue(pos+remainingMatchLength_+1, false, uniqueValue); } /** @@ -367,7 +367,7 @@ public: private: UBool truncateAndStop() { - pos_=NULL; + pos_=nullptr; value_=-1; // no real value for str return true; } @@ -412,7 +412,7 @@ private: UCharsTrie &operator=(const UCharsTrie &other) = delete; inline void stop() { - pos_=NULL; + pos_=nullptr; } // Reads a compact 32-bit integer. @@ -610,7 +610,7 @@ private: // Iterator variables. - // Pointer to next trie unit to read. NULL if no more matches. + // Pointer to next trie unit to read. nullptr if no more matches. const char16_t *pos_; // Remaining length of a linear-match node, minus 1. Negative if not in such a node. int32_t remainingMatchLength_; diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h index 33e35c4def8..83ebdb13196 100644 --- a/icu4c/source/common/unicode/uniset.h +++ b/icu4c/source/common/unicode/uniset.h @@ -297,8 +297,8 @@ private: int32_t len = 1; // length of list used; 1 <= len <= capacity uint8_t fFlags = 0; // Bit flag (see constants above) - BMPSet *bmpSet = nullptr; // The set is frozen iff either bmpSet or stringSpan is not NULL. - UChar32* buffer = nullptr; // internal buffer, may be NULL + BMPSet *bmpSet = nullptr; // The set is frozen iff either bmpSet or stringSpan is not nullptr. + UChar32* buffer = nullptr; // internal buffer, may be nullptr int32_t bufferCapacity = 0; // capacity of buffer /** @@ -432,7 +432,7 @@ public: * @param options bitmask for options to apply to the pattern. * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. * @param symbols a symbol table mapping variable names to values - * and stand-in characters to UnicodeSets; may be NULL + * and stand-in characters to UnicodeSets; may be nullptr * @param status returns U_ILLEGAL_ARGUMENT_ERROR if the pattern * contains a syntax error. * @internal @@ -452,7 +452,7 @@ public: * @param options bitmask for options to apply to the pattern. * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. * @param symbols a symbol table mapping variable names to values - * and stand-in characters to UnicodeSets; may be NULL + * and stand-in characters to UnicodeSets; may be nullptr * @param status input-output error code * @stable ICU 2.8 */ @@ -647,7 +647,7 @@ public: * @param options bitmask for options to apply to the pattern. * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. * @param symbols a symbol table mapping variable names to - * values and stand-ins to UnicodeSets; may be NULL + * values and stand-ins to UnicodeSets; may be nullptr * @param status returns U_ILLEGAL_ARGUMENT_ERROR if the pattern * contains a syntax error. * Empties the set passed before applying the pattern. @@ -685,7 +685,7 @@ public: * @param options bitmask for options to apply to the pattern. * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. * @param symbols a symbol table mapping variable names to - * values and stand-ins to UnicodeSets; may be NULL + * values and stand-ins to UnicodeSets; may be nullptr * @param status returns U_ILLEGAL_ARGUMENT_ERROR if the pattern * contains a syntax error. * @return a reference to this @@ -1488,7 +1488,7 @@ public: * bits followed by least significant 16 bits. * * @param dest pointer to buffer of destCapacity 16-bit integers. - * May be NULL only if destCapacity is zero. + * May be nullptr only if destCapacity is zero. * @param destCapacity size of dest, or zero. Must not be negative. * @param ec error code. Will be set to U_INDEX_OUTOFBOUNDS_ERROR * if n+2*m > 0x7FFF. Will be set to U_BUFFER_OVERFLOW_ERROR if @@ -1718,7 +1718,7 @@ inline bool UnicodeSet::operator!=(const UnicodeSet& o) const { } inline UBool UnicodeSet::isFrozen() const { - return (UBool)(bmpSet!=NULL || stringSpan!=NULL); + return (UBool)(bmpSet!=nullptr || stringSpan!=nullptr); } inline UBool UnicodeSet::containsSome(UChar32 start, UChar32 end) const { diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h index b3c99481079..27347bd36d4 100644 --- a/icu4c/source/common/unicode/unistr.h +++ b/icu4c/source/common/unicode/unistr.h @@ -253,7 +253,7 @@ class UnicodeStringAppendable; // unicode/appendable.h * target object, e.g., calling str.append(str), an extra copy may take place * to ensure safety. * - If primitive string pointer values (e.g., const char16_t * or char *) - * for input strings are NULL, then those input string parameters are treated + * for input strings are nullptr, then those input string parameters are treated * as if they pointed to an empty string. * However, this is *not* the case for char * parameters for charset names * or other IDs. @@ -1542,7 +1542,7 @@ public: * * @param start offset of first character which will be copied * @param startLength the number of characters to extract - * @param target the target buffer for extraction, can be NULL + * @param target the target buffer for extraction, can be nullptr * if targetLength is 0 * @param targetCapacity the length of the target buffer * @param inv Signature-distinguishing parameter, use US_INV. @@ -1571,7 +1571,7 @@ public: * @param startLength the number of characters to extract * @param target the target buffer for extraction * @param targetLength the length of the target buffer - * If `target` is NULL, then the number of bytes required for + * If `target` is nullptr, then the number of bytes required for * `target` is returned. * @return the output string length, not including the terminating NUL * @stable ICU 2.0 @@ -1604,7 +1604,7 @@ public: * If `codepage` is an empty string (`""`), * then a simple conversion is performed on the codepage-invariant * subset ("invariant characters") of the platform encoding. See utypes.h. - * If `target` is NULL, then the number of bytes required for + * If `target` is nullptr, then the number of bytes required for * `target` is returned. It is assumed that the target is big enough * to fit all of the characters. * @return the output string length, not including the terminating NUL @@ -1639,7 +1639,7 @@ public: * If `codepage` is an empty string (`""`), * then a simple conversion is performed on the codepage-invariant * subset ("invariant characters") of the platform encoding. See utypes.h. - * If `target` is NULL, then the number of bytes required for + * If `target` is nullptr, then the number of bytes required for * `target` is returned. * @return the output string length, not including the terminating NUL * @stable ICU 2.0 @@ -1657,10 +1657,10 @@ public: * This function avoids the overhead of opening and closing a converter if * multiple strings are extracted. * - * @param dest destination string buffer, can be NULL if destCapacity==0 + * @param dest destination string buffer, can be nullptr if destCapacity==0 * @param destCapacity the number of chars available at dest * @param cnv the converter object to be used (ucnv_resetFromUnicode() will be called), - * or NULL for the default converter + * or nullptr for the default converter * @param errorCode normal ICU error code * @return the length of the output string, not counting the terminating NUL; * if the length is greater than destCapacity, then the string will not fit @@ -1737,7 +1737,7 @@ public: * Unpaired surrogates are replaced with U+FFFD. * Calls u_strToUTF32WithSub(). * - * @param utf32 destination string buffer, can be NULL if capacity==0 + * @param utf32 destination string buffer, can be nullptr if capacity==0 * @param capacity the number of UChar32s available at utf32 * @param errorCode Standard ICU error code. Its input value must * pass the U_SUCCESS() test, or else the function returns @@ -1835,7 +1835,7 @@ public: * A bogus string has no value. It is different from an empty string, * although in both cases isEmpty() returns true and length() returns 0. * setToBogus() and isBogus() can be used to indicate that no string value is available. - * For a bogus string, getBuffer() and getTerminatedBuffer() return NULL, and + * For a bogus string, getBuffer() and getTerminatedBuffer() return nullptr, and * length() returns 0. * * @return true if the string is bogus/invalid, false otherwise @@ -2072,7 +2072,7 @@ public: * * A bogus string has no value. It is different from an empty string. * It can be used to indicate that no string value is available. - * getBuffer() and getTerminatedBuffer() return NULL, and + * getBuffer() and getTerminatedBuffer() return nullptr, and * length() returns 0. * * This utility function is used throughout the UnicodeString @@ -2978,7 +2978,7 @@ public: * `-DUNISTR_FROM_STRING_EXPLICIT=explicit` * on the compiler command line or similar. * @param text The characters to place in the UnicodeString. `text` - * must be NULL (U+0000) terminated. + * must be NUL (U+0000) terminated. * @stable ICU 2.0 */ UNISTR_FROM_STRING_EXPLICIT UnicodeString(const char16_t *text); @@ -3245,7 +3245,7 @@ public: * @param src input codepage string * @param srcLength length of the input string, can be -1 for NUL-terminated strings * @param cnv converter object (ucnv_resetToUnicode() will be called), - * can be NULL for the default converter + * can be nullptr for the default converter * @param errorCode normal ICU error code * @stable ICU 2.0 */ @@ -3329,7 +3329,7 @@ public: * Clone this object, an instance of a subclass of Replaceable. * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, - * then NULL is returned. + * then nullptr is returned. * The caller must delete the clone. * * @return a clone of this object @@ -3365,7 +3365,7 @@ public: * Illegal input is replaced with U+FFFD. Otherwise, errors result in a bogus string. * Calls u_strFromUTF32WithSub(). * - * @param utf32 UTF-32 input string. Must not be NULL. + * @param utf32 UTF-32 input string. Must not be nullptr. * @param length Length of the input string, or -1 if NUL-terminated. * @return A UnicodeString with equivalent UTF-16 contents. * @see toUTF32 @@ -3706,7 +3706,7 @@ private: kEmptyHashCode=1, // hash code for empty string // bit flag values for fLengthAndFlags - kIsBogus=1, // this string is bogus, i.e., not valid or NULL + kIsBogus=1, // this string is bogus, i.e., not valid or nullptr kUsingStackBuffer=2,// using fUnion.fStackFields instead of fUnion.fFields kRefCounted=4, // there is a refCount field before the characters in fArray kBufferIsReadonly=8,// do not write to this buffer @@ -4712,18 +4712,18 @@ UnicodeString::remove(int32_t start, // remove(guaranteed everything) of a bogus string makes the string empty and non-bogus return remove(); } - return doReplace(start, _length, NULL, 0, 0); + return doReplace(start, _length, nullptr, 0, 0); } inline UnicodeString& UnicodeString::removeBetween(int32_t start, int32_t limit) -{ return doReplace(start, limit - start, NULL, 0, 0); } +{ return doReplace(start, limit - start, nullptr, 0, 0); } inline UnicodeString & UnicodeString::retainBetween(int32_t start, int32_t limit) { truncate(limit); - return doReplace(0, start, NULL, 0, 0); + return doReplace(0, start, nullptr, 0, 0); } inline UBool diff --git a/icu4c/source/common/unicode/uobject.h b/icu4c/source/common/unicode/uobject.h index 25a8330f9ac..58cd5f4e30b 100644 --- a/icu4c/source/common/unicode/uobject.h +++ b/icu4c/source/common/unicode/uobject.h @@ -38,8 +38,8 @@ * certain functions do not throw any exceptions * * UMemory operator new methods should have the throw() specification - * appended to them, so that the compiler adds the additional NULL check - * before calling constructors. Without, if operator new returns NULL the + * appended to them, so that the compiler adds the additional nullptr check + * before calling constructors. Without, if operator new returns nullptr the * constructor is still called, and if the constructor references member * data, (which it typically does), the result is a segmentation violation. * diff --git a/icu4c/source/common/unicode/utext.h b/icu4c/source/common/unicode/utext.h index c6d1e53a8ce..423b281631d 100644 --- a/icu4c/source/common/unicode/utext.h +++ b/icu4c/source/common/unicode/utext.h @@ -230,8 +230,8 @@ utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status); /** * Open a writable UText for a non-const UnicodeString. * - * @param ut Pointer to a UText struct. If NULL, a new UText will be created. - * If non-NULL, must refer to an initialized UText struct, which will then + * @param ut Pointer to a UText struct. If nullptr, a new UText will be created. + * If non-nullptr, must refer to an initialized UText struct, which will then * be reset to reference the specified input string. * @param s A UnicodeString. * @param status Errors are returned here. @@ -246,8 +246,8 @@ utext_openUnicodeString(UText *ut, icu::UnicodeString *s, UErrorCode *status); /** * Open a UText for a const UnicodeString. The resulting UText will not be writable. * - * @param ut Pointer to a UText struct. If NULL, a new UText will be created. - * If non-NULL, must refer to an initialized UText struct, which will then + * @param ut Pointer to a UText struct. If nullptr, a new UText will be created. + * If non-nullptr, must refer to an initialized UText struct, which will then * be reset to reference the specified input string. * @param s A const UnicodeString to be wrapped. * @param status Errors are returned here. @@ -261,8 +261,8 @@ utext_openConstUnicodeString(UText *ut, const icu::UnicodeString *s, UErrorCode /** * Open a writable UText implementation for an ICU Replaceable object. - * @param ut Pointer to a UText struct. If NULL, a new UText will be created. - * If non-NULL, must refer to an already existing UText, which will then + * @param ut Pointer to a UText struct. If nullptr, a new UText will be created. + * If non-nullptr, must refer to an already existing UText, which will then * be reset to reference the specified replaceable text. * @param rep A Replaceable text object. * @param status Errors are returned here. @@ -276,8 +276,8 @@ utext_openReplaceable(UText *ut, icu::Replaceable *rep, UErrorCode *status); /** * Open a UText implementation over an ICU CharacterIterator. - * @param ut Pointer to a UText struct. If NULL, a new UText will be created. - * If non-NULL, must refer to an already existing UText, which will then + * @param ut Pointer to a UText struct. If nullptr, a new UText will be created. + * If non-nullptr, must refer to an already existing UText, which will then * be reset to reference the specified replaceable text. * @param ci A Character Iterator. * @param status Errors are returned here. diff --git a/icu4c/source/common/unifiedcache.cpp b/icu4c/source/common/unifiedcache.cpp index cfb000b2c8e..1284c03813e 100644 --- a/icu4c/source/common/unifiedcache.cpp +++ b/icu4c/source/common/unifiedcache.cpp @@ -19,7 +19,7 @@ #include "uhash.h" #include "ucln_cmn.h" -static icu::UnifiedCache *gCache = NULL; +static icu::UnifiedCache *gCache = nullptr; static std::mutex *gCacheMutex = nullptr; static std::condition_variable *gInProgressValueAddedCond; static icu::UInitOnce gCacheInitOnce {}; @@ -68,19 +68,19 @@ CacheKeyBase::~CacheKeyBase() { } static void U_CALLCONV cacheInit(UErrorCode &status) { - U_ASSERT(gCache == NULL); + U_ASSERT(gCache == nullptr); ucln_common_registerCleanup( UCLN_COMMON_UNIFIED_CACHE, unifiedcache_cleanup); gCacheMutex = STATIC_NEW(std::mutex); gInProgressValueAddedCond = STATIC_NEW(std::condition_variable); gCache = new UnifiedCache(status); - if (gCache == NULL) { + if (gCache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } if (U_FAILURE(status)) { delete gCache; - gCache = NULL; + gCache = nullptr; return; } } @@ -88,14 +88,14 @@ static void U_CALLCONV cacheInit(UErrorCode &status) { UnifiedCache *UnifiedCache::getInstance(UErrorCode &status) { umtx_initOnce(gCacheInitOnce, &cacheInit, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } - U_ASSERT(gCache != NULL); + U_ASSERT(gCache != nullptr); return gCache; } UnifiedCache::UnifiedCache(UErrorCode &status) : - fHashtable(NULL), + fHashtable(nullptr), fEvictPos(UHASH_FIRST), fNumValuesTotal(0), fNumValuesInUse(0), @@ -118,7 +118,7 @@ UnifiedCache::UnifiedCache(UErrorCode &status) : fHashtable = uhash_open( &ucache_hashKeys, &ucache_compareKeys, - NULL, + nullptr, &status); if (U_FAILURE(status)) { return; @@ -196,7 +196,7 @@ void UnifiedCache::_dumpContents() const { const UHashElement *element = uhash_nextElement(fHashtable, &pos); char buffer[256]; int32_t cnt = 0; - for (; element != NULL; element = uhash_nextElement(fHashtable, &pos)) { + for (; element != nullptr; element = uhash_nextElement(fHashtable, &pos)) { const SharedObject *sharedObject = (const SharedObject *) element->value.pointer; const CacheKeyBase *key = @@ -208,7 +208,7 @@ void UnifiedCache::_dumpContents() const { "Unified Cache: Key '%s', error %d, value %p, total refcount %d, soft refcount %d\n", key->writeDescription(buffer, 256), key->creationStatus, - sharedObject == fNoValue ? NULL :sharedObject, + sharedObject == fNoValue ? nullptr :sharedObject, sharedObject->getRefCount(), sharedObject->getSoftRefCount()); } @@ -236,7 +236,7 @@ UnifiedCache::~UnifiedCache() { const UHashElement * UnifiedCache::_nextElement() const { const UHashElement *element = uhash_nextElement(fHashtable, &fEvictPos); - if (element == NULL) { + if (element == nullptr) { fEvictPos = UHASH_FIRST; return uhash_nextElement(fHashtable, &fEvictPos); } @@ -305,7 +305,7 @@ void UnifiedCache::_putNew( return; } CacheKeyBase *keyToAdopt = key.clone(); - if (keyToAdopt == NULL) { + if (keyToAdopt == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -327,11 +327,11 @@ void UnifiedCache::_putIfAbsentAndGet( UErrorCode &status) const { std::lock_guard lock(*gCacheMutex); const UHashElement *element = uhash_find(fHashtable, &key); - if (element != NULL && !_inProgress(element)) { + if (element != nullptr && !_inProgress(element)) { _fetch(element, value, status); return; } - if (element == NULL) { + if (element == nullptr) { UErrorCode putError = U_ZERO_ERROR; // best-effort basis only. _putNew(key, value, status, putError); @@ -348,7 +348,7 @@ UBool UnifiedCache::_poll( const CacheKeyBase &key, const SharedObject *&value, UErrorCode &status) const { - U_ASSERT(value == NULL); + U_ASSERT(value == nullptr); U_ASSERT(status == U_ZERO_ERROR); std::unique_lock lock(*gCacheMutex); const UHashElement *element = uhash_find(fHashtable, &key); @@ -356,14 +356,14 @@ UBool UnifiedCache::_poll( // If the hash table contains an inProgress placeholder entry for this key, // this means that another thread is currently constructing the value object. // Loop, waiting for that construction to complete. - while (element != NULL && _inProgress(element)) { + while (element != nullptr && _inProgress(element)) { gInProgressValueAddedCond->wait(lock); element = uhash_find(fHashtable, &key); } // If the hash table contains an entry for the key, // fetch out the contents and return them. - if (element != NULL) { + if (element != nullptr) { _fetch(element, value, status); return true; } @@ -380,7 +380,7 @@ void UnifiedCache::_get( const SharedObject *&value, const void *creationContext, UErrorCode &status) const { - U_ASSERT(value == NULL); + U_ASSERT(value == nullptr); U_ASSERT(status == U_ZERO_ERROR); if (_poll(key, value, status)) { if (value == fNoValue) { @@ -392,9 +392,9 @@ void UnifiedCache::_get( return; } value = key.createObject(creationContext, status); - U_ASSERT(value == NULL || value->hasHardReferences()); - U_ASSERT(value != NULL || status != U_ZERO_ERROR); - if (value == NULL) { + U_ASSERT(value == nullptr || value->hasHardReferences()); + U_ASSERT(value != nullptr || status != U_ZERO_ERROR); + if (value == nullptr) { SharedObject::copyPtr(fNoValue, value); } _putIfAbsentAndGet(key, value, status); @@ -451,7 +451,7 @@ void UnifiedCache::_fetch( UBool UnifiedCache::_inProgress(const UHashElement* element) const { UErrorCode status = U_ZERO_ERROR; - const SharedObject * value = NULL; + const SharedObject * value = nullptr; _fetch(element, value, status); UBool result = _inProgress(value, status); removeHardRef(value); diff --git a/icu4c/source/common/unifiedcache.h b/icu4c/source/common/unifiedcache.h index 4b9222124a2..217031a27d2 100644 --- a/icu4c/source/common/unifiedcache.h +++ b/icu4c/source/common/unifiedcache.h @@ -57,21 +57,21 @@ class U_COMMON_API CacheKeyBase : public UObject { * Create a new object for this key. Called by cache on cache miss. * createObject must add a reference to the object it returns. Note * that getting an object from the cache and returning it without calling - * removeRef on it satisfies this requirement. It can also return NULL + * removeRef on it satisfies this requirement. It can also return nullptr * and set status to an error. * * @param creationContext the context in which the object is being - * created. May be NULL. + * created. May be nullptr. * @param status Implementations can return a failure here. * In addition, implementations may return a - * non NULL object and set a warning status. + * non nullptr object and set a warning status. */ virtual const SharedObject *createObject( const void *creationContext, UErrorCode &status) const = 0; /** * Writes a description of this key to buffer and returns buffer. Written - * description is NULL terminated. + * description is nullptr terminated. */ virtual char *writeDescription(char *buffer, int32_t bufSize) const = 0; @@ -196,14 +196,14 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Fetches a value from the cache by key. Equivalent to - * get(key, NULL, ptr, status); + * get(key, nullptr, ptr, status); */ template void get( const CacheKey& key, const T *&ptr, UErrorCode &status) const { - get(key, NULL, ptr, status); + get(key, nullptr, ptr, status); } /** @@ -211,12 +211,12 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { * * @param key the cache key. * @param creationContext passed verbatim to createObject method of key - * @param ptr On entry, ptr must be NULL or be included if + * @param ptr On entry, ptr must be nullptr or be included if * the reference count of the object it points * to. On exit, ptr points to the fetched object * from the cache or is left unchanged on * failure. Caller must call removeRef on ptr - * if set to a non NULL value. + * if set to a non nullptr value. * @param status Any error returned here. May be set to a * warning value even if ptr is set. */ @@ -230,7 +230,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { return; } UErrorCode creationStatus = U_ZERO_ERROR; - const SharedObject *value = NULL; + const SharedObject *value = nullptr; _get(key, value, creationContext, creationStatus); const T *tvalue = (const T *) value; if (U_SUCCESS(creationStatus)) { @@ -254,13 +254,13 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Convenience method to get a value of type T from cache for a - * particular locale with creationContext == NULL. + * particular locale with creationContext == nullptr. * @param loc the locale - * @param ptr On entry, must be NULL or included in the ref count + * @param ptr On entry, must be nullptr or included in the ref count * of the object to which it points. * On exit, fetched value stored here or is left * unchanged on failure. Caller must call removeRef on - * ptr if set to a non NULL value. + * ptr if set to a non nullptr value. * @param status Any error returned here. May be set to a * warning value even if ptr is set. */ @@ -376,14 +376,14 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Gets value out of cache. - * On entry. gCacheMutex must not be held. value must be NULL. status + * On entry. gCacheMutex must not be held. value must be nullptr. status * must be U_ZERO_ERROR. * On exit. value and status set to what is in cache at key or on cache * miss the key's createObject() is called and value and status are set to * the result of that. In this latter case, best effort is made to add the * value and status to the cache. If createObject() fails to create a value, - * fNoValue is stored in cache, and value is set to NULL. Caller must call - * removeRef on value if non NULL. + * fNoValue is stored in cache, and value is set to nullptr. Caller must call + * removeRef on value if non nullptr. */ void _get( const CacheKeyBase &key, @@ -393,7 +393,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Attempts to fetch value and status for key from cache. - * On entry, gCacheMutex must not be held value must be NULL and status must + * On entry, gCacheMutex must not be held value must be nullptr and status must * be U_ZERO_ERROR. * On exit, either returns false (In this * case caller should try to create the object) or returns true with value @@ -478,7 +478,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Store a value and creation error status in given hash entry. * On entry, gCacheMutex must be held. Hash entry element must be in progress. - * value must be non NULL. + * value must be non nullptr. * On Exit, soft reference added to value. value and status stored in hash * entry. Soft reference removed from previous stored value. Waiting * threads notified. @@ -522,7 +522,7 @@ class U_COMMON_API UnifiedCache : public UnifiedCacheBase { /** * Fetch value and error code from a particular hash entry. - * On entry, gCacheMutex must be held. value must be either NULL or must be + * On entry, gCacheMutex must be held. value must be either nullptr or must be * included in the ref count of the object to which it points. * On exit, value and status set to what is in the hash entry. Caller must * eventually call removeRef on value. diff --git a/icu4c/source/common/uniset.cpp b/icu4c/source/common/uniset.cpp index 4faace525c5..613e9665e91 100644 --- a/icu4c/source/common/uniset.cpp +++ b/icu4c/source/common/uniset.cpp @@ -226,7 +226,7 @@ UnicodeSet& UnicodeSet::copyFrom(const UnicodeSet& o, UBool asThawed) { uprv_memcpy(list, o.list, (size_t)len*sizeof(UChar32)); if (o.bmpSet != nullptr && !asThawed) { bmpSet = new BMPSet(*o.bmpSet, list, len); - if (bmpSet == NULL) { // Check for memory allocation error. + if (bmpSet == nullptr) { // Check for memory allocation error. setToBogus(); return *this; } @@ -243,7 +243,7 @@ UnicodeSet& UnicodeSet::copyFrom(const UnicodeSet& o, UBool asThawed) { } if (o.stringSpan != nullptr && !asThawed) { stringSpan = new UnicodeSetStringSpan(*o.stringSpan, *strings); - if (stringSpan == NULL) { // Check for memory allocation error. + if (stringSpan == nullptr) { // Check for memory allocation error. setToBogus(); return *this; } @@ -345,10 +345,10 @@ UBool UnicodeSet::contains(UChar32 c) const { //for (;;) { // if (c < list[++i]) break; //} - if (bmpSet != NULL) { + if (bmpSet != nullptr) { return bmpSet->contains(c); } - if (stringSpan != NULL) { + if (stringSpan != nullptr) { return stringSpan->contains(c); } if (c >= UNICODESET_HIGH) { // Don't need to check LOW bound @@ -977,7 +977,7 @@ void UnicodeSet::_add(const UnicodeString& s) { return; } UnicodeString* t = new UnicodeString(s); - if (t == NULL) { // Check for memory allocation error. + if (t == nullptr) { // Check for memory allocation error. setToBogus(); return; } @@ -1075,7 +1075,7 @@ UnicodeSet& UnicodeSet::removeAllStrings() { */ UnicodeSet* U_EXPORT2 UnicodeSet::createFrom(const UnicodeString& s) { UnicodeSet *set = new UnicodeSet(); - if (set != NULL) { // Check for memory allocation error. + if (set != nullptr) { // Check for memory allocation error. set->add(s); } return set; @@ -1089,7 +1089,7 @@ UnicodeSet* U_EXPORT2 UnicodeSet::createFrom(const UnicodeString& s) { */ UnicodeSet* U_EXPORT2 UnicodeSet::createFromAll(const UnicodeString& s) { UnicodeSet *set = new UnicodeSet(); - if (set != NULL) { // Check for memory allocation error. + if (set != nullptr) { // Check for memory allocation error. set->addAll(s); } return set; @@ -1272,12 +1272,12 @@ UnicodeSet& UnicodeSet::complement(const UnicodeString& s) { * @see #add(char, char) */ UnicodeSet& UnicodeSet::addAll(const UnicodeSet& c) { - if ( c.len>0 && c.list!=NULL ) { + if ( c.len>0 && c.list!=nullptr ) { add(c.list, c.len, 0); } // Add strings in order - if ( c.strings!=NULL ) { + if ( c.strings!=nullptr ) { for (int32_t i=0; isize(); ++i) { const UnicodeString* s = (const UnicodeString*)c.strings->elementAt(i); if (!stringsContains(*s)) { @@ -1368,7 +1368,7 @@ UnicodeSet& UnicodeSet::clear(void) { list[0] = UNICODESET_HIGH; len = 1; releasePattern(); - if (strings != NULL) { + if (strings != nullptr) { strings->removeAllElements(); } // Remove bogus @@ -1421,7 +1421,7 @@ UnicodeSet& UnicodeSet::compact() { // Delete buffer first to defragment memory less. if (buffer != stackList) { uprv_free(buffer); - buffer = NULL; + buffer = nullptr; bufferCapacity = 0; } if (list == stackList) { @@ -1464,7 +1464,7 @@ UnicodeSet::UnicodeSet(const uint16_t data[], int32_t dataLen, ESerialization se } if( (serialization != kSerialized) - || (data==NULL) + || (data==nullptr) || (dataLen < 1)) { ec = U_ILLEGAL_ARGUMENT_ERROR; setToBogus(); @@ -1513,7 +1513,7 @@ int32_t UnicodeSet::serialize(uint16_t *dest, int32_t destCapacity, UErrorCode& return 0; } - if (destCapacity<0 || (destCapacity>0 && dest==NULL)) { + if (destCapacity<0 || (destCapacity>0 && dest==nullptr)) { ec=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1611,13 +1611,13 @@ UBool UnicodeSet::allocateStrings(UErrorCode &status) { } strings = new UVector(uprv_deleteUObject, uhash_compareUnicodeString, 1, status); - if (strings == NULL) { // Check for memory allocation error. + if (strings == nullptr) { // Check for memory allocation error. status = U_MEMORY_ALLOCATION_ERROR; return false; } if (U_FAILURE(status)) { delete strings; - strings = NULL; + strings = nullptr; return false; } return true; @@ -1647,7 +1647,7 @@ bool UnicodeSet::ensureCapacity(int32_t newLen) { } int32_t newCapacity = nextCapacity(newLen); UChar32* temp = (UChar32*) uprv_malloc(newCapacity * sizeof(UChar32)); - if (temp == NULL) { + if (temp == nullptr) { setToBogus(); // set the object to bogus state if an OOM failure occurred. return false; } @@ -1670,7 +1670,7 @@ bool UnicodeSet::ensureBufferCapacity(int32_t newLen) { } int32_t newCapacity = nextCapacity(newLen); UChar32* temp = (UChar32*) uprv_malloc(newCapacity * sizeof(UChar32)); - if (temp == NULL) { + if (temp == nullptr) { setToBogus(); return false; } @@ -1763,7 +1763,7 @@ void UnicodeSet::exclusiveOr(const UChar32* other, int32_t otherLen, int8_t pola // polarity = 3: ~x union ~y void UnicodeSet::add(const UChar32* other, int32_t otherLen, int8_t polarity) { - if (isFrozen() || isBogus() || other==NULL) { + if (isFrozen() || isBogus() || other==nullptr) { return; } if (!ensureBufferCapacity(len + otherLen)) { @@ -2030,7 +2030,7 @@ void UnicodeSet::_appendToPat(UnicodeString &result, UChar32 start, UChar32 end, UnicodeString& UnicodeSet::_toPattern(UnicodeString& result, UBool escapeUnprintable) const { - if (pat != NULL) { + if (pat != nullptr) { int32_t i; int32_t backslashCount = 0; for (i=0; i0 && bmpSet!=NULL) { + if(length>0 && bmpSet!=nullptr) { return (int32_t)(bmpSet->span(s, s+length, spanCondition)-s); } if(length<0) { @@ -2212,7 +2212,7 @@ int32_t UnicodeSet::span(const UChar *s, int32_t length, USetSpanCondition spanC if(length==0) { return 0; } - if(stringSpan!=NULL) { + if(stringSpan!=nullptr) { return stringSpan->span(s, length, spanCondition); } else if(hasStrings()) { uint32_t which= spanCondition==USET_SPAN_NOT_CONTAINED ? @@ -2240,7 +2240,7 @@ int32_t UnicodeSet::span(const UChar *s, int32_t length, USetSpanCondition spanC } int32_t UnicodeSet::spanBack(const UChar *s, int32_t length, USetSpanCondition spanCondition) const { - if(length>0 && bmpSet!=NULL) { + if(length>0 && bmpSet!=nullptr) { return (int32_t)(bmpSet->spanBack(s, s+length, spanCondition)-s); } if(length<0) { @@ -2249,7 +2249,7 @@ int32_t UnicodeSet::spanBack(const UChar *s, int32_t length, USetSpanCondition s if(length==0) { return 0; } - if(stringSpan!=NULL) { + if(stringSpan!=nullptr) { return stringSpan->spanBack(s, length, spanCondition); } else if(hasStrings()) { uint32_t which= spanCondition==USET_SPAN_NOT_CONTAINED ? @@ -2277,7 +2277,7 @@ int32_t UnicodeSet::spanBack(const UChar *s, int32_t length, USetSpanCondition s } int32_t UnicodeSet::spanUTF8(const char *s, int32_t length, USetSpanCondition spanCondition) const { - if(length>0 && bmpSet!=NULL) { + if(length>0 && bmpSet!=nullptr) { const uint8_t *s0=(const uint8_t *)s; return (int32_t)(bmpSet->spanUTF8(s0, length, spanCondition)-s0); } @@ -2287,7 +2287,7 @@ int32_t UnicodeSet::spanUTF8(const char *s, int32_t length, USetSpanCondition sp if(length==0) { return 0; } - if(stringSpan!=NULL) { + if(stringSpan!=nullptr) { return stringSpan->spanUTF8((const uint8_t *)s, length, spanCondition); } else if(hasStrings()) { uint32_t which= spanCondition==USET_SPAN_NOT_CONTAINED ? @@ -2315,7 +2315,7 @@ int32_t UnicodeSet::spanUTF8(const char *s, int32_t length, USetSpanCondition sp } int32_t UnicodeSet::spanBackUTF8(const char *s, int32_t length, USetSpanCondition spanCondition) const { - if(length>0 && bmpSet!=NULL) { + if(length>0 && bmpSet!=nullptr) { const uint8_t *s0=(const uint8_t *)s; return bmpSet->spanBackUTF8(s0, length, spanCondition); } @@ -2325,7 +2325,7 @@ int32_t UnicodeSet::spanBackUTF8(const char *s, int32_t length, USetSpanConditio if(length==0) { return 0; } - if(stringSpan!=NULL) { + if(stringSpan!=nullptr) { return stringSpan->spanBackUTF8((const uint8_t *)s, length, spanCondition); } else if(hasStrings()) { uint32_t which= spanCondition==USET_SPAN_NOT_CONTAINED ? diff --git a/icu4c/source/common/uniset_closure.cpp b/icu4c/source/common/uniset_closure.cpp index d7dab2a17b7..84791e70101 100644 --- a/icu4c/source/common/uniset_closure.cpp +++ b/icu4c/source/common/uniset_closure.cpp @@ -162,8 +162,8 @@ UnicodeSet& UnicodeSet::closeOver(int32_t attribute) { _set_add, _set_addRange, _set_addString, - NULL, // don't need remove() - NULL // don't need removeRange() + nullptr, // don't need remove() + nullptr // don't need removeRange() }; // start with input set to guarantee inclusion @@ -190,13 +190,13 @@ UnicodeSet& UnicodeSet::closeOver(int32_t attribute) { // add case mappings // (does not add long s for regular s, or Kelvin for k, for example) for (UChar32 cp=start; cp<=end; ++cp) { - result = ucase_toFullLower(cp, NULL, NULL, &full, UCASE_LOC_ROOT); + result = ucase_toFullLower(cp, nullptr, nullptr, &full, UCASE_LOC_ROOT); addCaseMapping(foldSet, result, full, str); - result = ucase_toFullTitle(cp, NULL, NULL, &full, UCASE_LOC_ROOT); + result = ucase_toFullTitle(cp, nullptr, nullptr, &full, UCASE_LOC_ROOT); addCaseMapping(foldSet, result, full, str); - result = ucase_toFullUpper(cp, NULL, NULL, &full, UCASE_LOC_ROOT); + result = ucase_toFullUpper(cp, nullptr, nullptr, &full, UCASE_LOC_ROOT); addCaseMapping(foldSet, result, full, str); result = ucase_toFullFolding(cp, &full, 0); diff --git a/icu4c/source/common/uniset_props.cpp b/icu4c/source/common/uniset_props.cpp index 48c0a26a710..78fdbb37d7d 100644 --- a/icu4c/source/common/uniset_props.cpp +++ b/icu4c/source/common/uniset_props.cpp @@ -69,7 +69,7 @@ static icu::UInitOnce uni32InitOnce {}; */ static UBool U_CALLCONV uset_cleanup(void) { delete uni32Singleton; - uni32Singleton = NULL; + uni32Singleton = nullptr; uni32InitOnce.reset(); return true; } @@ -82,9 +82,9 @@ namespace { // Cache some sets for other services -------------------------------------- *** void U_CALLCONV createUni32Set(UErrorCode &errorCode) { - U_ASSERT(uni32Singleton == NULL); + U_ASSERT(uni32Singleton == nullptr); uni32Singleton = new UnicodeSet(UNICODE_STRING_SIMPLE("[:age=3.2:]"), errorCode); - if(uni32Singleton==NULL) { + if(uni32Singleton==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } else { uni32Singleton->freeze(); @@ -162,10 +162,10 @@ UnicodeSet::UnicodeSet(const UnicodeString& pattern, UnicodeSet& UnicodeSet::applyPattern(const UnicodeString& pattern, UErrorCode& status) { // Equivalent to - // return applyPattern(pattern, USET_IGNORE_SPACE, NULL, status); + // return applyPattern(pattern, USET_IGNORE_SPACE, nullptr, status); // but without dependency on closeOver(). ParsePosition pos(0); - applyPatternIgnoreSpace(pattern, pos, NULL, status); + applyPatternIgnoreSpace(pattern, pos, nullptr, status); if (U_FAILURE(status)) return *this; int32_t i = pos.getIndex(); @@ -193,7 +193,7 @@ UnicodeSet::applyPatternIgnoreSpace(const UnicodeString& pattern, // _applyPattern calls add() etc., which set pat to empty. UnicodeString rebuiltPat; RuleCharacterIterator chars(pattern, symbols, pos); - applyPattern(chars, symbols, rebuiltPat, USET_IGNORE_SPACE, NULL, 0, status); + applyPattern(chars, symbols, rebuiltPat, USET_IGNORE_SPACE, nullptr, 0, status); if (U_FAILURE(status)) return; if (chars.inVariable()) { // syntaxError(chars, "Extra chars in variable value"); @@ -356,7 +356,7 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, const UnicodeFunctor *m = symbols->lookupMatcher(c); if (m != 0) { const UnicodeSet *ms = dynamic_cast(m); - if (ms == NULL) { + if (ms == nullptr) { ec = U_MALFORMED_SET; return; } diff --git a/icu4c/source/common/unisetspan.cpp b/icu4c/source/common/unisetspan.cpp index e4277c5be60..14cef120fdf 100644 --- a/icu4c/source/common/unisetspan.cpp +++ b/icu4c/source/common/unisetspan.cpp @@ -70,7 +70,7 @@ public: capacity=(int32_t)sizeof(staticList); } else { UBool *l=(UBool *)uprv_malloc(maxLength); - if(l!=NULL) { + if(l!=nullptr) { list=l; capacity=maxLength; } @@ -168,7 +168,7 @@ static int32_t getUTF8Length(const UChar *s, int32_t length) { UErrorCode errorCode=U_ZERO_ERROR; int32_t length8=0; - u_strToUTF8(NULL, 0, &length8, s, length, &errorCode); + u_strToUTF8(nullptr, 0, &length8, s, length, &errorCode); if(U_SUCCESS(errorCode) || errorCode==U_BUFFER_OVERFLOW_ERROR) { return length8; } else { @@ -204,8 +204,8 @@ makeSpanLengthByte(int32_t spanLength) { UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSet &set, const UVector &setStrings, uint32_t which) - : spanSet(0, 0x10ffff), pSpanNotSet(NULL), strings(setStrings), - utf8Lengths(NULL), spanLengths(NULL), utf8(NULL), + : spanSet(0, 0x10ffff), pSpanNotSet(nullptr), strings(setStrings), + utf8Lengths(nullptr), spanLengths(nullptr), utf8(nullptr), utf8Length(0), maxLength16(0), maxLength8(0), all((UBool)(which==ALL)) { @@ -283,7 +283,7 @@ UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSet &set, utf8Lengths=staticLengths; } else { utf8Lengths=(int32_t *)uprv_malloc(allocSize); - if(utf8Lengths==NULL) { + if(utf8Lengths==nullptr) { maxLength16=maxLength8=0; // Prevent usage by making needsStringSpanUTF16/8() return false. return; // Out of memory. } @@ -395,8 +395,8 @@ UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSet &set, // Copy constructor. Assumes which==ALL for a frozen set. UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSetStringSpan &otherStringSpan, const UVector &newParentSetStrings) - : spanSet(otherStringSpan.spanSet), pSpanNotSet(NULL), strings(newParentSetStrings), - utf8Lengths(NULL), spanLengths(NULL), utf8(NULL), + : spanSet(otherStringSpan.spanSet), pSpanNotSet(nullptr), strings(newParentSetStrings), + utf8Lengths(nullptr), spanLengths(nullptr), utf8(nullptr), utf8Length(otherStringSpan.utf8Length), maxLength16(otherStringSpan.maxLength16), maxLength8(otherStringSpan.maxLength8), all(true) { @@ -414,7 +414,7 @@ UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSetStringSpan &otherStri utf8Lengths=staticLengths; } else { utf8Lengths=(int32_t *)uprv_malloc(allocSize); - if(utf8Lengths==NULL) { + if(utf8Lengths==nullptr) { maxLength16=maxLength8=0; // Prevent usage by making needsStringSpanUTF16/8() return false. return; // Out of memory. } @@ -426,21 +426,21 @@ UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSetStringSpan &otherStri } UnicodeSetStringSpan::~UnicodeSetStringSpan() { - if(pSpanNotSet!=NULL && pSpanNotSet!=&spanSet) { + if(pSpanNotSet!=nullptr && pSpanNotSet!=&spanSet) { delete pSpanNotSet; } - if(utf8Lengths!=NULL && utf8Lengths!=staticLengths) { + if(utf8Lengths!=nullptr && utf8Lengths!=staticLengths) { uprv_free(utf8Lengths); } } void UnicodeSetStringSpan::addToSpanNotSet(UChar32 c) { - if(pSpanNotSet==NULL || pSpanNotSet==&spanSet) { + if(pSpanNotSet==nullptr || pSpanNotSet==&spanSet) { if(spanSet.contains(c)) { return; // Nothing to do. } UnicodeSet *newSet=spanSet.cloneAsThawed(); - if(newSet==NULL) { + if(newSet==nullptr) { return; // Out of memory. } else { pSpanNotSet=newSet; diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp index 4125d194724..62164f3bf4e 100644 --- a/icu4c/source/common/unistr.cpp +++ b/icu4c/source/common/unistr.cpp @@ -222,7 +222,7 @@ UnicodeString::UnicodeString(UBool isTerminated, int32_t textLength) { fUnion.fFields.fLengthAndFlags = kReadonlyAlias; const UChar *text = textPtr; - if(text == NULL) { + if(text == nullptr) { // treat as an empty string, do not alias setToEmpty(); } else if(textLength < -1 || @@ -244,7 +244,7 @@ UnicodeString::UnicodeString(UChar *buff, int32_t buffLength, int32_t buffCapacity) { fUnion.fFields.fLengthAndFlags = kWritableAlias; - if(buff == NULL) { + if(buff == nullptr) { // treat as an empty string, do not alias setToEmpty(); } else if(buffLength < -1 || buffCapacity < 0 || buffLength > buffCapacity) { @@ -264,7 +264,7 @@ UnicodeString::UnicodeString(UChar *buff, UnicodeString::UnicodeString(const char *src, int32_t length, EInvariant) { fUnion.fFields.fLengthAndFlags = kShortString; - if(src==NULL) { + if(src==nullptr) { // treat as an empty string } else { if(length<0) { @@ -328,7 +328,7 @@ UnicodeString::UnicodeString(const UnicodeString& that, // Replaceable base class clone() default implementation, does not clone Replaceable * Replaceable::clone() const { - return NULL; + return nullptr; } // UnicodeString overrides clone() with a real implementation @@ -380,7 +380,7 @@ UnicodeString::allocate(int32_t capacity) { // Round up to a multiple of 16. numBytes = (numBytes + 15) & ~15; int32_t *array = (int32_t *) uprv_malloc(numBytes); - if(array != NULL) { + if(array != nullptr) { // set initial refCount and point behind the refCount *array++ = 1; numBytes -= sizeof(int32_t); @@ -466,7 +466,7 @@ UnicodeString UnicodeString::fromUTF32(const UChar32 *utf32, int32_t length) { u_strFromUTF32WithSub(utf16, result.getCapacity(), &length16, utf32, length, 0xfffd, // Substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); result.releaseBuffer(length16); if(errorCode == U_BUFFER_OVERFLOW_ERROR) { @@ -601,7 +601,7 @@ void UnicodeString::copyFieldsFrom(UnicodeString &src, UBool setSrcToBogus) U_NO if(setSrcToBogus) { // Set src to bogus without releasing any memory. src.fUnion.fFields.fLengthAndFlags = kIsBogus; - src.fUnion.fFields.fArray = NULL; + src.fUnion.fFields.fArray = nullptr; src.fUnion.fFields.fCapacity = 0; } } @@ -677,8 +677,8 @@ UnicodeString::doCompare( int32_t start, // pin indices to legal values pinIndices(start, length); - if(srcChars == NULL) { - // treat const UChar *srcChars==NULL as an empty string + if(srcChars == nullptr) { + // treat const UChar *srcChars==nullptr as an empty string return length == 0 ? 0 : 1; } @@ -749,7 +749,7 @@ UnicodeString::doCompareCodePointOrder(int32_t start, int32_t srcLength) const { // compare illegal string values - // treat const UChar *srcChars==NULL as an empty string + // treat const UChar *srcChars==nullptr as an empty string if(isBogus()) { return -1; } @@ -757,11 +757,11 @@ UnicodeString::doCompareCodePointOrder(int32_t start, // pin indices to legal values pinIndices(start, length); - if(srcChars == NULL) { + if(srcChars == nullptr) { srcStart = srcLength = 0; } - int32_t diff = uprv_strCompare(getArrayStart() + start, length, (srcChars!=NULL)?(srcChars + srcStart):NULL, srcLength, false, true); + int32_t diff = uprv_strCompare(getArrayStart() + start, length, (srcChars!=nullptr)?(srcChars + srcStart):nullptr, srcLength, false, true); /* translate the 32-bit result into an 8-bit one */ if(diff!=0) { return (int8_t)(diff >> 15 | 1); @@ -825,14 +825,14 @@ UnicodeString::getChar32Limit(int32_t offset) const { int32_t UnicodeString::countChar32(int32_t start, int32_t length) const { pinIndices(start, length); - // if(isBogus()) then fArray==0 and start==0 - u_countChar32() checks for NULL + // if(isBogus()) then fArray==0 and start==0 - u_countChar32() checks for nullptr return u_countChar32(getArrayStart()+start, length); } UBool UnicodeString::hasMoreChar32Than(int32_t start, int32_t length, int32_t number) const { pinIndices(start, length); - // if(isBogus()) then fArray==0 and start==0 - u_strHasMoreChar32Than() checks for NULL + // if(isBogus()) then fArray==0 and start==0 - u_strHasMoreChar32Than() checks for nullptr return u_strHasMoreChar32Than(getArrayStart()+start, length, number); } @@ -899,7 +899,7 @@ UnicodeString::extract(int32_t start, enum EInvariant) const { // if the arguments are illegal, then do nothing - if(targetCapacity < 0 || (targetCapacity > 0 && target == NULL)) { + if(targetCapacity < 0 || (targetCapacity > 0 && target == nullptr)) { return 0; } @@ -917,8 +917,8 @@ UnicodeString UnicodeString::tempSubString(int32_t start, int32_t len) const { pinIndices(start, len); const UChar *array = getBuffer(); // not getArrayStart() to check kIsBogus & kOpenGetBuffer - if(array==NULL) { - array=fUnion.fStackFields.fBuffer; // anything not NULL because that would make an empty string + if(array==nullptr) { + array=fUnion.fStackFields.fBuffer; // anything not nullptr because that would make an empty string len=-2; // bogus result string } return UnicodeString(false, array + start, len); @@ -933,7 +933,7 @@ UnicodeString::toUTF8(int32_t start, int32_t len, u_strToUTF8WithSub(target, capacity, &length8, getBuffer() + start, len, 0xFFFD, // Standard substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); return length8; } @@ -982,17 +982,17 @@ UnicodeString::toUTF8(ByteSink &sink) const { u_strToUTF8WithSub(utf8, capacity, &length8, getBuffer(), length16, 0xFFFD, // Standard substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); if(errorCode == U_BUFFER_OVERFLOW_ERROR) { utf8 = (char *)uprv_malloc(length8); - if(utf8 != NULL) { + if(utf8 != nullptr) { utf8IsOwned = true; errorCode = U_ZERO_ERROR; u_strToUTF8WithSub(utf8, length8, &length8, getBuffer(), length16, 0xFFFD, // Standard substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); } else { errorCode = U_MEMORY_ALLOCATION_ERROR; @@ -1016,7 +1016,7 @@ UnicodeString::toUTF32(UChar32 *utf32, int32_t capacity, UErrorCode &errorCode) u_strToUTF32WithSub(utf32, capacity, &length32, getBuffer(), length(), 0xfffd, // Substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); } return length32; @@ -1044,7 +1044,7 @@ UnicodeString::indexOf(const UChar *srcChars, // find the first occurrence of the substring const UChar *array = getArrayStart(); const UChar *match = u_strFindFirst(array + start, length, srcChars + srcStart, srcLength); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1062,7 +1062,7 @@ UnicodeString::doIndexOf(UChar c, // find the first occurrence of c const UChar *array = getArrayStart(); const UChar *match = u_memchr(array + start, c, length); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1079,7 +1079,7 @@ UnicodeString::doIndexOf(UChar32 c, // find the first occurrence of c const UChar *array = getArrayStart(); const UChar *match = u_memchr32(array + start, c, length); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1108,7 +1108,7 @@ UnicodeString::lastIndexOf(const UChar *srcChars, // find the last occurrence of the substring const UChar *array = getArrayStart(); const UChar *match = u_strFindLast(array + start, length, srcChars + srcStart, srcLength); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1130,7 +1130,7 @@ UnicodeString::doLastIndexOf(UChar c, // find the last occurrence of c const UChar *array = getArrayStart(); const UChar *match = u_memrchr(array + start, c, length); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1147,7 +1147,7 @@ UnicodeString::doLastIndexOf(UChar32 c, // find the last occurrence of c const UChar *array = getArrayStart(); const UChar *match = u_memrchr32(array + start, c, length); - if(match == NULL) { + if(match == nullptr) { return -1; } else { return (int32_t)(match - array); @@ -1265,7 +1265,7 @@ UnicodeString::setTo(UBool isTerminated, } const UChar *text = textPtr; - if(text == NULL) { + if(text == nullptr) { // treat as an empty string, do not alias releaseArray(); setToEmpty(); @@ -1301,7 +1301,7 @@ UnicodeString::setTo(UChar *buffer, return *this; } - if(buffer == NULL) { + if(buffer == nullptr) { // treat as an empty string, do not alias releaseArray(); setToEmpty(); @@ -1343,7 +1343,7 @@ UnicodeString &UnicodeString::setToUTF8(StringPiece utf8) { u_strFromUTF8WithSub(utf16, getCapacity(), &length16, utf8.data(), length, 0xfffd, // Substitution character. - NULL, // Don't care about number of substitutions. + nullptr, // Don't care about number of substitutions. &errorCode); releaseBuffer(length16); if(U_FAILURE(errorCode)) { @@ -1548,7 +1548,7 @@ UnicodeString::doAppend(const UnicodeString& src, int32_t srcStart, int32_t srcL UnicodeString& UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLength) { - if(!isWritable() || srcLength == 0 || srcChars == NULL) { + if(!isWritable() || srcLength == 0 || srcChars == nullptr) { return *this; } @@ -1623,7 +1623,7 @@ UnicodeString::copy(int32_t start, int32_t limit, int32_t dest) { } UChar* text = (UChar*) uprv_malloc( sizeof(UChar) * (limit - start) ); // Check to make sure text is not null. - if (text != NULL) { + if (text != nullptr) { extractBetween(start, limit, text, 0); insert(dest, text, 0, limit - start); uprv_free(text); @@ -1839,11 +1839,11 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity, us_arrayCopy(fUnion.fStackFields.fBuffer, 0, oldStackBuffer, 0, oldLength); oldArray = oldStackBuffer; } else { - oldArray = NULL; // no need to copy from the stack buffer to itself + oldArray = nullptr; // no need to copy from the stack buffer to itself } } else { oldArray = fUnion.fFields.fArray; - U_ASSERT(oldArray!=NULL); /* when stack buffer is not used, oldArray must have a non-NULL reference */ + U_ASSERT(oldArray!=nullptr); /* when stack buffer is not used, oldArray must have a non-nullptr reference */ } // allocate a new array @@ -1858,7 +1858,7 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity, if(newCapacity < minLength) { minLength = newCapacity; } - if(oldArray != NULL) { + if(oldArray != nullptr) { us_arrayCopy(oldArray, 0, getArrayStart(), 0, minLength); } setLength(minLength); @@ -1931,7 +1931,7 @@ UnicodeStringAppendable::getAppendBuffer(int32_t minCapacity, int32_t *resultCapacity) { if(minCapacity < 1 || scratchCapacity < minCapacity) { *resultCapacity = 0; - return NULL; + return nullptr; } int32_t oldLength = str.length(); if(minCapacity <= (kMaxCapacity - oldLength) && @@ -1951,7 +1951,7 @@ U_NAMESPACE_USE U_CAPI int32_t U_EXPORT2 uhash_hashUnicodeString(const UElement key) { const UnicodeString *str = (const UnicodeString*) key.pointer; - return (str == NULL) ? 0 : str->hashCode(); + return (str == nullptr) ? 0 : str->hashCode(); } // Moved here from uhash_us.cpp so that using a UVector of UnicodeString* @@ -1963,7 +1963,7 @@ uhash_compareUnicodeString(const UElement key1, const UElement key2) { if (str1 == str2) { return true; } - if (str1 == NULL || str2 == NULL) { + if (str1 == nullptr || str2 == nullptr) { return false; } return *str1 == *str2; diff --git a/icu4c/source/common/unistr_case.cpp b/icu4c/source/common/unistr_case.cpp index f4c43b4889f..efd956d7032 100644 --- a/icu4c/source/common/unistr_case.cpp +++ b/icu4c/source/common/unistr_case.cpp @@ -47,7 +47,7 @@ UnicodeString::doCaseCompare(int32_t start, uint32_t options) const { // compare illegal string values - // treat const UChar *srcChars==NULL as an empty string + // treat const UChar *srcChars==nullptr as an empty string if(isBogus()) { return -1; } @@ -55,7 +55,7 @@ UnicodeString::doCaseCompare(int32_t start, // pin indices to legal values pinIndices(start, length); - if(srcChars == NULL) { + if(srcChars == nullptr) { srcStart = srcLength = 0; } @@ -138,7 +138,7 @@ UnicodeString::caseMap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITER #endif newLength = stringCaseMapper(caseLocale, options, UCASEMAP_BREAK_ITERATOR buffer, capacity, - oldArray, oldLength, NULL, errorCode); + oldArray, oldLength, nullptr, errorCode); if (U_SUCCESS(errorCode)) { setLength(newLength); return *this; @@ -201,7 +201,7 @@ UnicodeString::caseMap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITER // No need to iter->setText() again: The case mapper restarts via iter->first(). newLength = stringCaseMapper(caseLocale, options, UCASEMAP_BREAK_ITERATOR getArrayStart(), getCapacity(), - oldArray, oldLength, NULL, errorCode); + oldArray, oldLength, nullptr, errorCode); if (bufferToDelete) { uprv_free(bufferToDelete); } @@ -225,7 +225,7 @@ U_CAPI int32_t U_EXPORT2 uhash_hashCaselessUnicodeString(const UElement key) { U_NAMESPACE_USE const UnicodeString *str = (const UnicodeString*) key.pointer; - if (str == NULL) { + if (str == nullptr) { return 0; } // Inefficient; a better way would be to have a hash function in @@ -243,7 +243,7 @@ uhash_compareCaselessUnicodeString(const UElement key1, const UElement key2) { if (str1 == str2) { return true; } - if (str1 == NULL || str2 == NULL) { + if (str1 == nullptr || str2 == nullptr) { return false; } return str1->caseCompare(*str2, U_FOLD_CASE_DEFAULT) == 0; diff --git a/icu4c/source/common/unistr_case_locale.cpp b/icu4c/source/common/unistr_case_locale.cpp index f0f3048d06f..8b6a9ca0ca5 100644 --- a/icu4c/source/common/unistr_case_locale.cpp +++ b/icu4c/source/common/unistr_case_locale.cpp @@ -31,7 +31,7 @@ U_NAMESPACE_BEGIN UnicodeString & UnicodeString::toLower() { - return caseMap(ustrcase_getCaseLocale(NULL), 0, + return caseMap(ustrcase_getCaseLocale(nullptr), 0, UCASEMAP_BREAK_ITERATOR_NULL ustrcase_internalToLower); } @@ -43,7 +43,7 @@ UnicodeString::toLower(const Locale &locale) { UnicodeString & UnicodeString::toUpper() { - return caseMap(ustrcase_getCaseLocale(NULL), 0, + return caseMap(ustrcase_getCaseLocale(nullptr), 0, UCASEMAP_BREAK_ITERATOR_NULL ustrcase_internalToUpper); } diff --git a/icu4c/source/common/unistr_cnv.cpp b/icu4c/source/common/unistr_cnv.cpp index e1f60d4487a..afaf5f085f5 100644 --- a/icu4c/source/common/unistr_cnv.cpp +++ b/icu4c/source/common/unistr_cnv.cpp @@ -82,7 +82,7 @@ UnicodeString::UnicodeString(const char *src, int32_t srcLength, fUnion.fFields.fLengthAndFlags = kShortString; if(U_SUCCESS(errorCode)) { // check arguments - if(src==NULL) { + if(src==nullptr) { // treat as an empty string, do nothing more } else if(srcLength<-1) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; diff --git a/icu4c/source/common/unorm.cpp b/icu4c/source/common/unorm.cpp index cf3915c27f3..edb394c3be1 100644 --- a/icu4c/source/common/unorm.cpp +++ b/icu4c/source/common/unorm.cpp @@ -122,12 +122,12 @@ _iterate(UCharIterator *src, UBool forward, if(U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0) || src==NULL) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0) || src==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } - if(pNeededToNormalize!=NULL) { + if(pNeededToNormalize!=nullptr) { *pNeededToNormalize=false; } if(!(forward ? src->hasNext(src) : src->hasPrevious(src))) { @@ -163,7 +163,7 @@ _iterate(UCharIterator *src, UBool forward, UnicodeString destString(dest, 0, destCapacity); if(buffer.length()>0 && doNormalize) { n2->normalize(buffer, destString, *pErrorCode).extract(dest, destCapacity, *pErrorCode); - if(pNeededToNormalize!=NULL && U_SUCCESS(*pErrorCode)) { + if(pNeededToNormalize!=nullptr && U_SUCCESS(*pErrorCode)) { *pNeededToNormalize= destString!=buffer; } return destString.length(); @@ -230,14 +230,14 @@ _concatenate(const UChar *left, int32_t leftLength, if(U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0) || - left==NULL || leftLength<-1 || right==NULL || rightLength<-1) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0) || + left==nullptr || leftLength<-1 || right==nullptr || rightLength<-1) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } /* check for overlapping right and destination */ - if( dest!=NULL && + if( dest!=nullptr && ((right>=dest && right<(dest+destCapacity)) || (rightLength>0 && dest>=right && dest<(right+rightLength))) ) { diff --git a/icu4c/source/common/unormcmp.cpp b/icu4c/source/common/unormcmp.cpp index e2241909725..29eb5aa4265 100644 --- a/icu4c/source/common/unormcmp.cpp +++ b/icu4c/source/common/unormcmp.cpp @@ -180,7 +180,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, if((options&_COMPARE_EQUIV)!=0) { nfcImpl=Normalizer2Factory::getNFCImpl(*pErrorCode); } else { - nfcImpl=NULL; + nfcImpl=nullptr; } if(U_FAILURE(*pErrorCode)) { return 0; @@ -189,14 +189,14 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, /* initialize */ start1=s1; if(length1==-1) { - limit1=NULL; + limit1=nullptr; } else { limit1=s1+length1; } start2=s2; if(length2==-1) { - limit2=NULL; + limit2=nullptr; } else { limit2=s2+length2; } @@ -214,7 +214,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, if(c1<0) { /* get next code unit from string 1, post-increment */ for(;;) { - if(s1==limit1 || ((c1=*s1)==0 && (limit1==NULL || (options&_STRNCMP_STYLE)))) { + if(s1==limit1 || ((c1=*s1)==0 && (limit1==nullptr || (options&_STRNCMP_STYLE)))) { if(level1==0) { c1=-1; break; @@ -228,7 +228,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, do { --level1; start1=stack1[level1].start; /*Not uninitialized*/ - } while(start1==NULL); + } while(start1==nullptr); s1=stack1[level1].s; /*Not uninitialized*/ limit1=stack1[level1].limit; /*Not uninitialized*/ } @@ -237,7 +237,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, if(c2<0) { /* get next code unit from string 2, post-increment */ for(;;) { - if(s2==limit2 || ((c2=*s2)==0 && (limit2==NULL || (options&_STRNCMP_STYLE)))) { + if(s2==limit2 || ((c2=*s2)==0 && (limit2==nullptr || (options&_STRNCMP_STYLE)))) { if(level2==0) { c2=-1; break; @@ -251,7 +251,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, do { --level2; start2=stack2[level2].start; /*Not uninitialized*/ - } while(start2==NULL); + } while(start2==nullptr); s2=stack2[level2].s; /*Not uninitialized*/ limit2=stack2[level2].limit; /*Not uninitialized*/ } @@ -431,7 +431,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, /* set empty intermediate level if skipped */ if(level1<2) { - stack1[level1++].start=NULL; + stack1[level1++].start=nullptr; } /* set next level pointers to decomposition */ @@ -472,7 +472,7 @@ unorm_cmpEquivFold(const UChar *s1, int32_t length1, /* set empty intermediate level if skipped */ if(level2<2) { - stack2[level2++].start=NULL; + stack2[level2++].start=nullptr; } /* set next level pointers to decomposition */ diff --git a/icu4c/source/common/uobject.cpp b/icu4c/source/common/uobject.cpp index e222b2ce9b9..7a8594b803a 100644 --- a/icu4c/source/common/uobject.cpp +++ b/icu4c/source/common/uobject.cpp @@ -63,7 +63,7 @@ void * U_EXPORT2 UMemory::operator new(size_t size) U_NOEXCEPT { } void U_EXPORT2 UMemory::operator delete(void *p) U_NOEXCEPT { - if(p!=NULL) { + if(p!=nullptr) { uprv_free(p); } } @@ -73,7 +73,7 @@ void * U_EXPORT2 UMemory::operator new[](size_t size) U_NOEXCEPT { } void U_EXPORT2 UMemory::operator delete[](void *p) U_NOEXCEPT { - if(p!=NULL) { + if(p!=nullptr) { uprv_free(p); } } @@ -93,7 +93,7 @@ void U_EXPORT2 UMemory::operator delete(void* p, const char* /*file*/, int /*lin UObject::~UObject() {} -UClassID UObject::getDynamicClassID() const { return NULL; } +UClassID UObject::getDynamicClassID() const { return nullptr; } U_NAMESPACE_END diff --git a/icu4c/source/common/uprops.cpp b/icu4c/source/common/uprops.cpp index 429e3a1d1ca..2bdb22ac050 100644 --- a/icu4c/source/common/uprops.cpp +++ b/icu4c/source/common/uprops.cpp @@ -794,10 +794,10 @@ uprops_addPropertyStarts(UPropertySource src, const USetAdder *sa, UErrorCode *p U_CAPI int32_t U_EXPORT2 u_getFC_NFKC_Closure(UChar32 c, UChar *dest, int32_t destCapacity, UErrorCode *pErrorCode) { - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0)) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } diff --git a/icu4c/source/common/ures_cnv.cpp b/icu4c/source/common/ures_cnv.cpp index 1aa58e753ce..90b0a22d01a 100644 --- a/icu4c/source/common/ures_cnv.cpp +++ b/icu4c/source/common/ures_cnv.cpp @@ -35,17 +35,17 @@ ures_openU(const UChar *myPath, int32_t length; char *path = pathBuffer; - if(status==NULL || U_FAILURE(*status)) { - return NULL; + if(status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(myPath==NULL) { - path = NULL; + if(myPath==nullptr) { + path = nullptr; } else { length=u_strlen(myPath); if(length>=(int32_t)sizeof(pathBuffer)) { *status=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } else if(uprv_isInvariantUString(myPath, length)) { /* * the invariant converter is sufficient for package and tree names @@ -59,17 +59,17 @@ ures_openU(const UChar *myPath, length=ucnv_fromUChars(cnv, path, (int32_t)sizeof(pathBuffer), myPath, length, status); u_releaseDefaultConverter(cnv); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } if(length>=(int32_t)sizeof(pathBuffer)) { /* not NUL-terminated - path too long */ *status=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } #else /* the default converter is not available */ *status=U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; #endif } } diff --git a/icu4c/source/common/uresbund.cpp b/icu4c/source/common/uresbund.cpp index b0beae76cd5..646c173bef9 100644 --- a/icu4c/source/common/uresbund.cpp +++ b/icu4c/source/common/uresbund.cpp @@ -48,7 +48,7 @@ Static cache for already opened resource bundles - mostly for keeping fallback i TODO: This cache should probably be removed when the deprecated code is completely removed. */ -static UHashtable *cache = NULL; +static UHashtable *cache = nullptr; static icu::UInitOnce gCacheInitOnce {}; static UMutex resbMutex; @@ -83,7 +83,7 @@ static UBool U_CALLCONV compareEntries(const UHashTok p1, const UHashTok p2) { static UBool chopLocale(char *name) { char *i = uprv_strrchr(name, '_'); - if(i != NULL) { + if(i != nullptr) { *i = '\0'; return true; } @@ -93,7 +93,7 @@ static UBool chopLocale(char *name) { static UBool hasVariant(const char* localeID) { UErrorCode err = U_ZERO_ERROR; - int32_t variantLength = uloc_getVariant(localeID, NULL, 0, &err); + int32_t variantLength = uloc_getVariant(localeID, nullptr, 0, &err); return variantLength != 0; } @@ -231,7 +231,7 @@ static bool getParentLocaleID(char *name, const char *origName, UResOpenType ope // "Collation data, however, is an exception...") if (openType == URES_OPEN_LOCALE_DEFAULT_ROOT) { const char* parentID = performFallbackLookup(name, parentLocaleChars, parentLocaleChars, parentLocaleTable, UPRV_LENGTHOF(parentLocaleTable)); - if (parentID != NULL) { + if (parentID != nullptr) { uprv_strcpy(name, parentID); return true; } @@ -303,7 +303,7 @@ static UBool mayHaveParent(char *name) { static void entryIncrease(UResourceDataEntry *entry) { Mutex lock(&resbMutex); entry->fCountExisting++; - while(entry->fParent != NULL) { + while(entry->fParent != nullptr) { entry = entry->fParent; entry->fCountExisting++; } @@ -359,18 +359,18 @@ static void free_entry(UResourceDataEntry *entry) { UResourceDataEntry *alias; res_unload(&(entry->fData)); - if(entry->fName != NULL && entry->fName != entry->fNameBuffer) { + if(entry->fName != nullptr && entry->fName != entry->fNameBuffer) { uprv_free(entry->fName); } - if(entry->fPath != NULL) { + if(entry->fPath != nullptr) { uprv_free(entry->fPath); } - if(entry->fPool != NULL) { + if(entry->fPool != nullptr) { --entry->fPool->fCountExisting; } alias = entry->fAlias; - if(alias != NULL) { - while(alias->fAlias != NULL) { + if(alias != nullptr) { + while(alias->fAlias != nullptr) { alias = alias->fAlias; } --alias->fCountExisting; @@ -391,7 +391,7 @@ static int32_t ures_flushCache() * return 0 */ Mutex lock(&resbMutex); - if (cache == NULL) { + if (cache == nullptr) { return 0; } @@ -399,7 +399,7 @@ static int32_t ures_flushCache() deletedMore = false; /*creates an enumeration to iterate through every element in the table */ pos = UHASH_FIRST; - while ((e = uhash_nextElement(cache, &pos)) != NULL) + while ((e = uhash_nextElement(cache, &pos)) != nullptr) { resB = (UResourceDataEntry *) e->value.pointer; /* Deletes only if reference counter == 0 @@ -437,19 +437,19 @@ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) { UResourceDataEntry *resB; Mutex lock(&resbMutex); - if (cache == NULL) { - fprintf(stderr,"%s:%d: RB Cache is NULL.\n", __FILE__, __LINE__); + if (cache == nullptr) { + fprintf(stderr,"%s:%d: RB Cache is nullptr.\n", __FILE__, __LINE__); return false; } - while ((e = uhash_nextElement(cache, &pos)) != NULL) { + while ((e = uhash_nextElement(cache, &pos)) != nullptr) { cacheNotEmpty=true; resB = (UResourceDataEntry *) e->value.pointer; fprintf(stderr,"%s:%d: RB Cache: Entry @0x%p, refcount %d, name %s:%s. Pool 0x%p, alias 0x%p, parent 0x%p\n", __FILE__, __LINE__, (void*)resB, resB->fCountExisting, - resB->fName?resB->fName:"NULL", - resB->fPath?resB->fPath:"NULL", + resB->fName?resB->fName:"nullptr", + resB->fPath?resB->fPath:"nullptr", (void*)resB->fPool, (void*)resB->fAlias, (void*)resB->fParent); @@ -463,10 +463,10 @@ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) { static UBool U_CALLCONV ures_cleanup(void) { - if (cache != NULL) { + if (cache != nullptr) { ures_flushCache(); uhash_close(cache); - cache = NULL; + cache = nullptr; } gCacheInitOnce.reset(); return true; @@ -474,8 +474,8 @@ static UBool U_CALLCONV ures_cleanup(void) /** INTERNAL: Initializes the cache for resources */ static void U_CALLCONV createCache(UErrorCode &status) { - U_ASSERT(cache == NULL); - cache = uhash_open(hashEntry, compareEntries, NULL, &status); + U_ASSERT(cache == nullptr); + cache = uhash_open(hashEntry, compareEntries, nullptr, &status); ucln_common_registerCleanup(UCLN_COMMON_URES, ures_cleanup); } @@ -487,7 +487,7 @@ static void initCache(UErrorCode *status) { static void setEntryName(UResourceDataEntry *res, const char *name, UErrorCode *status) { int32_t len = (int32_t)uprv_strlen(name); - if(res->fName != NULL && res->fName != res->fNameBuffer) { + if(res->fName != nullptr && res->fName != res->fNameBuffer) { uprv_free(res->fName); } if (len < (int32_t)sizeof(res->fNameBuffer)) { @@ -496,7 +496,7 @@ static void setEntryName(UResourceDataEntry *res, const char *name, UErrorCode * else { res->fName = (char *)uprv_malloc(len+1); } - if(res->fName == NULL) { + if(res->fName == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { uprv_strcpy(res->fName, name); @@ -511,7 +511,7 @@ getPoolEntry(const char *path, UErrorCode *status); * CAUTION: resbMutex must be locked when calling this function. */ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UErrorCode *status) { - UResourceDataEntry *r = NULL; + UResourceDataEntry *r = nullptr; UResourceDataEntry find; /*int32_t hashValue;*/ const char *name; @@ -521,11 +521,11 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE /*UHashTok hashkey; */ if(U_FAILURE(*status)) { - return NULL; + return nullptr; } /* here we try to deduce the right locale name */ - if(localeID == NULL) { /* if localeID is NULL, we're trying to open default locale */ + if(localeID == nullptr) { /* if localeID is nullptr, we're trying to open default locale */ name = uloc_getDefault(); } else if(*localeID == 0) { /* if localeID is "" then we try to open root locale */ name = kRootLocaleName; @@ -542,12 +542,12 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE /* check to see if we already have this entry */ r = (UResourceDataEntry *)uhash_get(cache, &find); - if(r == NULL) { + if(r == nullptr) { /* if the entry is not yet in the hash table, we'll try to construct a new one */ r = (UResourceDataEntry *) uprv_malloc(sizeof(UResourceDataEntry)); - if(r == NULL) { + if(r == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memset(r, 0, sizeof(UResourceDataEntry)); @@ -556,15 +556,15 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE setEntryName(r, name, status); if (U_FAILURE(*status)) { uprv_free(r); - return NULL; + return nullptr; } - if(path != NULL) { + if(path != nullptr) { r->fPath = (char *)uprv_strdup(path); - if(r->fPath == NULL) { + if(r->fPath == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; uprv_free(r); - return NULL; + return nullptr; } } @@ -575,7 +575,7 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE /* if we failed to load due to an out-of-memory error, exit early. */ if (*status == U_MEMORY_ALLOCATION_ERROR) { uprv_free(r); - return NULL; + return nullptr; } /* we have no such entry in dll, so it will always use fallback */ *status = U_USING_FALLBACK_WARNING; @@ -603,7 +603,7 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE if (aliasres != RES_BOGUS) { // No tracing: called during initial data loading const UChar *alias = res_getStringNoTrace(&(r->fData), aliasres, &aliasLen); - if(alias != NULL && aliasLen > 0) { /* if there is actual alias - unload and load new data */ + if(alias != nullptr && aliasLen > 0) { /* if there is actual alias - unload and load new data */ u_UCharsToChars(alias, aliasName, aliasLen+1); r->fAlias = init_entry(aliasName, path, status); } @@ -612,15 +612,15 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE } { - UResourceDataEntry *oldR = NULL; - if((oldR = (UResourceDataEntry *)uhash_get(cache, r)) == NULL) { /* if the data is not cached */ + UResourceDataEntry *oldR = nullptr; + if((oldR = (UResourceDataEntry *)uhash_get(cache, r)) == nullptr) { /* if the data is not cached */ /* just insert it in the cache */ UErrorCode cacheStatus = U_ZERO_ERROR; uhash_put(cache, (void *)r, r, &cacheStatus); if (U_FAILURE(cacheStatus)) { *status = cacheStatus; free_entry(r); - r = NULL; + r = nullptr; } } else { /* somebody have already inserted it while we were working, discard newly opened data */ @@ -631,9 +631,9 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE } } - if(r != NULL) { + if(r != nullptr) { /* return the real bundle */ - while(r->fAlias != NULL) { + while(r->fAlias != nullptr) { r = r->fAlias; } r->fCountExisting++; /* we increase its reference count */ @@ -650,7 +650,7 @@ static UResourceDataEntry * getPoolEntry(const char *path, UErrorCode *status) { UResourceDataEntry *poolBundle = init_entry(kPoolBundleName, path, status); if( U_SUCCESS(*status) && - (poolBundle == NULL || poolBundle->fBogus != U_ZERO_ERROR || !poolBundle->fData.isPoolBundle) + (poolBundle == nullptr || poolBundle->fBogus != U_ZERO_ERROR || !poolBundle->fData.isPoolBundle) ) { *status = U_INVALID_FORMAT_ERROR; } @@ -662,7 +662,7 @@ getPoolEntry(const char *path, UErrorCode *status) { static UResourceDataEntry * findFirstExisting(const char* path, char* name, const char* defaultLocale, UResOpenType openType, UBool *isRoot, UBool *foundParent, UBool *isDefault, UErrorCode* status) { - UResourceDataEntry *r = NULL; + UResourceDataEntry *r = nullptr; UBool hasRealData = false; *foundParent = true; /* we're starting with a fresh name */ char origName[ULOC_FULLNAME_CAPACITY]; @@ -672,7 +672,7 @@ findFirstExisting(const char* path, char* name, const char* defaultLocale, UResO r = init_entry(name, path, status); /* Null pointer test */ if (U_FAILURE(*status)) { - return NULL; + return nullptr; } *isDefault = (UBool)(uprv_strncmp(name, defaultLocale, uprv_strlen(name)) == 0); hasRealData = (UBool)(r->fBogus == U_ZERO_ERROR); @@ -684,7 +684,7 @@ findFirstExisting(const char* path, char* name, const char* defaultLocale, UResO /* are not updated yet. */ r->fCountExisting--; /*entryCloseInt(r);*/ - r = NULL; + r = nullptr; *status = U_USING_FALLBACK_WARNING; } else { uprv_strcpy(name, r->fName); /* this is needed for supporting aliases */ @@ -745,14 +745,14 @@ loadParentsExceptRoot(UResourceDataEntry *&t1, UBool usingUSRData, char usrDataPath[], UErrorCode *status) { if (U_FAILURE(*status)) { return false; } UBool checkParent = true; - while (checkParent && t1->fParent == NULL && !t1->fData.noFallback && + while (checkParent && t1->fParent == nullptr && !t1->fData.noFallback && res_getResource(&t1->fData,"%%ParentIsRoot") == RES_BOGUS) { Resource parentRes = res_getResource(&t1->fData, "%%Parent"); if (parentRes != RES_BOGUS) { // An explicit parent was found. int32_t parentLocaleLen = 0; // No tracing: called during initial data loading const UChar *parentLocaleName = res_getStringNoTrace(&(t1->fData), parentRes, &parentLocaleLen); - if(parentLocaleName != NULL && 0 < parentLocaleLen && parentLocaleLen < nameCapacity) { + if(parentLocaleName != nullptr && 0 < parentLocaleLen && parentLocaleLen < nameCapacity) { u_UCharsToChars(parentLocaleName, name, parentLocaleLen + 1); if (uprv_strcmp(name, kRootLocaleName) == 0) { return true; @@ -766,7 +766,7 @@ loadParentsExceptRoot(UResourceDataEntry *&t1, *status = parentStatus; return false; } - UResourceDataEntry *u2 = NULL; + UResourceDataEntry *u2 = nullptr; UErrorCode usrStatus = U_ZERO_ERROR; if (usingUSRData) { // This code inserts user override data into the inheritance chain. u2 = init_entry(name, usrDataPath, &usrStatus); @@ -811,13 +811,13 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UResOpenType openType, UErrorCode* status) { U_ASSERT(openType != URES_OPEN_DIRECT); UErrorCode intStatus = U_ZERO_ERROR; - UResourceDataEntry *r = NULL; - UResourceDataEntry *t1 = NULL; + UResourceDataEntry *r = nullptr; + UResourceDataEntry *t1 = nullptr; UBool isDefault = false; UBool isRoot = false; UBool hasRealData = false; UBool hasChopped = true; - UBool usingUSRData = U_USE_USRDATA && ( path == NULL || uprv_strncmp(path,U_ICUDATA_NAME,8) == 0); + UBool usingUSRData = U_USE_USRDATA && ( path == nullptr || uprv_strncmp(path,U_ICUDATA_NAME,8) == 0); char name[ULOC_FULLNAME_CAPACITY]; char usrDataPath[96]; @@ -825,14 +825,14 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, initCache(status); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } uprv_strncpy(name, localeID, sizeof(name) - 1); name[sizeof(name) - 1] = 0; if ( usingUSRData ) { - if ( path == NULL ) { + if ( path == nullptr ) { uprv_strcpy(usrDataPath, U_USRDATA_NAME); } else { uprv_strncpy(usrDataPath, path, sizeof(usrDataPath) - 1); @@ -857,7 +857,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, goto finish; } - if(r != NULL) { /* if there is one real locale, we can look for parents. */ + if(r != nullptr) { /* if there is one real locale, we can look for parents. */ t1 = r; hasRealData = true; if ( usingUSRData ) { /* This code inserts user override data into the inheritance chain */ @@ -868,7 +868,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, *status = intStatus; goto finish; } - if ( u1 != NULL ) { + if ( u1 != nullptr ) { if(u1->fBogus == U_ZERO_ERROR) { u1->fParent = t1; r = u1; @@ -887,7 +887,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, /* we could have reached this point without having any real data */ /* if that is the case, we need to chain in the default locale */ - if(r==NULL && openType == URES_OPEN_LOCALE_DEFAULT_ROOT && !isDefault && !isRoot) { + if(r==nullptr && openType == URES_OPEN_LOCALE_DEFAULT_ROOT && !isDefault && !isRoot) { /* insert default locale */ uprv_strcpy(name, defaultLocale); r = findFirstExisting(path, name, defaultLocale, openType, &isRoot, &hasChopped, &isDefault, &intStatus); @@ -897,7 +897,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, goto finish; } intStatus = U_USING_DEFAULT_WARNING; - if(r != NULL) { /* the default locale exists */ + if(r != nullptr) { /* the default locale exists */ t1 = r; hasRealData = true; isDefault = true; @@ -910,9 +910,9 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, } } - /* we could still have r == NULL at this point - maybe even default locale is not */ + /* we could still have r == nullptr at this point - maybe even default locale is not */ /* present */ - if(r == NULL) { + if(r == nullptr) { uprv_strcpy(name, kRootLocaleName); r = findFirstExisting(path, name, defaultLocale, openType, &isRoot, &hasChopped, &isDefault, &intStatus); // If we failed due to out-of-memory, report the failure and exit early. @@ -920,7 +920,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, *status = intStatus; goto finish; } - if(r != NULL) { + if(r != nullptr) { t1 = r; intStatus = U_USING_DEFAULT_WARNING; hasRealData = true; @@ -929,7 +929,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, goto finish; } } else if(!isRoot && uprv_strcmp(t1->fName, kRootLocaleName) != 0 && - t1->fParent == NULL && !r->fData.noFallback) { + t1->fParent == nullptr && !r->fData.noFallback) { if (!insertRootBundle(t1, status)) { goto finish; } @@ -939,7 +939,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, } // TODO: Does this ever loop? - while(r != NULL && !isRoot && t1->fParent != NULL) { + while(r != nullptr && !isRoot && t1->fParent != nullptr) { t1->fParent->fCountExisting++; t1 = t1->fParent; } @@ -951,7 +951,7 @@ finish: } return r; } else { - return NULL; + return nullptr; } } @@ -965,12 +965,12 @@ static UResourceDataEntry * entryOpenDirect(const char* path, const char* localeID, UErrorCode* status) { initCache(status); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } // Note: We need to query the default locale *before* locking resbMutex. - // If the localeID is NULL, then we want to use the default locale. - if (localeID == NULL) { + // If the localeID is nullptr, then we want to use the default locale. + if (localeID == nullptr) { localeID = uloc_getDefault(); } else if (*localeID == 0) { // If the localeID is "", then we want to use the root locale. @@ -984,34 +984,34 @@ entryOpenDirect(const char* path, const char* localeID, UErrorCode* status) { if(U_SUCCESS(*status)) { if(r->fBogus != U_ZERO_ERROR) { r->fCountExisting--; - r = NULL; + r = nullptr; } } else { - r = NULL; + r = nullptr; } // Some code depends on the ures_openDirect() bundle to have a parent bundle chain, // unless it is marked with "nofallback". UResourceDataEntry *t1 = r; - if(r != NULL && uprv_strcmp(localeID, kRootLocaleName) != 0 && // not root - r->fParent == NULL && !r->fData.noFallback && + if(r != nullptr && uprv_strcmp(localeID, kRootLocaleName) != 0 && // not root + r->fParent == nullptr && !r->fData.noFallback && uprv_strlen(localeID) < ULOC_FULLNAME_CAPACITY) { char name[ULOC_FULLNAME_CAPACITY]; uprv_strcpy(name, localeID); if(!chopLocale(name) || uprv_strcmp(name, kRootLocaleName) == 0 || - loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), false, NULL, status)) { - if(uprv_strcmp(t1->fName, kRootLocaleName) != 0 && t1->fParent == NULL) { + loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), false, nullptr, status)) { + if(uprv_strcmp(t1->fName, kRootLocaleName) != 0 && t1->fParent == nullptr) { insertRootBundle(t1, status); } } if(U_FAILURE(*status)) { - r = NULL; + r = nullptr; } } - if(r != NULL) { + if(r != nullptr) { // TODO: Does this ever loop? - while(t1->fParent != NULL) { + while(t1->fParent != nullptr) { t1->fParent->fCountExisting++; t1 = t1->fParent; } @@ -1027,7 +1027,7 @@ entryOpenDirect(const char* path, const char* localeID, UErrorCode* status) { static void entryCloseInt(UResourceDataEntry *resB) { UResourceDataEntry *p = resB; - while(resB != NULL) { + while(resB != nullptr) { p = resB->fParent; resB->fCountExisting--; @@ -1039,10 +1039,10 @@ static void entryCloseInt(UResourceDataEntry *resB) { if(resB->fBogus == U_ZERO_ERROR) { res_unload(&(resB->fData)); } - if(resB->fName != NULL) { + if(resB->fName != nullptr) { uprv_free(resB->fName); } - if(resB->fPath != NULL) { + if(resB->fPath != nullptr) { uprv_free(resB->fPath); } uprv_free(resB); @@ -1064,7 +1064,7 @@ static void entryClose(UResourceDataEntry *resB) { /* U_CFUNC void ures_setResPath(UResourceBundle *resB, const char* toAdd) { - if(resB->fResPath == NULL) { + if(resB->fResPath == nullptr) { resB->fResPath = resB->fResBuf; *(resB->fResPath) = 0; } @@ -1081,7 +1081,7 @@ U_CFUNC void ures_setResPath(UResourceBundle *resB, const char* toAdd) { */ static void ures_appendResPath(UResourceBundle *resB, const char* toAdd, int32_t lenToAdd, UErrorCode *status) { int32_t resPathLenOrig = resB->fResPathLen; - if(resB->fResPath == NULL) { + if(resB->fResPath == nullptr) { resB->fResPath = resB->fResBuf; *(resB->fResPath) = 0; resB->fResPathLen = 0; @@ -1091,7 +1091,7 @@ static void ures_appendResPath(UResourceBundle *resB, const char* toAdd, int32_t if(resB->fResPath == resB->fResBuf) { resB->fResPath = (char *)uprv_malloc((resB->fResPathLen+1)*sizeof(char)); /* Check that memory was allocated correctly. */ - if (resB->fResPath == NULL) { + if (resB->fResPath == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1099,7 +1099,7 @@ static void ures_appendResPath(UResourceBundle *resB, const char* toAdd, int32_t } else { char *temp = (char *)uprv_realloc(resB->fResPath, (resB->fResPathLen+1)*sizeof(char)); /* Check that memory was reallocated correctly. */ - if (temp == NULL) { + if (temp == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1113,18 +1113,18 @@ static void ures_freeResPath(UResourceBundle *resB) { if (resB->fResPath && resB->fResPath != resB->fResBuf) { uprv_free(resB->fResPath); } - resB->fResPath = NULL; + resB->fResPath = nullptr; resB->fResPathLen = 0; } static void ures_closeBundle(UResourceBundle* resB, UBool freeBundleObj) { - if(resB != NULL) { - if(resB->fData != NULL) { + if(resB != nullptr) { + if(resB->fData != nullptr) { entryClose(resB->fData); } - if(resB->fVersion != NULL) { + if(resB->fVersion != nullptr) { uprv_free(resB->fVersion); } ures_freeResPath(resB); @@ -1387,12 +1387,12 @@ UResourceBundle *init_resb_result( int32_t recursionDepth, UResourceBundle *resB, UErrorCode *status) { // TODO: When an error occurs: Should we return nullptr vs. resB? - if(status == NULL || U_FAILURE(*status)) { + if(status == nullptr || U_FAILURE(*status)) { return resB; } if (validLocaleDataEntry == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if(RES_GET_TYPE(r) == URES_ALIAS) { // This is an alias, need to exchange with real data. @@ -1404,20 +1404,20 @@ UResourceBundle *init_resb_result( dataEntry->fData, r, key, idx, validLocaleDataEntry, containerResPath, recursionDepth, resB, status); } - if(resB == NULL) { + if(resB == nullptr) { resB = (UResourceBundle *)uprv_malloc(sizeof(UResourceBundle)); - if (resB == NULL) { + if (resB == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } ures_setIsStackObject(resB, false); - resB->fResPath = NULL; + resB->fResPath = nullptr; resB->fResPathLen = 0; } else { - if(resB->fData != NULL) { + if(resB->fData != nullptr) { entryClose(resB->fData); } - if(resB->fVersion != NULL) { + if(resB->fVersion != nullptr) { uprv_free(resB->fVersion); } /* @@ -1446,7 +1446,7 @@ UResourceBundle *init_resb_result( ures_appendResPath( resB, containerResPath, static_cast(uprv_strlen(containerResPath)), status); } - if(key != NULL) { + if(key != nullptr) { ures_appendResPath(resB, key, (int32_t)uprv_strlen(key), status); if(resB->fResPath[resB->fResPathLen-1] != RES_PATH_SEPARATOR) { ures_appendResPath(resB, RES_PATH_SEPARATOR_S, 1, status); @@ -1465,7 +1465,7 @@ UResourceBundle *init_resb_result( uprv_memset(resB->fResBuf + usedLen, 0, sizeof(resB->fResBuf) - usedLen); } - resB->fVersion = NULL; + resB->fVersion = nullptr; resB->fRes = r; resB->fSize = res_countArrayItems(&resB->getResData(), resB->fRes); ResourceTracer(resB).trace("get"); @@ -1489,27 +1489,27 @@ UResourceBundle *ures_copyResb(UResourceBundle *r, const UResourceBundle *origin if(U_FAILURE(*status) || r == original) { return r; } - if(original != NULL) { - if(r == NULL) { + if(original != nullptr) { + if(r == nullptr) { isStackObject = false; r = (UResourceBundle *)uprv_malloc(sizeof(UResourceBundle)); - /* test for NULL */ - if (r == NULL) { + /* test for nullptr */ + if (r == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } } else { isStackObject = ures_isStackObject(r); ures_closeBundle(r, false); } uprv_memcpy(r, original, sizeof(UResourceBundle)); - r->fResPath = NULL; + r->fResPath = nullptr; r->fResPathLen = 0; if(original->fResPath) { ures_appendResPath(r, original->fResPath, original->fResPathLen, status); } ures_setIsStackObject(r, isStackObject); - if(r->fData != NULL) { + if(r->fData != nullptr) { entryIncrease(r->fData); } } @@ -1522,15 +1522,15 @@ UResourceBundle *ures_copyResb(UResourceBundle *r, const UResourceBundle *origin U_CAPI const UChar* U_EXPORT2 ures_getString(const UResourceBundle* resB, int32_t* len, UErrorCode* status) { const UChar *s; - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } s = res_getString({resB}, &resB->getResData(), resB->fRes, len); - if (s == NULL) { + if (s == nullptr) { *status = U_RESOURCE_TYPE_MISMATCH; } return s; @@ -1544,21 +1544,21 @@ ures_toUTF8String(const UChar *s16, int32_t length16, int32_t capacity; if (U_FAILURE(*status)) { - return NULL; + return nullptr; } - if (pLength != NULL) { + if (pLength != nullptr) { capacity = *pLength; } else { capacity = 0; } - if (capacity < 0 || (capacity > 0 && dest == NULL)) { + if (capacity < 0 || (capacity > 0 && dest == nullptr)) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if (length16 == 0) { /* empty string, return as read-only pointer */ - if (pLength != NULL) { + if (pLength != nullptr) { *pLength = 0; } if (forceCopy) { @@ -1571,7 +1571,7 @@ ures_toUTF8String(const UChar *s16, int32_t length16, /* We need to transform the string to the destination buffer. */ if (capacity < length16) { /* No chance for the string to fit. Pure preflighting. */ - return u_strToUTF8(NULL, 0, pLength, s16, length16, status); + return u_strToUTF8(nullptr, 0, pLength, s16, length16, status); } if (!forceCopy && (length16 <= 0x2aaaaaaa)) { /* @@ -1611,15 +1611,15 @@ ures_getUTF8String(const UResourceBundle *resB, 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; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } p = res_getBinary({resB}, &resB->getResData(), resB->fRes, len); - if (p == NULL) { + if (p == nullptr) { *status = U_RESOURCE_TYPE_MISMATCH; } return p; @@ -1628,15 +1628,15 @@ 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; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } p = res_getIntVector({resB}, &resB->getResData(), resB->fRes, len); - if (p == NULL) { + if (p == nullptr) { *status = U_RESOURCE_TYPE_MISMATCH; } return p; @@ -1645,10 +1645,10 @@ U_CAPI const int32_t* U_EXPORT2 ures_getIntVector(const UResourceBundle* resB, i /* this function returns a signed integer */ /* it performs sign extension */ U_CAPI int32_t U_EXPORT2 ures_getInt(const UResourceBundle* resB, UErrorCode *status) { - if (status==NULL || U_FAILURE(*status)) { + if (status==nullptr || U_FAILURE(*status)) { return 0xffffffff; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0xffffffff; } @@ -1660,10 +1660,10 @@ U_CAPI int32_t U_EXPORT2 ures_getInt(const UResourceBundle* resB, UErrorCode *st } U_CAPI uint32_t U_EXPORT2 ures_getUInt(const UResourceBundle* resB, UErrorCode *status) { - if (status==NULL || U_FAILURE(*status)) { + if (status==nullptr || U_FAILURE(*status)) { return 0xffffffff; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0xffffffff; } @@ -1675,7 +1675,7 @@ U_CAPI uint32_t U_EXPORT2 ures_getUInt(const UResourceBundle* resB, UErrorCode * } U_CAPI UResType U_EXPORT2 ures_getType(const UResourceBundle *resB) { - if(resB == NULL) { + if(resB == nullptr) { return URES_NONE; } return res_getPublicType(resB->fRes); @@ -1691,14 +1691,14 @@ U_CAPI const char * U_EXPORT2 ures_getKey(const UResourceBundle *resB) { // However, I believe we have some data (e.g., in res_index) where the key // strings are the data. Tracing the enclosing table should suffice. // - if(resB == NULL) { - return NULL; + if(resB == nullptr) { + return nullptr; } return(resB->fKey); } U_CAPI int32_t U_EXPORT2 ures_getSize(const UResourceBundle *resB) { - if(resB == NULL) { + if(resB == nullptr) { return 0; } @@ -1708,7 +1708,7 @@ U_CAPI int32_t U_EXPORT2 ures_getSize(const UResourceBundle *resB) { static const UChar* ures_getStringWithAlias(const UResourceBundle *resB, Resource r, int32_t sIndex, int32_t *len, UErrorCode *status) { if(RES_GET_TYPE(r) == URES_ALIAS) { const UChar* result = 0; - UResourceBundle *tempRes = ures_getByIndex(resB, sIndex, NULL, status); + UResourceBundle *tempRes = ures_getByIndex(resB, sIndex, nullptr, status); result = ures_getString(tempRes, len, status); ures_close(tempRes); return result; @@ -1718,14 +1718,14 @@ static const UChar* ures_getStringWithAlias(const UResourceBundle *resB, Resourc } U_CAPI void U_EXPORT2 ures_resetIterator(UResourceBundle *resB){ - if(resB == NULL) { + if(resB == nullptr) { return; } resB->fIndex = -1; } U_CAPI UBool U_EXPORT2 ures_hasNext(const UResourceBundle *resB) { - if(resB == NULL) { + if(resB == nullptr) { return false; } return (UBool)(resB->fIndex < resB->fSize-1); @@ -1734,12 +1734,12 @@ U_CAPI UBool U_EXPORT2 ures_hasNext(const UResourceBundle *resB) { U_CAPI const UChar* U_EXPORT2 ures_getNextString(UResourceBundle *resB, int32_t* len, const char ** key, UErrorCode *status) { Resource r = RES_BOGUS; - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if(resB->fIndex == resB->fSize-1) { @@ -1773,30 +1773,30 @@ U_CAPI const UChar* U_EXPORT2 ures_getNextString(UResourceBundle *resB, int32_t* *status = U_RESOURCE_TYPE_MISMATCH; U_FALLTHROUGH; default: - return NULL; + return nullptr; } } - return NULL; + return nullptr; } U_CAPI UResourceBundle* U_EXPORT2 ures_getNextResource(UResourceBundle *resB, UResourceBundle *fillIn, UErrorCode *status) { - const char *key = NULL; + const char *key = nullptr; Resource r = RES_BOGUS; - if (status==NULL || U_FAILURE(*status)) { - /*return NULL;*/ + if (status==nullptr || U_FAILURE(*status)) { + /*return nullptr;*/ return fillIn; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } if(resB->fIndex == resB->fSize-1) { *status = U_INDEX_OUTOFBOUNDS_ERROR; - /*return NULL;*/ + /*return nullptr;*/ } else { resB->fIndex++; switch(RES_GET_TYPE(resB->fRes)) { @@ -1822,25 +1822,25 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_getNextResource(UResourceBundle *resB, UR } return init_resb_result(resB->fData, r, key, resB->fIndex, resB, fillIn, status); default: - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } } - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } U_CAPI UResourceBundle* U_EXPORT2 ures_getByIndex(const UResourceBundle *resB, int32_t indexR, UResourceBundle *fillIn, UErrorCode *status) { - const char* key = NULL; + const char* key = nullptr; Resource r = RES_BOGUS; - if (status==NULL || U_FAILURE(*status)) { - /*return NULL;*/ + if (status==nullptr || U_FAILURE(*status)) { + /*return nullptr;*/ return fillIn; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } @@ -1868,26 +1868,26 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_getByIndex(const UResourceBundle *resB, i } return init_resb_result(resB->fData, r, key, indexR, resB, fillIn, status); default: - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } } else { *status = U_MISSING_RESOURCE_ERROR; } - /*return NULL;*/ + /*return nullptr;*/ return fillIn; } U_CAPI const UChar* U_EXPORT2 ures_getStringByIndex(const UResourceBundle *resB, int32_t indexS, int32_t* len, UErrorCode *status) { - const char* key = NULL; + const char* key = nullptr; Resource r = RES_BOGUS; - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if(indexS >= 0 && resB->fSize > indexS) { @@ -1925,7 +1925,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByIndex(const UResourceBundle *resB, } else { *status = U_MISSING_RESOURCE_ERROR; } - return NULL; + return nullptr; } U_CAPI const char * U_EXPORT2 @@ -1946,21 +1946,21 @@ ures_getUTF8StringByIndex(const UResourceBundle *resB, U_CAPI UResourceBundle* U_EXPORT2 ures_findResource(const char* path, UResourceBundle *fillIn, UErrorCode *status) { - UResourceBundle *first = NULL; + UResourceBundle *first = nullptr; UResourceBundle *result = fillIn; - char *packageName = NULL; - char *pathToResource = NULL, *save = NULL; - char *locale = NULL, *localeEnd = NULL; + char *packageName = nullptr; + char *pathToResource = nullptr, *save = nullptr; + char *locale = nullptr, *localeEnd = nullptr; int32_t length; - if(status == NULL || U_FAILURE(*status)) { + if(status == nullptr || U_FAILURE(*status)) { return result; } length = (int32_t)(uprv_strlen(path)+1); save = pathToResource = (char *)uprv_malloc(length*sizeof(char)); - /* test for NULL */ - if(pathToResource == NULL) { + /* test for nullptr */ + if(pathToResource == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return result; } @@ -1971,7 +1971,7 @@ ures_findResource(const char* path, UResourceBundle *fillIn, UErrorCode *status) pathToResource++; packageName = pathToResource; pathToResource = uprv_strchr(pathToResource, RES_PATH_SEPARATOR); - if(pathToResource == NULL) { + if(pathToResource == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; } else { *pathToResource = 0; @@ -1980,7 +1980,7 @@ ures_findResource(const char* path, UResourceBundle *fillIn, UErrorCode *status) } localeEnd = uprv_strchr(locale, RES_PATH_SEPARATOR); - if(localeEnd != NULL) { + if(localeEnd != nullptr) { *localeEnd = 0; } @@ -2005,7 +2005,7 @@ ures_findSubResource(const UResourceBundle *resB, char* path, UResourceBundle *f UResourceBundle *result = fillIn; const char *key; - if(status == NULL || U_FAILURE(*status)) { + if(status == nullptr || U_FAILURE(*status)) { return result; } @@ -2032,21 +2032,21 @@ ures_getStringByKeyWithFallback(const UResourceBundle *resB, UErrorCode *status) { UResourceBundle stack; - const UChar* retVal = NULL; + const UChar* retVal = nullptr; ures_initStackObject(&stack); ures_getByKeyWithFallback(resB, inKey, &stack, status); int32_t length; retVal = ures_getString(&stack, &length, status); ures_close(&stack); if (U_FAILURE(*status)) { - return NULL; + return nullptr; } if (length == 3 && retVal[0] == EMPTY_SET && retVal[1] == EMPTY_SET && retVal[2] == EMPTY_SET ) { - retVal = NULL; + retVal = nullptr; length = 0; *status = U_MISSING_RESOURCE_ERROR; } - if (len != NULL) { + if (len != nullptr) { *len = length; } return retVal; @@ -2065,7 +2065,7 @@ static Resource getTableItemByKeyPath(const ResourceData *pResData, Resource tab UResType type = (UResType)RES_GET_TYPE(resource); /* the current resource type */ while (*pathPart && resource != RES_BOGUS && URES_IS_CONTAINER(type)) { char *nextPathPart = uprv_strchr(pathPart, RES_PATH_SEPARATOR); - if (nextPathPart != NULL) { + if (nextPathPart != nullptr) { *nextPathPart = 0; /* Terminating null for this part of path. */ nextPathPart++; } else { @@ -2162,12 +2162,12 @@ ures_getByKeyWithFallback(const UResourceBundle *resB, UResourceBundle *fillIn, UErrorCode *status) { Resource res = RES_BOGUS, rootRes = RES_BOGUS; - UResourceBundle *helper = NULL; + UResourceBundle *helper = nullptr; - if (status==NULL || U_FAILURE(*status)) { + if (status==nullptr || U_FAILURE(*status)) { return fillIn; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return fillIn; } @@ -2182,14 +2182,14 @@ ures_getByKeyWithFallback(const UResourceBundle *resB, if(res == RES_BOGUS) { UResourceDataEntry *dataEntry = resB->fData; CharString path; - char *myPath = NULL; + char *myPath = nullptr; const char* resPath = resB->fResPath; int32_t len = resB->fResPathLen; - while(res == RES_BOGUS && (dataEntry->fParent != NULL || !didRootOnce)) { /* Otherwise, we'll look in parents */ - if (dataEntry->fParent != NULL) { + while(res == RES_BOGUS && (dataEntry->fParent != nullptr || !didRootOnce)) { /* Otherwise, we'll look in parents */ + if (dataEntry->fParent != nullptr) { dataEntry = dataEntry->fParent; } else { - // We can't just stop when we get to a bundle whose fParent is NULL. That'll work most of the time, + // We can't just stop when we get to a bundle whose fParent is nullptr. That'll work most of the time, // but if the bundle that the caller passed to us was "root" (which happens in getAllItemsWithFallback(), // this function will drop right out without doing anything if "root" doesn't contain the exact key path // specified. In that case, we need one extra time through this loop to make sure we follow any @@ -2210,7 +2210,7 @@ ures_getByKeyWithFallback(const UResourceBundle *resB, res = res_findResource(&(dataEntry->fData), rootRes, &myPath, &key); if (RES_GET_TYPE(res) == URES_ALIAS && *myPath) { /* We hit an alias, but we didn't finish following the path. */ - helper = init_resb_result(dataEntry, res, NULL, -1, resB, helper, status); + helper = init_resb_result(dataEntry, res, nullptr, -1, resB, helper, status); /*helper = init_resb_result(dataEntry, res, inKey, -1, resB, helper, status);*/ if(helper) { dataEntry = helper->fData; @@ -2289,7 +2289,7 @@ void getAllItemsWithFallback( value.setData(bundle->getResData()); value.setValidLocaleDataEntry(bundle->fValidLocaleDataEntry); UResourceDataEntry *parentEntry = bundle->fData->fParent; - UBool hasParent = parentEntry != NULL && U_SUCCESS(parentEntry->fBogus); + UBool hasParent = parentEntry != nullptr && U_SUCCESS(parentEntry->fBogus); value.setResource(bundle->fRes, ResourceTracer(bundle)); sink.put(bundle->fKey, value, !hasParent, errorCode); if (hasParent) { @@ -2316,7 +2316,7 @@ void getAllItemsWithFallback( StackUResourceBundle containerBundle; const UResourceBundle *rb; UErrorCode pathErrorCode = U_ZERO_ERROR; // Ignore if parents up to root do not have this path. - if (bundle->fResPath == NULL || *bundle->fResPath == 0) { + if (bundle->fResPath == nullptr || *bundle->fResPath == 0) { rb = parentBundle.getAlias(); } else { rb = ures_getByKeyWithFallback(parentBundle.getAlias(), bundle->fResPath, @@ -2432,13 +2432,13 @@ ures_getAllItemsWithFallback(const UResourceBundle *bundle, const char *path, U_CAPI UResourceBundle* U_EXPORT2 ures_getByKey(const UResourceBundle *resB, const char* inKey, UResourceBundle *fillIn, UErrorCode *status) { Resource res = RES_BOGUS; - UResourceDataEntry *dataEntry = NULL; + UResourceDataEntry *dataEntry = nullptr; const char *key = inKey; - if (status==NULL || U_FAILURE(*status)) { + if (status==nullptr || U_FAILURE(*status)) { return fillIn; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return fillIn; } @@ -2485,15 +2485,15 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_getByKey(const UResourceBundle *resB, con U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, const char* inKey, int32_t* len, UErrorCode *status) { Resource res = RES_BOGUS; - UResourceDataEntry *dataEntry = NULL; + UResourceDataEntry *dataEntry = nullptr; const char* key = inKey; - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } - if(resB == NULL) { + if(resB == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } int32_t type = RES_GET_TYPE(resB->fRes); @@ -2514,7 +2514,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c case URES_ALIAS: { const UChar* result = 0; - UResourceBundle *tempRes = ures_getByKey(resB, inKey, NULL, status); + UResourceBundle *tempRes = ures_getByKey(resB, inKey, nullptr, status); result = ures_getString(tempRes, len, status); ures_close(tempRes); return result; @@ -2536,7 +2536,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c case URES_ALIAS: { const UChar* result = 0; - UResourceBundle *tempRes = ures_getByKey(resB, inKey, NULL, status); + UResourceBundle *tempRes = ures_getByKey(resB, inKey, nullptr, status); result = ures_getString(tempRes, len, status); ures_close(tempRes); return result; @@ -2563,7 +2563,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c else { *status = U_RESOURCE_TYPE_MISMATCH; } - return NULL; + return nullptr; } U_CAPI const char * U_EXPORT2 @@ -2586,12 +2586,12 @@ ures_getUTF8StringByKey(const UResourceBundle *resB, U_CAPI const char* U_EXPORT2 ures_getLocaleInternal(const UResourceBundle* resourceBundle, UErrorCode* status) { - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } if (!resourceBundle) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } else { return resourceBundle->fData->fName; } @@ -2609,12 +2609,12 @@ U_CAPI const char* U_EXPORT2 ures_getLocaleByType(const UResourceBundle* resourceBundle, ULocDataLocaleType type, UErrorCode* status) { - if (status==NULL || U_FAILURE(*status)) { - return NULL; + if (status==nullptr || U_FAILURE(*status)) { + return nullptr; } if (!resourceBundle) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } else { switch(type) { case ULOC_ACTUAL_LOCALE: @@ -2624,14 +2624,14 @@ ures_getLocaleByType(const UResourceBundle* resourceBundle, case ULOC_REQUESTED_LOCALE: default: *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } } } U_CFUNC const char* ures_getName(const UResourceBundle* resB) { - if(resB == NULL) { - return NULL; + if(resB == nullptr) { + return nullptr; } return resB->fData->fName; @@ -2639,8 +2639,8 @@ U_CFUNC const char* ures_getName(const UResourceBundle* resB) { #ifdef URES_DEBUG U_CFUNC const char* ures_getPath(const UResourceBundle* resB) { - if(resB == NULL) { - return NULL; + if(resB == nullptr) { + return nullptr; } return resB->fData->fPath; @@ -2651,7 +2651,7 @@ static UResourceBundle* ures_openWithType(UResourceBundle *r, const char* path, const char* localeID, UResOpenType openType, UErrorCode* status) { if(U_FAILURE(*status)) { - return NULL; + return nullptr; } UResourceDataEntry *entry; @@ -2661,27 +2661,27 @@ ures_openWithType(UResourceBundle *r, const char* path, const char* localeID, uloc_getBaseName(localeID, canonLocaleID, UPRV_LENGTHOF(canonLocaleID), status); if(U_FAILURE(*status) || *status == U_STRING_NOT_TERMINATED_WARNING) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } entry = entryOpen(path, canonLocaleID, openType, status); } else { entry = entryOpenDirect(path, localeID, status); } if(U_FAILURE(*status)) { - return NULL; + return nullptr; } - if(entry == NULL) { + if(entry == nullptr) { *status = U_MISSING_RESOURCE_ERROR; - return NULL; + return nullptr; } UBool isStackObject; - if(r == NULL) { + if(r == nullptr) { r = (UResourceBundle *)uprv_malloc(sizeof(UResourceBundle)); - if(r == NULL) { + if(r == nullptr) { entryClose(entry); *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } isStackObject = false; } else { // fill-in @@ -2705,12 +2705,12 @@ ures_openWithType(UResourceBundle *r, const char* path, const char* localeID, U_CAPI UResourceBundle* U_EXPORT2 ures_open(const char* path, const char* localeID, UErrorCode* status) { - return ures_openWithType(NULL, path, localeID, URES_OPEN_LOCALE_DEFAULT_ROOT, status); + return ures_openWithType(nullptr, path, localeID, URES_OPEN_LOCALE_DEFAULT_ROOT, status); } U_CAPI UResourceBundle* U_EXPORT2 ures_openNoDefault(const char* path, const char* localeID, UErrorCode* status) { - return ures_openWithType(NULL, path, localeID, URES_OPEN_LOCALE_ROOT, status); + return ures_openWithType(nullptr, path, localeID, URES_OPEN_LOCALE_ROOT, status); } /** @@ -2719,7 +2719,7 @@ ures_openNoDefault(const char* path, const char* localeID, UErrorCode* status) { */ U_CAPI UResourceBundle* U_EXPORT2 ures_openDirect(const char* path, const char* localeID, UErrorCode* status) { - return ures_openWithType(NULL, path, localeID, URES_OPEN_DIRECT, status); + return ures_openWithType(nullptr, path, localeID, URES_OPEN_DIRECT, status); } /** @@ -2732,7 +2732,7 @@ ures_openDirect(const char* path, const char* localeID, UErrorCode* status) { U_CAPI void U_EXPORT2 ures_openFillIn(UResourceBundle *r, const char* path, const char* localeID, UErrorCode* status) { - if(U_SUCCESS(*status) && r == NULL) { + if(U_SUCCESS(*status) && r == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -2744,7 +2744,7 @@ ures_openFillIn(UResourceBundle *r, const char* path, */ U_CAPI void U_EXPORT2 ures_openDirectFillIn(UResourceBundle *r, const char* path, const char* localeID, UErrorCode* status) { - if(U_SUCCESS(*status) && r == NULL) { + if(U_SUCCESS(*status) && r == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -2762,16 +2762,16 @@ ures_countArrayItems(const UResourceBundle* resourceBundle, { UResourceBundle resData; ures_initStackObject(&resData); - if (status==NULL || U_FAILURE(*status)) { + if (status==nullptr || U_FAILURE(*status)) { return 0; } - if(resourceBundle == NULL) { + if(resourceBundle == nullptr) { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } ures_getByKey(resourceBundle, resourceKey, &resData, status); - if(resData.getResData().data != NULL) { + if(resData.getResData().data != nullptr) { int32_t result = res_countArrayItems(&resData.getResData(), resData.fRes); ures_close(&resData); return result; @@ -2795,9 +2795,9 @@ ures_countArrayItems(const UResourceBundle* resourceBundle, U_CAPI const char* U_EXPORT2 ures_getVersionNumberInternal(const UResourceBundle *resourceBundle) { - if (!resourceBundle) return NULL; + if (!resourceBundle) return nullptr; - if(resourceBundle->fVersion == NULL) { + if(resourceBundle->fVersion == nullptr) { /* If the version ID has not been built yet, then do so. Retrieve */ /* the minor version from the file. */ @@ -2820,8 +2820,8 @@ ures_getVersionNumberInternal(const UResourceBundle *resourceBundle) ((UResourceBundle *)resourceBundle)->fVersion = (char *)uprv_malloc(1 + len); /* Check for null pointer. */ - if (((UResourceBundle *)resourceBundle)->fVersion == NULL) { - return NULL; + if (((UResourceBundle *)resourceBundle)->fVersion == nullptr) { + return nullptr; } if(minor_len > 0) { @@ -2886,8 +2886,8 @@ ures_loc_nextLocale(UEnumeration* en, UErrorCode* status) { ULocalesContext *ctx = (ULocalesContext *)en->context; UResourceBundle *res = &(ctx->installed); - UResourceBundle *k = NULL; - const char *result = NULL; + UResourceBundle *k = nullptr; + const char *result = nullptr; int32_t len = 0; if(ures_hasNext(res) && (k = ures_getNextResource(res, &ctx->curr, status)) != 0) { result = ures_getKey(k); @@ -2909,8 +2909,8 @@ ures_loc_resetLocales(UEnumeration* en, U_CDECL_END static const UEnumeration gLocalesEnum = { - NULL, - NULL, + nullptr, + nullptr, ures_loc_closeLocales, ures_loc_countLocales, uenum_unextDefault, @@ -2922,12 +2922,12 @@ static const UEnumeration gLocalesEnum = { U_CAPI UEnumeration* U_EXPORT2 ures_openAvailableLocales(const char *path, UErrorCode *status) { - UResourceBundle *idx = NULL; - UEnumeration *en = NULL; - ULocalesContext *myContext = NULL; + UResourceBundle *idx = nullptr; + UEnumeration *en = nullptr; + ULocalesContext *myContext = nullptr; if(U_FAILURE(*status)) { - return NULL; + return nullptr; } myContext = static_cast(uprv_malloc(sizeof(ULocalesContext))); en = (UEnumeration *)uprv_malloc(sizeof(UEnumeration)); @@ -2935,7 +2935,7 @@ ures_openAvailableLocales(const char *path, UErrorCode *status) *status = U_MEMORY_ALLOCATION_ERROR; uprv_free(en); uprv_free(myContext); - return NULL; + return nullptr; } uprv_memcpy(en, &gLocalesEnum, sizeof(UEnumeration)); @@ -2956,7 +2956,7 @@ ures_openAvailableLocales(const char *path, UErrorCode *status) ures_close(&myContext->installed); uprv_free(myContext); uprv_free(en); - en = NULL; + en = nullptr; } ures_close(idx); @@ -2966,7 +2966,7 @@ ures_openAvailableLocales(const char *path, UErrorCode *status) static UBool isLocaleInList(UEnumeration *locEnum, const char *locToSearch, UErrorCode *status) { const char *loc; - while ((loc = uenum_next(locEnum, NULL, status)) != NULL) { + while ((loc = uenum_next(locEnum, nullptr, status)) != nullptr) { if (uprv_strcmp(loc, locToSearch) == 0) { return true; } @@ -2987,7 +2987,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity, char parent[1024] = ""; char full[1024] = ""; UResourceBundle bund1, bund2; - UResourceBundle *res = NULL; + UResourceBundle *res = nullptr; UErrorCode subStatus = U_ZERO_ERROR; int32_t length = 0; if(U_FAILURE(*status)) return 0; @@ -3029,7 +3029,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity, { *isAvailable = false; } - isAvailable = NULL; /* only want to set this the first time around */ + isAvailable = nullptr; /* only want to set this the first time around */ #if defined(URES_TREE_DEBUG) fprintf(stderr, "%s;%s -> %s [%s]\n", path?path:"ICUDATA", parent, u_errorName(subStatus), ures_getLocale(res, &subStatus)); @@ -3067,7 +3067,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity, subStatus = U_ZERO_ERROR; - if (res != NULL) { + if (res != nullptr) { uprv_strcpy(found, ures_getLocaleByType(res, ULOC_VALID_LOCALE, &subStatus)); } @@ -3085,7 +3085,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity, if((subStatus == U_USING_FALLBACK_WARNING) && isAvailable) { *isAvailable = false; } - isAvailable = NULL; /* only want to set this the first time around */ + isAvailable = nullptr; /* only want to set this the first time around */ #if defined(URES_TREE_DEBUG) fprintf(stderr, "%s;%s -> %s (looking for %s)\n", @@ -3166,7 +3166,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity, if((subStatus == U_USING_FALLBACK_WARNING) && isAvailable) { *isAvailable = false; } - isAvailable = NULL; /* only want to set this the first time around */ + isAvailable = nullptr; /* only want to set this the first time around */ #if defined(URES_TREE_DEBUG) fprintf(stderr, "%s;%s -> %s (looking for default %s)\n", @@ -3293,7 +3293,7 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) const char *locale; int32_t locLen; - UEnumeration *locs = NULL; + UEnumeration *locs = nullptr; UResourceBundle item; UResourceBundle subItem; @@ -3305,15 +3305,15 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) if(U_FAILURE(*status)) { ures_close(&item); ures_close(&subItem); - return NULL; + return nullptr; } valuesBuf[0]=0; valuesBuf[1]=0; while((locale = uenum_next(locs, &locLen, status)) != 0) { - UResourceBundle *bund = NULL; - UResourceBundle *subPtr = NULL; + UResourceBundle *bund = nullptr; + UResourceBundle *subPtr = nullptr; UErrorCode subStatus = U_ZERO_ERROR; /* don't fail if a bundle is unopenable */ bund = ures_open(path, locale, &subStatus); @@ -3332,7 +3332,7 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) path?path:"", keyword, locale, u_errorName(subStatus)); #endif ures_close(bund); - bund = NULL; + bund = nullptr; continue; } @@ -3345,18 +3345,18 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) #if defined(URES_TREE_DEBUG) /* fprintf(stderr, "%s | %s | %s | %s\n", path?path:"", keyword, locale, k); */ #endif - if(k == NULL || *k == 0 || + if(k == nullptr || *k == 0 || uprv_strcmp(k, DEFAULT_TAG) == 0 || uprv_strncmp(k, "private-", 8) == 0) { // empty or "default" or unlisted type continue; } for(i=0; i= (VALUES_LIST_SIZE-1)) || /* no more space in list .. */ ((valuesIndex+kLen+1+1) >= VALUES_BUF_SIZE)) { /* no more space in buffer (string + 2 nulls) */ @@ -3390,10 +3390,10 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) /* This code isn't needed, and given the documentation warnings the implementation is suspect */ U_CAPI UBool U_EXPORT2 ures_equal(const UResourceBundle* res1, const UResourceBundle* res2){ - if(res1==NULL || res2==NULL){ + if(res1==nullptr || res2==nullptr){ return res1==res2; /* pointer comparison */ } - if(res1->fKey==NULL|| res2->fKey==NULL){ + if(res1->fKey==nullptr|| res2->fKey==nullptr){ return (res1->fKey==res2->fKey); }else{ if(uprv_strcmp(res1->fKey, res2->fKey)!=0){ @@ -3403,7 +3403,7 @@ ures_equal(const UResourceBundle* res1, const UResourceBundle* res2){ if(uprv_strcmp(res1->fData->fName, res2->fData->fName)!=0){ return false; } - if(res1->fData->fPath == NULL|| res2->fData->fPath==NULL){ + if(res1->fData->fPath == nullptr|| res2->fData->fPath==nullptr){ return (res1->fData->fPath == res2->fData->fPath); }else{ if(uprv_strcmp(res1->fData->fPath, res2->fData->fPath)!=0){ @@ -3426,14 +3426,14 @@ ures_equal(const UResourceBundle* res1, const UResourceBundle* res2){ } U_CAPI UResourceBundle* U_EXPORT2 ures_clone(const UResourceBundle* res, UErrorCode* status){ - UResourceBundle* bundle = NULL; - UResourceBundle* ret = NULL; - if(U_FAILURE(*status) || res == NULL){ - return NULL; + UResourceBundle* bundle = nullptr; + UResourceBundle* ret = nullptr; + if(U_FAILURE(*status) || res == nullptr){ + return nullptr; } bundle = ures_open(res->fData->fPath, res->fData->fName, status); - if(res->fResPath!=NULL){ - ret = ures_findSubResource(bundle, res->fResPath, NULL, status); + if(res->fResPath!=nullptr){ + ret = ures_findSubResource(bundle, res->fResPath, nullptr, status); ures_close(bundle); }else{ ret = bundle; @@ -3442,8 +3442,8 @@ ures_clone(const UResourceBundle* res, UErrorCode* status){ } U_CAPI const UResourceBundle* U_EXPORT2 ures_getParentBundle(const UResourceBundle* res){ - if(res==NULL){ - return NULL; + if(res==nullptr){ + return nullptr; } return res->fParentRes; } diff --git a/icu4c/source/common/uresdata.cpp b/icu4c/source/common/uresdata.cpp index a1222d415ce..30f05fbb2b1 100644 --- a/icu4c/source/common/uresdata.cpp +++ b/icu4c/source/common/uresdata.cpp @@ -248,7 +248,7 @@ res_read(ResourceData *pResData, if(U_FAILURE(*errorCode)) { return; } - if(!isAcceptable(formatVersion, NULL, NULL, pInfo)) { + if(!isAcceptable(formatVersion, nullptr, nullptr, pInfo)) { *errorCode=U_INVALID_FORMAT_ERROR; return; } @@ -274,9 +274,9 @@ res_load(ResourceData *pResData, U_CFUNC void res_unload(ResourceData *pResData) { - if(pResData->data!=NULL) { + if(pResData->data!=nullptr) { udata_close(pResData->data); - pResData->data=NULL; + pResData->data=nullptr; } } @@ -337,7 +337,7 @@ res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLengt length=*p32++; p=(const UChar *)p32; } else { - p=NULL; + p=nullptr; length=0; } if(pLength) { @@ -389,7 +389,7 @@ int32_t getStringArray(const ResourceData *pResData, const icu::ResourceArray &a if(U_FAILURE(errorCode)) { return 0; } - if(dest == NULL ? capacity != 0 : capacity < 0) { + if(dest == nullptr ? capacity != 0 : capacity < 0) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -405,7 +405,7 @@ int32_t getStringArray(const ResourceData *pResData, const icu::ResourceArray &a int32_t sLength; // No tracing: handled by the caller const UChar *s = res_getStringNoTrace(pResData, array.internalGetResource(pResData, i), &sLength); - if(s == NULL) { + if(s == nullptr) { errorCode = U_RESOURCE_TYPE_MISMATCH; return 0; } @@ -426,7 +426,7 @@ res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength) { length=*p32++; p=(const UChar *)p32; } else { - p=NULL; + p=nullptr; length=0; } if(pLength) { @@ -445,7 +445,7 @@ res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLengt length=*p32++; p=(const uint8_t *)p32; } else { - p=NULL; + p=nullptr; length=0; } if(pLength) { @@ -464,7 +464,7 @@ res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLe p= offset==0 ? (const int32_t *)&gEmpty32 : pResData->pRoot+offset; length=*p++; } else { - p=NULL; + p=nullptr; length=0; } if(pLength) { @@ -507,10 +507,10 @@ UResType ResourceDataValue::getType() const { const UChar *ResourceDataValue::getString(int32_t &length, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } const UChar *s = res_getString(fTraceInfo, &getData(), res, &length); - if(s == NULL) { + if(s == nullptr) { errorCode = U_RESOURCE_TYPE_MISMATCH; } return s; @@ -518,10 +518,10 @@ const UChar *ResourceDataValue::getString(int32_t &length, UErrorCode &errorCode const UChar *ResourceDataValue::getAliasString(int32_t &length, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } const UChar *s = res_getAlias(&getData(), res, &length); - if(s == NULL) { + if(s == nullptr) { errorCode = U_RESOURCE_TYPE_MISMATCH; } return s; @@ -549,10 +549,10 @@ uint32_t ResourceDataValue::getUInt(UErrorCode &errorCode) const { const int32_t *ResourceDataValue::getIntVector(int32_t &length, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } const int32_t *iv = res_getIntVector(fTraceInfo, &getData(), res, &length); - if(iv == NULL) { + if(iv == nullptr) { errorCode = U_RESOURCE_TYPE_MISMATCH; } return iv; @@ -560,10 +560,10 @@ const int32_t *ResourceDataValue::getIntVector(int32_t &length, UErrorCode &erro const uint8_t *ResourceDataValue::getBinary(int32_t &length, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } const uint8_t *b = res_getBinary(fTraceInfo, &getData(), res, &length); - if(b == NULL) { + if(b == nullptr) { errorCode = U_RESOURCE_TYPE_MISMATCH; } return b; @@ -573,8 +573,8 @@ ResourceArray ResourceDataValue::getArray(UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return ResourceArray(); } - const uint16_t *items16 = NULL; - const Resource *items32 = NULL; + const uint16_t *items16 = nullptr; + const Resource *items32 = nullptr; uint32_t offset=RES_GET_OFFSET(res); int32_t length = 0; switch(RES_GET_TYPE(res)) { @@ -599,10 +599,10 @@ ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return ResourceTable(); } - const uint16_t *keys16 = NULL; - const int32_t *keys32 = NULL; - const uint16_t *items16 = NULL; - const Resource *items32 = NULL; + const uint16_t *keys16 = nullptr; + const int32_t *keys32 = nullptr; + const uint16_t *items16 = nullptr; + const Resource *items32 = nullptr; uint32_t offset = RES_GET_OFFSET(res); int32_t length = 0; switch(RES_GET_TYPE(res)) { @@ -649,7 +649,7 @@ int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, in if(U_FAILURE(errorCode)) { return 0; } - if(dest == NULL ? capacity != 0 : capacity < 0) { + if(dest == nullptr ? capacity != 0 : capacity < 0) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -659,7 +659,7 @@ int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, in } int32_t sLength; const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); - if(s != NULL) { + if(s != nullptr) { dest[0].setTo(true, s, sLength); return 1; } @@ -674,7 +674,7 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode) } int32_t sLength; const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); - if(s != NULL) { + if(s != nullptr) { us.setTo(true, s, sLength); return us; } @@ -685,7 +685,7 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode) if(array.getSize() > 0) { // Tracing is already performed above (unimportant for trace that this is an array) s = res_getStringNoTrace(&getData(), array.internalGetResource(&getData(), 0), &sLength); - if(s != NULL) { + if(s != nullptr) { us.setTo(true, s, sLength); return us; } @@ -714,7 +714,7 @@ res_getTableItemByKey(const ResourceData *pResData, Resource table, uint32_t offset=RES_GET_OFFSET(table); int32_t length; int32_t idx; - if(key == NULL || *key == NULL) { + if(key == nullptr || *key == nullptr) { return RES_BOGUS; } switch(RES_GET_TYPE(table)) { @@ -771,7 +771,7 @@ res_getTableItemByIndex(const ResourceData *pResData, Resource table, length=*p++; if(indexRp16BitUnits+offset; length=*p++; if(indexRpRoot+offset; length=*p++; if(indexRcompareInvChars(ds, key, -1, @@ -1139,7 +1139,7 @@ ures_swapResource(const UDataSwapper *ds, qKey16=(uint16_t *)q; count=ds->readUInt16(*pKey16); - pKey32=qKey32=NULL; + pKey32=qKey32=nullptr; /* swap count */ ds->swapArray16(ds, pKey16++, 2, qKey16++, pErrorCode); @@ -1151,7 +1151,7 @@ ures_swapResource(const UDataSwapper *ds, qKey32=(int32_t *)q; count=udata_readInt32(ds, *pKey32); - pKey16=qKey16=NULL; + pKey16=qKey16=nullptr; /* swap count */ ds->swapArray32(ds, pKey32++, 4, qKey32++, pErrorCode); @@ -1169,7 +1169,7 @@ ures_swapResource(const UDataSwapper *ds, /* recurse */ for(i=0; ireadUInt16(pKey16[i]); if(keyOffsetlocalKeyLimit) { itemKey=(const char *)outBundle+keyOffset; @@ -1191,7 +1191,7 @@ ures_swapResource(const UDataSwapper *ds, if(pTempTable->majorFormatVersion>1 || ds->inCharset==ds->outCharset) { /* no need to sort, just swap the offset/value arrays */ - if(pKey16!=NULL) { + if(pKey16!=nullptr) { ds->swapArray16(ds, pKey16, count*2, qKey16, pErrorCode); ds->swapArray32(ds, p, count*4, q, pErrorCode); } else { @@ -1209,7 +1209,7 @@ ures_swapResource(const UDataSwapper *ds, * sorting indexes and sort that. * Then we permutate and copy/swap the actual values. */ - if(pKey16!=NULL) { + if(pKey16!=nullptr) { for(i=0; irows[i].keyIndex=ds->readUInt16(pKey16[i]); pTempTable->rows[i].sortIndex=i; @@ -1237,7 +1237,7 @@ ures_swapResource(const UDataSwapper *ds, * before the results are copied to the outBundle. */ /* keys */ - if(pKey16!=NULL) { + if(pKey16!=nullptr) { uint16_t *rKey16; if(pKey16!=qKey16) { @@ -1301,7 +1301,7 @@ ures_swapResource(const UDataSwapper *ds, /* recurse */ for(i=0; ireadUInt32(p[i]); - ures_swapResource(ds, inBundle, outBundle, item, NULL, pTempTable, pErrorCode); + ures_swapResource(ds, inBundle, outBundle, item, nullptr, pTempTable, pErrorCode); if(U_FAILURE(*pErrorCode)) { udata_printError(ds, "ures_swapResource(array res=%08x)[%d].recurse(%08x) failed\n", res, i, item); @@ -1345,7 +1345,7 @@ ures_swap(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } @@ -1439,7 +1439,7 @@ ures_swap(const UDataSwapper *ds, tempTable.resFlags=stackResFlags; } else { tempTable.resFlags=(uint32_t *)uprv_malloc(resFlagsLength); - if(tempTable.resFlags==NULL) { + if(tempTable.resFlags==nullptr) { udata_printError(ds, "ures_swap(): unable to allocate memory for tracking resources\n"); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return 0; @@ -1476,7 +1476,7 @@ ures_swap(const UDataSwapper *ds, tempTable.resort=resort; } else { tempTable.rows=(Row *)uprv_malloc(maxTableLength*sizeof(Row)+maxTableLength*4); - if(tempTable.rows==NULL) { + if(tempTable.rows==nullptr) { udata_printError(ds, "ures_swap(): unable to allocate memory for sorting tables (max length: %d)\n", maxTableLength); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; @@ -1489,7 +1489,7 @@ ures_swap(const UDataSwapper *ds, } /* swap the resources */ - ures_swapResource(ds, inBundle, outBundle, rootRes, NULL, &tempTable, pErrorCode); + ures_swapResource(ds, inBundle, outBundle, rootRes, nullptr, &tempTable, pErrorCode); if(U_FAILURE(*pErrorCode)) { udata_printError(ds, "ures_swapResource(root res=%08x) failed\n", rootRes); diff --git a/icu4c/source/common/usc_impl.cpp b/icu4c/source/common/usc_impl.cpp index a4e2fc6069a..7f15d84890a 100644 --- a/icu4c/source/common/usc_impl.cpp +++ b/icu4c/source/common/usc_impl.cpp @@ -191,17 +191,17 @@ sameScript(UScriptCode scriptOne, UScriptCode scriptTwo) U_CAPI UScriptRun * U_EXPORT2 uscript_openRun(const UChar *src, int32_t length, UErrorCode *pErrorCode) { - UScriptRun *result = NULL; + UScriptRun *result = nullptr; - if (pErrorCode == NULL || U_FAILURE(*pErrorCode)) { - return NULL; + if (pErrorCode == nullptr || U_FAILURE(*pErrorCode)) { + return nullptr; } result = (UScriptRun *)uprv_malloc(sizeof (UScriptRun)); - if (result == NULL) { + if (result == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uscript_setRunText(result, src, length, pErrorCode); @@ -209,7 +209,7 @@ uscript_openRun(const UChar *src, int32_t length, UErrorCode *pErrorCode) /* Release the UScriptRun if uscript_setRunText() returns an error */ if (U_FAILURE(*pErrorCode)) { uprv_free(result); - result = NULL; + result = nullptr; } return result; @@ -218,7 +218,7 @@ uscript_openRun(const UChar *src, int32_t length, UErrorCode *pErrorCode) U_CAPI void U_EXPORT2 uscript_closeRun(UScriptRun *scriptRun) { - if (scriptRun != NULL) { + if (scriptRun != nullptr) { uprv_free(scriptRun); } } @@ -226,7 +226,7 @@ uscript_closeRun(UScriptRun *scriptRun) U_CAPI void U_EXPORT2 uscript_resetRun(UScriptRun *scriptRun) { - if (scriptRun != NULL) { + if (scriptRun != nullptr) { scriptRun->scriptStart = 0; scriptRun->scriptLimit = 0; scriptRun->scriptCode = USCRIPT_INVALID_CODE; @@ -239,11 +239,11 @@ uscript_resetRun(UScriptRun *scriptRun) U_CAPI void U_EXPORT2 uscript_setRunText(UScriptRun *scriptRun, const UChar *src, int32_t length, UErrorCode *pErrorCode) { - if (pErrorCode == NULL || U_FAILURE(*pErrorCode)) { + if (pErrorCode == nullptr || U_FAILURE(*pErrorCode)) { return; } - if (scriptRun == NULL || length < 0 || ((src == NULL) != (length == 0))) { + if (scriptRun == nullptr || length < 0 || ((src == nullptr) != (length == 0))) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -260,7 +260,7 @@ uscript_nextRun(UScriptRun *scriptRun, int32_t *pRunStart, int32_t *pRunLimit, U UErrorCode error = U_ZERO_ERROR; /* if we've fallen off the end of the text, we're done */ - if (scriptRun == NULL || scriptRun->scriptLimit >= scriptRun->textLength) { + if (scriptRun == nullptr || scriptRun->scriptLimit >= scriptRun->textLength) { return false; } @@ -345,15 +345,15 @@ uscript_nextRun(UScriptRun *scriptRun, int32_t *pRunStart, int32_t *pRunLimit, U } - if (pRunStart != NULL) { + if (pRunStart != nullptr) { *pRunStart = scriptRun->scriptStart; } - if (pRunLimit != NULL) { + if (pRunLimit != nullptr) { *pRunLimit = scriptRun->scriptLimit; } - if (pRunScript != NULL) { + if (pRunScript != nullptr) { *pRunScript = scriptRun->scriptCode; } diff --git a/icu4c/source/common/uscript.cpp b/icu4c/source/common/uscript.cpp index 1ededbb268a..055d41ea91a 100644 --- a/icu4c/source/common/uscript.cpp +++ b/icu4c/source/common/uscript.cpp @@ -107,14 +107,14 @@ uscript_getCode(const char* nameOrAbbrOrLocale, if(U_FAILURE(*err)) { return 0; } - if(nameOrAbbrOrLocale==NULL || - (fillIn == NULL ? capacity != 0 : capacity < 0)) { + if(nameOrAbbrOrLocale==nullptr || + (fillIn == nullptr ? capacity != 0 : capacity < 0)) { *err = U_ILLEGAL_ARGUMENT_ERROR; return 0; } triedCode = false; - if(uprv_strchr(nameOrAbbrOrLocale, '-')==NULL && uprv_strchr(nameOrAbbrOrLocale, '_')==NULL ){ + if(uprv_strchr(nameOrAbbrOrLocale, '-')==nullptr && uprv_strchr(nameOrAbbrOrLocale, '_')==nullptr ){ /* try long and abbreviated script names first */ UScriptCode code = (UScriptCode) u_getPropertyValueEnum(UCHAR_SCRIPT, nameOrAbbrOrLocale); if(code!=USCRIPT_INVALID_CODE) { diff --git a/icu4c/source/common/uscript_props.cpp b/icu4c/source/common/uscript_props.cpp index 886acfafa88..d4ff95b2189 100644 --- a/icu4c/source/common/uscript_props.cpp +++ b/icu4c/source/common/uscript_props.cpp @@ -260,7 +260,7 @@ int32_t getScriptProps(UScriptCode script) { U_CAPI int32_t U_EXPORT2 uscript_getSampleString(UScriptCode script, UChar *dest, int32_t capacity, UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { return 0; } - if(capacity < 0 || (capacity > 0 && dest == NULL)) { + if(capacity < 0 || (capacity > 0 && dest == nullptr)) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } diff --git a/icu4c/source/common/uset.cpp b/icu4c/source/common/uset.cpp index 2152693560b..f90a391b8ac 100644 --- a/icu4c/source/common/uset.cpp +++ b/icu4c/source/common/uset.cpp @@ -372,7 +372,7 @@ uset_getItem(const USet* uset, int32_t itemIndex, */ U_CAPI int32_t U_EXPORT2 uset_serialize(const USet* set, uint16_t* dest, int32_t destCapacity, UErrorCode* ec) { - if (ec==NULL || U_FAILURE(*ec)) { + if (ec==nullptr || U_FAILURE(*ec)) { return 0; } @@ -383,10 +383,10 @@ U_CAPI UBool U_EXPORT2 uset_getSerializedSet(USerializedSet* fillSet, const uint16_t* src, int32_t srcLength) { int32_t length; - if(fillSet==NULL) { + if(fillSet==nullptr) { return false; } - if(src==NULL || srcLength<=0) { + if(src==nullptr || srcLength<=0) { fillSet->length=fillSet->bmpLength=0; return false; } @@ -415,7 +415,7 @@ uset_getSerializedSet(USerializedSet* fillSet, const uint16_t* src, int32_t srcL U_CAPI void U_EXPORT2 uset_setSerializedToOne(USerializedSet* fillSet, UChar32 c) { - if(fillSet==NULL || (uint32_t)c>0x10ffff) { + if(fillSet==nullptr || (uint32_t)c>0x10ffff) { return; } @@ -450,7 +450,7 @@ U_CAPI UBool U_EXPORT2 uset_serializedContains(const USerializedSet* set, UChar32 c) { const uint16_t* array; - if(set==NULL || (uint32_t)c>0x10ffff) { + if(set==nullptr || (uint32_t)c>0x10ffff) { return false; } @@ -506,7 +506,7 @@ uset_serializedContains(const USerializedSet* set, UChar32 c) { U_CAPI int32_t U_EXPORT2 uset_getSerializedRangeCount(const USerializedSet* set) { - if(set==NULL) { + if(set==nullptr) { return 0; } @@ -519,7 +519,7 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex, const uint16_t* array; int32_t bmpLength, length; - if(set==NULL || rangeIndex<0 || pStart==NULL || pEnd==NULL) { + if(set==nullptr || rangeIndex<0 || pStart==nullptr || pEnd==nullptr) { return false; } @@ -590,7 +590,7 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex, // addRemove(USet* set, UChar32 c, int32_t doRemove) { // int32_t i, length, more; // -// if(set==NULL || (uint32_t)c>0x10ffff) { +// if(set==nullptr || (uint32_t)c>0x10ffff) { // return false; // } // @@ -646,7 +646,7 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex, // /* reallocate */ // int32_t newCapacity=set->capacity+set->capacity/2+USET_GROW_DELTA; // UChar32* newArray=(UChar32* )uprv_malloc(newCapacity*4); -// if(newArray==NULL) { +// if(newArray==nullptr) { // return false; // } // set->capacity=newCapacity; diff --git a/icu4c/source/common/uset_props.cpp b/icu4c/source/common/uset_props.cpp index f08e760b10d..3b00e24f6c3 100644 --- a/icu4c/source/common/uset_props.cpp +++ b/icu4c/source/common/uset_props.cpp @@ -35,7 +35,7 @@ uset_openPattern(const UChar* pattern, int32_t patternLength, { UnicodeString pat(patternLength==-1, pattern, patternLength); UnicodeSet* set = new UnicodeSet(pat, *ec); - /* test for NULL */ + /* test for nullptr */ if(set == 0) { *ec = U_MEMORY_ALLOCATION_ERROR; return 0; @@ -43,7 +43,7 @@ uset_openPattern(const UChar* pattern, int32_t patternLength, if (U_FAILURE(*ec)) { delete set; - set = NULL; + set = nullptr; } return (USet*) set; } @@ -54,8 +54,8 @@ uset_openPatternOptions(const UChar* pattern, int32_t patternLength, UErrorCode* ec) { UnicodeString pat(patternLength==-1, pattern, patternLength); - UnicodeSet* set = new UnicodeSet(pat, options, NULL, *ec); - /* test for NULL */ + UnicodeSet* set = new UnicodeSet(pat, options, nullptr, *ec); + /* test for nullptr */ if(set == 0) { *ec = U_MEMORY_ALLOCATION_ERROR; return 0; @@ -63,7 +63,7 @@ uset_openPatternOptions(const UChar* pattern, int32_t patternLength, if (U_FAILURE(*ec)) { delete set; - set = NULL; + set = nullptr; } return (USet*) set; } @@ -77,14 +77,14 @@ uset_applyPattern(USet *set, // status code needs to be checked since we // dereference it - if(status == NULL || U_FAILURE(*status)){ + if(status == nullptr || U_FAILURE(*status)){ return 0; } // check only the set paramenter - // if pattern is NULL or null terminate + // if pattern is nullptr or NUL terminated // UnicodeString constructor takes care of it - if(set == NULL){ + if(set == nullptr){ *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -93,7 +93,7 @@ uset_applyPattern(USet *set, ParsePosition pos; - ((UnicodeSet*) set)->applyPattern(pat, pos, options, NULL, *status); + ((UnicodeSet*) set)->applyPattern(pat, pos, options, nullptr, *status); return pos.getIndex(); } diff --git a/icu4c/source/common/usetiter.cpp b/icu4c/source/common/usetiter.cpp index 3cdece5500b..d24a15ab2df 100644 --- a/icu4c/source/common/usetiter.cpp +++ b/icu4c/source/common/usetiter.cpp @@ -20,7 +20,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UnicodeSetIterator) * @param set set to iterate over */ UnicodeSetIterator::UnicodeSetIterator(const UnicodeSet& uSet) { - cpString = NULL; + cpString = nullptr; reset(uSet); } @@ -28,8 +28,8 @@ UnicodeSetIterator::UnicodeSetIterator(const UnicodeSet& uSet) { * Create an iterator. Convenience for when the contents are to be set later. */ UnicodeSetIterator::UnicodeSetIterator() { - this->set = NULL; - cpString = NULL; + this->set = nullptr; + cpString = nullptr; reset(); } @@ -49,13 +49,13 @@ UnicodeSetIterator::~UnicodeSetIterator() { UBool UnicodeSetIterator::next() { if (nextElement <= endElement) { codepoint = codepointEnd = nextElement++; - string = NULL; + string = nullptr; return true; } if (range < endRange) { loadRange(++range); codepoint = codepointEnd = nextElement++; - string = NULL; + string = nullptr; return true; } @@ -77,7 +77,7 @@ UBool UnicodeSetIterator::next() { *
Note also that the codepointEnd is undefined after calling this method. */ UBool UnicodeSetIterator::nextRange() { - string = NULL; + string = nullptr; if (nextElement <= endElement) { codepointEnd = endElement; codepoint = nextElement; @@ -110,7 +110,7 @@ void UnicodeSetIterator::reset(const UnicodeSet& uSet) { * Resets to the start, to allow the iteration to start over again. */ void UnicodeSetIterator::reset() { - if (set == NULL) { + if (set == nullptr) { // Set up indices to empty iteration endRange = -1; stringCount = 0; @@ -125,7 +125,7 @@ void UnicodeSetIterator::reset() { loadRange(range); } nextString = 0; - string = NULL; + string = nullptr; } void UnicodeSetIterator::loadRange(int32_t iRange) { @@ -135,11 +135,11 @@ void UnicodeSetIterator::loadRange(int32_t iRange) { const UnicodeString& UnicodeSetIterator::getString() { - if (string==NULL && codepoint!=(UChar32)IS_STRING) { - if (cpString == NULL) { + if (string==nullptr && codepoint!=(UChar32)IS_STRING) { + if (cpString == nullptr) { cpString = new UnicodeString(); } - if (cpString != NULL) { + if (cpString != nullptr) { cpString->setTo((UChar32)codepoint); } string = cpString; diff --git a/icu4c/source/common/ushape.cpp b/icu4c/source/common/ushape.cpp index babbbe52a83..894dc983c3f 100644 --- a/icu4c/source/common/ushape.cpp +++ b/icu4c/source/common/ushape.cpp @@ -732,7 +732,7 @@ handleGeneratedSpaces(UChar *dest, int32_t sourceLength, int32_t i = 0, j = 0; int32_t count = 0; - UChar *tempbuffer=NULL; + UChar *tempbuffer=nullptr; int lamAlefOption = 0; int tashkeelOption = 0; @@ -748,8 +748,8 @@ handleGeneratedSpaces(UChar *dest, int32_t sourceLength, } tempbuffer = (UChar *)uprv_malloc((sourceLength+1)*U_SIZEOF_UCHAR); - /* Test for NULL */ - if(tempbuffer == NULL) { + /* Test for nullptr */ + if(tempbuffer == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -903,12 +903,12 @@ static int32_t expandCompositCharAtBegin(UChar *dest, int32_t sourceLength, int32_t destSize,UErrorCode *pErrorCode) { int32_t i = 0,j = 0; int32_t countl = 0; - UChar *tempbuffer=NULL; + UChar *tempbuffer=nullptr; tempbuffer = (UChar *)uprv_malloc((sourceLength+1)*U_SIZEOF_UCHAR); - /* Test for NULL */ - if(tempbuffer == NULL) { + /* Test for nullptr */ + if(tempbuffer == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -966,11 +966,11 @@ expandCompositCharAtEnd(UChar *dest, int32_t sourceLength, int32_t destSize,UErr int32_t countr = 0; int32_t inpsize = sourceLength; - UChar *tempbuffer=NULL; + UChar *tempbuffer=nullptr; tempbuffer = (UChar *)uprv_malloc((sourceLength+1)*U_SIZEOF_UCHAR); - /* Test for NULL */ - if(tempbuffer == NULL) { + /* Test for nullptr */ + if(tempbuffer == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1086,7 +1086,7 @@ expandCompositChar(UChar *dest, int32_t sourceLength, int32_t i = 0,j = 0; - UChar *tempbuffer=NULL; + UChar *tempbuffer=nullptr; int yehHamzaOption = 0; int seenTailOption = 0; int lamAlefOption = 0; @@ -1156,8 +1156,8 @@ expandCompositChar(UChar *dest, int32_t sourceLength, destSize = calculateSize(dest,sourceLength,destSize,options); tempbuffer = (UChar *)uprv_malloc((destSize+1)*U_SIZEOF_UCHAR); - /* Test for NULL */ - if(tempbuffer == NULL) { + /* Test for nullptr */ + if(tempbuffer == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1427,12 +1427,12 @@ u_shapeArabic(const UChar *source, int32_t sourceLength, struct uShapeVariables shapeVars = { OLD_TAIL_CHAR,U_SHAPE_LAMALEF_BEGIN,U_SHAPE_LAMALEF_END,U_SHAPE_TASHKEEL_BEGIN,U_SHAPE_TASHKEEL_END,0}; /* usual error checking */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - /* make sure that no reserved options values are used; allow dest==NULL only for preflighting */ - if( source==NULL || sourceLength<-1 || (dest==NULL && destCapacity!=0) || destCapacity<0 || + /* make sure that no reserved options values are used; allow dest==nullptr only for preflighting */ + if( source==nullptr || sourceLength<-1 || (dest==nullptr && destCapacity!=0) || destCapacity<0 || (((options&U_SHAPE_TASHKEEL_MASK) > 0) && ((options&U_SHAPE_LETTERS_SHAPE_TASHKEEL_ISOLATED) == U_SHAPE_LETTERS_SHAPE_TASHKEEL_ISOLATED) ) || (((options&U_SHAPE_TASHKEEL_MASK) > 0) && @@ -1478,7 +1478,7 @@ u_shapeArabic(const UChar *source, int32_t sourceLength, } /* check that source and destination do not overlap */ - if( dest!=NULL && + if( dest!=nullptr && ((source<=dest && dest0) { @@ -1511,7 +1511,7 @@ u_shapeArabic(const UChar *source, int32_t sourceLength, UChar prevLink, currLink = 0; int newSourceLength = 0; tempsource = (UChar *)uprv_malloc(2*sourceLength*U_SIZEOF_UCHAR); - if(tempsource == NULL) { + if(tempsource == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1545,7 +1545,7 @@ u_shapeArabic(const UChar *source, int32_t sourceLength, if(outputSize>destCapacity) { *pErrorCode=U_BUFFER_OVERFLOW_ERROR; - if (tempsource != NULL) uprv_free(tempsource); + if (tempsource != nullptr) uprv_free(tempsource); return outputSize; } @@ -1564,15 +1564,15 @@ u_shapeArabic(const UChar *source, int32_t sourceLength, } else { tempbuffer = (UChar *)uprv_malloc(outputSize*U_SIZEOF_UCHAR); - /*Test for NULL*/ - if(tempbuffer == NULL) { + /*Test for nullptr*/ + if(tempbuffer == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - if (tempsource != NULL) uprv_free(tempsource); + if (tempsource != nullptr) uprv_free(tempsource); return 0; } } u_memcpy(tempbuffer, source, sourceLength); - if (tempsource != NULL){ + if (tempsource != nullptr){ uprv_free(tempsource); } diff --git a/icu4c/source/common/usprep.cpp b/icu4c/source/common/usprep.cpp index 8175dc7fa82..da1d2861e20 100644 --- a/icu4c/source/common/usprep.cpp +++ b/icu4c/source/common/usprep.cpp @@ -44,7 +44,7 @@ U_CDECL_BEGIN /* Static cache for already opened StringPrep profiles */ -static UHashtable *SHARED_DATA_HASHTABLE = NULL; +static UHashtable *SHARED_DATA_HASHTABLE = nullptr; static icu::UInitOnce gSharedDataInitOnce {}; static UMutex usprepMutex; @@ -137,8 +137,8 @@ usprep_unload(UStringPrepProfile* data){ static int32_t usprep_internal_flushCache(UBool noRefCount){ - UStringPrepProfile *profile = NULL; - UStringPrepKey *key = NULL; + UStringPrepProfile *profile = nullptr; + UStringPrepKey *key = nullptr; int32_t pos = UHASH_FIRST; int32_t deletedNum = 0; const UHashElement *e; @@ -148,13 +148,13 @@ usprep_internal_flushCache(UBool noRefCount){ * return 0 */ umtx_lock(&usprepMutex); - if (SHARED_DATA_HASHTABLE == NULL) { + if (SHARED_DATA_HASHTABLE == nullptr) { umtx_unlock(&usprepMutex); return 0; } /*creates an enumeration to iterate through every element in the table */ - while ((e = uhash_nextElement(SHARED_DATA_HASHTABLE, &pos)) != NULL) + while ((e = uhash_nextElement(SHARED_DATA_HASHTABLE, &pos)) != nullptr) { profile = (UStringPrepProfile *) e->value.pointer; key = (UStringPrepKey *) e->key.pointer; @@ -167,13 +167,13 @@ usprep_internal_flushCache(UBool noRefCount){ /* unload the data */ usprep_unload(profile); - if(key->name != NULL) { + if(key->name != nullptr) { uprv_free(key->name); - key->name=NULL; + key->name=nullptr; } - if(key->path != NULL) { + if(key->path != nullptr) { uprv_free(key->path); - key->path=NULL; + key->path=nullptr; } uprv_free(profile); uprv_free(key); @@ -193,15 +193,15 @@ usprep_flushCache(){ */ static UBool U_CALLCONV usprep_cleanup(void){ - if (SHARED_DATA_HASHTABLE != NULL) { + if (SHARED_DATA_HASHTABLE != nullptr) { usprep_internal_flushCache(true); - if (SHARED_DATA_HASHTABLE != NULL && uhash_count(SHARED_DATA_HASHTABLE) == 0) { + if (SHARED_DATA_HASHTABLE != nullptr && uhash_count(SHARED_DATA_HASHTABLE) == 0) { uhash_close(SHARED_DATA_HASHTABLE); - SHARED_DATA_HASHTABLE = NULL; + SHARED_DATA_HASHTABLE = nullptr; } } gSharedDataInitOnce.reset(); - return (SHARED_DATA_HASHTABLE == NULL); + return (SHARED_DATA_HASHTABLE == nullptr); } U_CDECL_END @@ -209,9 +209,9 @@ U_CDECL_END /** Initializes the cache for resources */ static void U_CALLCONV createCache(UErrorCode &status) { - SHARED_DATA_HASHTABLE = uhash_open(hashEntry, compareEntries, NULL, &status); + SHARED_DATA_HASHTABLE = uhash_open(hashEntry, compareEntries, nullptr, &status); if (U_FAILURE(status)) { - SHARED_DATA_HASHTABLE = NULL; + SHARED_DATA_HASHTABLE = nullptr; } ucln_common_registerCleanup(UCLN_COMMON_USPREP, usprep_cleanup); } @@ -230,18 +230,18 @@ loadData(UStringPrepProfile* profile, /* load Unicode SPREP data from file */ UTrie _sprepTrie={ 0,0,0,0,0,0,0 }; UDataMemory *dataMemory; - const int32_t *p=NULL; + const int32_t *p=nullptr; const uint8_t *pb; UVersionInfo normUnicodeVersion; int32_t normUniVer, sprepUniVer, normCorrVer; - if(errorCode==NULL || U_FAILURE(*errorCode)) { + if(errorCode==nullptr || U_FAILURE(*errorCode)) { return 0; } /* open the data outside the mutex block */ //TODO: change the path - dataMemory=udata_openChoice(path, type, name, isSPrepAcceptable, NULL, errorCode); + dataMemory=udata_openChoice(path, type, name, isSPrepAcceptable, nullptr, errorCode); if(U_FAILURE(*errorCode)) { return false; } @@ -259,9 +259,9 @@ loadData(UStringPrepProfile* profile, /* in the mutex block, set the data for this process */ umtx_lock(&usprepMutex); - if(profile->sprepData==NULL) { + if(profile->sprepData==nullptr) { profile->sprepData=dataMemory; - dataMemory=NULL; + dataMemory=nullptr; uprv_memcpy(&profile->indexes, p, sizeof(profile->indexes)); uprv_memcpy(&profile->sprepTrie, &_sprepTrie, sizeof(UTrie)); } else { @@ -293,8 +293,8 @@ loadData(UStringPrepProfile* profile, profile->isDataLoaded = true; /* if a different thread set it first, then close the extra data */ - if(dataMemory!=NULL) { - udata_close(dataMemory); /* NULL if it was set correctly */ + if(dataMemory!=nullptr) { + udata_close(dataMemory); /* nullptr if it was set correctly */ } @@ -306,12 +306,12 @@ usprep_getProfile(const char* path, const char* name, UErrorCode *status){ - UStringPrepProfile* profile = NULL; + UStringPrepProfile* profile = nullptr; initCache(status); if(U_FAILURE(*status)){ - return NULL; + return nullptr; } UStringPrepKey stackKey; @@ -326,22 +326,22 @@ usprep_getProfile(const char* path, /* fetch the data from the cache */ umtx_lock(&usprepMutex); profile = (UStringPrepProfile*) (uhash_get(SHARED_DATA_HASHTABLE,&stackKey)); - if(profile != NULL) { + if(profile != nullptr) { profile->refCount++; } umtx_unlock(&usprepMutex); - if(profile == NULL) { + if(profile == nullptr) { /* else load the data and put the data in the cache */ LocalMemory newProfile; - if(newProfile.allocateInsteadAndReset() == NULL) { + if(newProfile.allocateInsteadAndReset() == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } /* load the data */ if(!loadData(newProfile.getAlias(), path, name, _SPREP_DATA_TYPE, status) || U_FAILURE(*status) ){ - return NULL; + return nullptr; } /* get the options */ @@ -351,20 +351,20 @@ usprep_getProfile(const char* path, LocalMemory key; LocalMemory keyName; LocalMemory keyPath; - if( key.allocateInsteadAndReset() == NULL || - keyName.allocateInsteadAndCopy(static_cast(uprv_strlen(name)+1)) == NULL || - (path != NULL && - keyPath.allocateInsteadAndCopy(static_cast(uprv_strlen(path)+1)) == NULL) + if( key.allocateInsteadAndReset() == nullptr || + keyName.allocateInsteadAndCopy(static_cast(uprv_strlen(name)+1)) == nullptr || + (path != nullptr && + keyPath.allocateInsteadAndCopy(static_cast(uprv_strlen(path)+1)) == nullptr) ) { *status = U_MEMORY_ALLOCATION_ERROR; usprep_unload(newProfile.getAlias()); - return NULL; + return nullptr; } umtx_lock(&usprepMutex); // If another thread already inserted the same key/value, refcount and cleanup our thread data profile = (UStringPrepProfile*) (uhash_get(SHARED_DATA_HASHTABLE,&stackKey)); - if(profile != NULL) { + if(profile != nullptr) { profile->refCount++; usprep_unload(newProfile.getAlias()); } @@ -372,7 +372,7 @@ usprep_getProfile(const char* path, /* initialize the key members */ key->name = keyName.orphan(); uprv_strcpy(key->name, name); - if(path != NULL){ + if(path != nullptr){ key->path = keyPath.orphan(); uprv_strcpy(key->path, path); } @@ -393,8 +393,8 @@ usprep_open(const char* path, const char* name, UErrorCode* status){ - if(status == NULL || U_FAILURE(*status)){ - return NULL; + if(status == nullptr || U_FAILURE(*status)){ + return nullptr; } /* initialize the profile struct members */ @@ -404,20 +404,20 @@ usprep_open(const char* path, U_CAPI UStringPrepProfile* U_EXPORT2 usprep_openByType(UStringPrepProfileType type, UErrorCode* status) { - if(status == NULL || U_FAILURE(*status)){ - return NULL; + if(status == nullptr || U_FAILURE(*status)){ + return nullptr; } int32_t index = (int32_t)type; if (index < 0 || index >= UPRV_LENGTHOF(PROFILE_NAMES)) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - return usprep_open(NULL, PROFILE_NAMES[index], status); + return usprep_open(nullptr, PROFILE_NAMES[index], status); } U_CAPI void U_EXPORT2 usprep_close(UStringPrepProfile* profile){ - if(profile==NULL){ + if(profile==nullptr){ return; } @@ -435,7 +435,7 @@ uprv_syntaxError(const UChar* rules, int32_t pos, int32_t rulesLen, UParseError* parseError){ - if(parseError == NULL){ + if(parseError == nullptr){ return; } parseError->offset = pos; @@ -649,9 +649,9 @@ usprep_prepare( const UStringPrepProfile* profile, } //check arguments - if(profile==NULL || - (src==NULL ? srcLength!=0 : srcLength<-1) || - (dest==NULL ? destCapacity!=0 : destCapacity<0)) { + if(profile==nullptr || + (src==nullptr ? srcLength!=0 : srcLength<-1) || + (dest==nullptr ? destCapacity!=0 : destCapacity<0)) { *status=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -663,7 +663,7 @@ usprep_prepare( const UStringPrepProfile* profile, // map UnicodeString s1; UChar *b1 = s1.getBuffer(srcLength); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -675,7 +675,7 @@ usprep_prepare( const UStringPrepProfile* profile, // redo processing of string /* we do not have enough room so grow the buffer*/ b1 = s1.getBuffer(b1Len); - if(b1==NULL){ + if(b1==nullptr){ *status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -787,7 +787,7 @@ usprep_swap(const UDataSwapper *ds, /* udata_swapDataHeader checks the arguments */ headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode); - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } diff --git a/icu4c/source/common/ustr_cnv.cpp b/icu4c/source/common/ustr_cnv.cpp index 97fbc527a37..3dafd8d6423 100644 --- a/icu4c/source/common/ustr_cnv.cpp +++ b/icu4c/source/common/ustr_cnv.cpp @@ -32,30 +32,30 @@ /* mutexed access to a shared default converter ----------------------------- */ -static UConverter *gDefaultConverter = NULL; +static UConverter *gDefaultConverter = nullptr; U_CAPI UConverter* U_EXPORT2 u_getDefaultConverter(UErrorCode *status) { - UConverter *converter = NULL; + UConverter *converter = nullptr; - if (gDefaultConverter != NULL) { - icu::umtx_lock(NULL); + if (gDefaultConverter != nullptr) { + icu::umtx_lock(nullptr); /* need to check to make sure it wasn't taken out from under us */ - if (gDefaultConverter != NULL) { + if (gDefaultConverter != nullptr) { converter = gDefaultConverter; - gDefaultConverter = NULL; + gDefaultConverter = nullptr; } - icu::umtx_unlock(NULL); + icu::umtx_unlock(nullptr); } /* if the cache was empty, create a converter */ - if(converter == NULL) { - converter = ucnv_open(NULL, status); + if(converter == nullptr) { + converter = ucnv_open(nullptr, status); if(U_FAILURE(*status)) { ucnv_close(converter); - converter = NULL; + converter = nullptr; } } @@ -65,20 +65,20 @@ u_getDefaultConverter(UErrorCode *status) U_CAPI void U_EXPORT2 u_releaseDefaultConverter(UConverter *converter) { - if(gDefaultConverter == NULL) { - if (converter != NULL) { + if(gDefaultConverter == nullptr) { + if (converter != nullptr) { ucnv_reset(converter); } ucnv_enableCleanup(); - icu::umtx_lock(NULL); - if(gDefaultConverter == NULL) { + icu::umtx_lock(nullptr); + if(gDefaultConverter == nullptr) { gDefaultConverter = converter; - converter = NULL; + converter = nullptr; } - icu::umtx_unlock(NULL); + icu::umtx_unlock(nullptr); } - if(converter != NULL) { + if(converter != nullptr) { ucnv_close(converter); } } @@ -86,21 +86,21 @@ u_releaseDefaultConverter(UConverter *converter) U_CAPI void U_EXPORT2 u_flushDefaultConverter() { - UConverter *converter = NULL; + UConverter *converter = nullptr; - if (gDefaultConverter != NULL) { - icu::umtx_lock(NULL); + if (gDefaultConverter != nullptr) { + icu::umtx_lock(nullptr); /* need to check to make sure it wasn't taken out from under us */ - if (gDefaultConverter != NULL) { + if (gDefaultConverter != nullptr) { converter = gDefaultConverter; - gDefaultConverter = NULL; + gDefaultConverter = nullptr; } - icu::umtx_unlock(NULL); + icu::umtx_unlock(nullptr); } /* if the cache was populated, flush it */ - if(converter != NULL) { + if(converter != nullptr) { ucnv_close(converter); } } @@ -136,14 +136,14 @@ u_uastrncpy(UChar *ucs1, UChar *target = ucs1; UErrorCode err = U_ZERO_ERROR; UConverter *cnv = u_getDefaultConverter(&err); - if(U_SUCCESS(err) && cnv != NULL) { + if(U_SUCCESS(err) && cnv != nullptr) { ucnv_reset(cnv); ucnv_toUnicode(cnv, &target, ucs1+n, &s2, s2+u_astrnlen(s2, n), - NULL, + nullptr, true, &err); ucnv_reset(cnv); /* be good citizens */ @@ -166,7 +166,7 @@ u_uastrcpy(UChar *ucs1, { UErrorCode err = U_ZERO_ERROR; UConverter *cnv = u_getDefaultConverter(&err); - if(U_SUCCESS(err) && cnv != NULL) { + if(U_SUCCESS(err) && cnv != nullptr) { ucnv_toUChars(cnv, ucs1, MAX_STRLEN, @@ -208,14 +208,14 @@ u_austrncpy(char *s1, char *target = s1; UErrorCode err = U_ZERO_ERROR; UConverter *cnv = u_getDefaultConverter(&err); - if(U_SUCCESS(err) && cnv != NULL) { + if(U_SUCCESS(err) && cnv != nullptr) { ucnv_reset(cnv); ucnv_fromUnicode(cnv, &target, s1+n, &ucs2, ucs2+u_ustrnlen(ucs2, n), - NULL, + nullptr, true, &err); ucnv_reset(cnv); /* be good citizens */ @@ -238,7 +238,7 @@ u_austrcpy(char *s1, { UErrorCode err = U_ZERO_ERROR; UConverter *cnv = u_getDefaultConverter(&err); - if(U_SUCCESS(err) && cnv != NULL) { + if(U_SUCCESS(err) && cnv != nullptr) { int32_t len = ucnv_fromUChars(cnv, s1, MAX_STRLEN, diff --git a/icu4c/source/common/ustr_titlecase_brkiter.cpp b/icu4c/source/common/ustr_titlecase_brkiter.cpp index 85dfa0decb4..d6722bfaa30 100644 --- a/icu4c/source/common/ustr_titlecase_brkiter.cpp +++ b/icu4c/source/common/ustr_titlecase_brkiter.cpp @@ -170,7 +170,7 @@ int32_t CaseMap::toTitle( UErrorCode &errorCode) { LocalPointer ownedIter; iter = ustrcase_getTitleBreakIterator(nullptr, locale, options, iter, ownedIter, errorCode); - if(iter==NULL) { + if(iter==nullptr) { return 0; } UnicodeString s(srcLength<0, src, srcLength); @@ -216,7 +216,7 @@ ucasemap_toTitle(UCaseMap *csm, if (U_FAILURE(*pErrorCode)) { return 0; } - if (csm->iter == NULL) { + if (csm->iter == nullptr) { LocalPointer ownedIter; BreakIterator *iter = ustrcase_getTitleBreakIterator( nullptr, csm->locale, csm->options, nullptr, ownedIter, *pErrorCode); @@ -231,7 +231,7 @@ ucasemap_toTitle(UCaseMap *csm, csm->caseLocale, csm->options, csm->iter, dest, destCapacity, src, srcLength, - ustrcase_internalToTitle, NULL, *pErrorCode); + ustrcase_internalToTitle, nullptr, *pErrorCode); } #endif // !UCONFIG_NO_BREAK_ITERATION diff --git a/icu4c/source/common/ustr_wcs.cpp b/icu4c/source/common/ustr_wcs.cpp index 1a6ea2375d0..d298615d414 100644 --- a/icu4c/source/common/ustr_wcs.cpp +++ b/icu4c/source/common/ustr_wcs.cpp @@ -42,7 +42,7 @@ u_growAnyBufferFromStatic(void *context, // Use char* not void* to avoid the compiler's strict-aliasing assumptions // and related warnings. char *newBuffer=(char *)uprv_malloc(reqCapacity*size); - if(newBuffer!=NULL) { + if(newBuffer!=nullptr) { if(length>0) { uprv_memcpy(newBuffer, *pBuffer, (size_t)length*size); } @@ -57,7 +57,7 @@ u_growAnyBufferFromStatic(void *context, } *pBuffer=newBuffer; - return (UBool)(newBuffer!=NULL); + return (UBool)(newBuffer!=nullptr); } /* helper function */ @@ -73,19 +73,19 @@ _strToWCS(wchar_t *dest, char* tempBuf = stackBuffer; int32_t tempBufCapacity = _STACK_BUFFER_CAPACITY; char* tempBufLimit = stackBuffer + tempBufCapacity; - UConverter* conv = NULL; + UConverter* conv = nullptr; char* saveBuf = tempBuf; - wchar_t* intTarget=NULL; + wchar_t* intTarget=nullptr; int32_t intTargetCapacity=0; int count=0,retVal=0; - const UChar *pSrcLimit =NULL; + const UChar *pSrcLimit =nullptr; const UChar *pSrc = src; conv = u_getDefaultConverter(pErrorCode); if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } if(srcLength == -1){ @@ -99,7 +99,7 @@ _strToWCS(wchar_t *dest, *pErrorCode = U_ZERO_ERROR; /* convert to chars using default converter */ - ucnv_fromUnicode(conv,&tempBuf,tempBufLimit,&pSrc,pSrcLimit,NULL,(UBool)(pSrc==pSrcLimit),pErrorCode); + ucnv_fromUnicode(conv,&tempBuf,tempBufLimit,&pSrc,pSrcLimit,nullptr,(UBool)(pSrc==pSrcLimit),pErrorCode); count =(tempBuf - saveBuf); /* This should rarely occur */ @@ -170,7 +170,7 @@ _strToWCS(wchar_t *dest, break; }else if(retVal== remaining){/* should never occur */ int numWritten = (pIntTarget-intTarget); - u_growAnyBufferFromStatic(NULL,(void**) &intTarget, + u_growAnyBufferFromStatic(nullptr,(void**) &intTarget, &intTargetCapacity, intTargetCapacity * _BUFFER_CAPACITY_MULTIPLIER, numWritten, @@ -237,15 +237,15 @@ u_strToWCS(wchar_t *dest, UErrorCode *pErrorCode){ /* args check */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)){ - return NULL; + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)){ + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } #ifdef U_WCHAR_IS_UTF16 @@ -288,10 +288,10 @@ _strFromWCS( UChar *dest, UErrorCode *pErrorCode) { int32_t retVal =0, count =0 ; - UConverter* conv = NULL; - UChar* pTarget = NULL; - UChar* pTargetLimit = NULL; - UChar* target = NULL; + UConverter* conv = nullptr; + UChar* pTarget = nullptr; + UChar* pTargetLimit = nullptr; + UChar* target = nullptr; UChar uStack [_STACK_BUFFER_CAPACITY]; @@ -303,10 +303,10 @@ _strFromWCS( UChar *dest, int32_t cStackCap = _STACK_BUFFER_CAPACITY; char* pCSrc=cStack; char* pCSave=pCSrc; - char* pCSrcLimit=NULL; + char* pCSrcLimit=nullptr; const wchar_t* pSrc = src; - const wchar_t* pSrcLimit = NULL; + const wchar_t* pSrcLimit = nullptr; if(srcLength ==-1){ /* if the wchar_t source is null terminated we can safely @@ -390,7 +390,7 @@ _strFromWCS( UChar *dest, /* Should rarely occur */ /* allocate new buffer buffer */ pWStack =(wchar_t*) uprv_malloc(sizeof(wchar_t) * (nulLen + 1)); - if(pWStack==NULL){ + if(pWStack==nullptr){ *pErrorCode = U_MEMORY_ALLOCATION_ERROR; goto cleanup; } @@ -436,7 +436,7 @@ _strFromWCS( UChar *dest, conv= u_getDefaultConverter(pErrorCode); - if(U_FAILURE(*pErrorCode)|| conv==NULL){ + if(U_FAILURE(*pErrorCode)|| conv==nullptr){ goto cleanup; } @@ -445,7 +445,7 @@ _strFromWCS( UChar *dest, *pErrorCode = U_ZERO_ERROR; /* convert to stack buffer*/ - ucnv_toUnicode(conv,&pTarget,pTargetLimit,(const char**)&pCSrc,pCSrcLimit,NULL,(UBool)(pCSrc==pCSrcLimit),pErrorCode); + ucnv_toUnicode(conv,&pTarget,pTargetLimit,(const char**)&pCSrc,pCSrcLimit,nullptr,(UBool)(pCSrc==pCSrcLimit),pErrorCode); /* increment count to number written to stack */ count+= pTarget - target; @@ -492,15 +492,15 @@ u_strFromWCS(UChar *dest, { /* args check */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)){ - return NULL; + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)){ + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } #ifdef U_WCHAR_IS_UTF16 diff --git a/icu4c/source/common/ustrcase.cpp b/icu4c/source/common/ustrcase.cpp index 8037c09b4f0..272d416fb4d 100644 --- a/icu4c/source/common/ustrcase.cpp +++ b/icu4c/source/common/ustrcase.cpp @@ -51,7 +51,7 @@ int32_t checkOverflowAndEditsError(int32_t destIndex, int32_t destCapacity, if (U_SUCCESS(errorCode)) { if (destIndex > destCapacity) { errorCode = U_BUFFER_OVERFLOW_ERROR; - } else if (edits != NULL) { + } else if (edits != nullptr) { edits->copyErrorTo(errorCode); } } @@ -69,7 +69,7 @@ appendResult(UChar *dest, int32_t destIndex, int32_t destCapacity, /* decode the result */ if(result<0) { /* (not) original code point */ - if(edits!=NULL) { + if(edits!=nullptr) { edits->addUnchanged(cpLength); } if(options & U_OMIT_UNCHANGED_TEXT) { @@ -87,7 +87,7 @@ appendResult(UChar *dest, int32_t destIndex, int32_t destCapacity, length=result; } else if(destIndexaddReplace(cpLength, 1); } return destIndex; @@ -95,7 +95,7 @@ appendResult(UChar *dest, int32_t destIndex, int32_t destCapacity, c=result; length=U16_LENGTH(c); } - if(edits!=NULL) { + if(edits!=nullptr) { edits->addReplace(cpLength, length); } } @@ -145,7 +145,7 @@ appendUChar(UChar *dest, int32_t destIndex, int32_t destCapacity, UChar c) { int32_t appendNonEmptyUnchanged(UChar *dest, int32_t destIndex, int32_t destCapacity, const UChar *s, int32_t length, uint32_t options, icu::Edits *edits) { - if(edits!=NULL) { + if(edits!=nullptr) { edits->addUnchanged(length); } if(options & U_OMIT_UNCHANGED_TEXT) { @@ -1198,11 +1198,11 @@ int32_t toUpper(uint32_t options, int32_t newLength = (i2 - i) + numYpogegrammeni; change |= oldLength != newLength; if (change) { - if (edits != NULL) { + if (edits != nullptr) { edits->addReplace(oldLength, newLength); } } else { - if (edits != NULL) { + if (edits != nullptr) { edits->addUnchanged(oldLength); } // Write unchanged text? @@ -1229,7 +1229,7 @@ int32_t toUpper(uint32_t options, } } else { const UChar *s; - c=ucase_toFullUpper(c, NULL, NULL, &s, UCASE_LOC_GREEK); + c=ucase_toFullUpper(c, nullptr, nullptr, &s, UCASE_LOC_GREEK); destIndex = appendResult(dest, destIndex, destCapacity, c, s, nextIndex - i, options, edits); if (destIndex < 0) { @@ -1317,8 +1317,8 @@ ustrcase_map(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITERATOR_PARAM return 0; } if( destCapacity<0 || - (dest==NULL && destCapacity>0) || - src==NULL || + (dest==nullptr && destCapacity>0) || + src==nullptr || srcLength<-1 ) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; @@ -1331,7 +1331,7 @@ ustrcase_map(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITERATOR_PARAM } /* check for overlapping source and destination */ - if( dest!=NULL && + if( dest!=nullptr && ((src>=dest && src<(dest+destCapacity)) || (dest>=src && dest<(src+srcLength))) ) { @@ -1363,8 +1363,8 @@ ustrcase_mapWithOverlap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITE return 0; } if( destCapacity<0 || - (dest==NULL && destCapacity>0) || - src==NULL || + (dest==nullptr && destCapacity>0) || + src==nullptr || srcLength<-1 ) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; @@ -1377,7 +1377,7 @@ ustrcase_mapWithOverlap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITE } /* check for overlapping source and destination */ - if( dest!=NULL && + if( dest!=nullptr && ((src>=dest && src<(dest+destCapacity)) || (dest>=src && dest<(src+srcLength))) ) { @@ -1388,7 +1388,7 @@ ustrcase_mapWithOverlap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITE } else { /* allocate a buffer */ temp=(UChar *)uprv_malloc(destCapacity*U_SIZEOF_UCHAR); - if(temp==NULL) { + if(temp==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1398,7 +1398,7 @@ ustrcase_mapWithOverlap(int32_t caseLocale, uint32_t options, UCASEMAP_BREAK_ITE } destLength=stringCaseMapper(caseLocale, options, UCASEMAP_BREAK_ITERATOR - temp, destCapacity, src, srcLength, NULL, errorCode); + temp, destCapacity, src, srcLength, nullptr, errorCode); if(temp!=dest) { /* copy the result string to the destination buffer */ if (U_SUCCESS(errorCode) && 0 < destLength && destLength <= destCapacity) { @@ -1464,9 +1464,9 @@ typedef struct CmpEquivLevel CmpEquivLevel; * This function is called from u_strcmpFold() and u_caseInsensitivePrefixMatch(). * * @param s1 input string 1 - * @param length1 length of string 1, or -1 (NULL terminated) + * @param length1 length of string 1, or -1 (NUL terminated) * @param s2 input string 2 - * @param length2 length of string 2, or -1 (NULL terminated) + * @param length2 length of string 2, or -1 (NUL terminated) * @param options compare options * @param matchLen1 (output) length of partial prefix match in s1 * @param matchLen2 (output) length of partial prefix match in s2 @@ -1518,21 +1518,21 @@ static int32_t _cmpFold( /* initialize */ if(matchLen1) { - U_ASSERT(matchLen2 !=NULL); + U_ASSERT(matchLen2 !=nullptr); *matchLen1=0; *matchLen2=0; } start1=m1=org1=s1; if(length1==-1) { - limit1=NULL; + limit1=nullptr; } else { limit1=s1+length1; } start2=m2=org2=s2; if(length2==-1) { - limit2=NULL; + limit2=nullptr; } else { limit2=s2+length2; } @@ -1550,7 +1550,7 @@ static int32_t _cmpFold( if(c1<0) { /* get next code unit from string 1, post-increment */ for(;;) { - if(s1==limit1 || ((c1=*s1)==0 && (limit1==NULL || (options&_STRNCMP_STYLE)))) { + if(s1==limit1 || ((c1=*s1)==0 && (limit1==nullptr || (options&_STRNCMP_STYLE)))) { if(level1==0) { c1=-1; break; @@ -1564,7 +1564,7 @@ static int32_t _cmpFold( do { --level1; start1=stack1[level1].start; /*Not uninitialized*/ - } while(start1==NULL); + } while(start1==nullptr); s1=stack1[level1].s; /*Not uninitialized*/ limit1=stack1[level1].limit; /*Not uninitialized*/ } @@ -1573,7 +1573,7 @@ static int32_t _cmpFold( if(c2<0) { /* get next code unit from string 2, post-increment */ for(;;) { - if(s2==limit2 || ((c2=*s2)==0 && (limit2==NULL || (options&_STRNCMP_STYLE)))) { + if(s2==limit2 || ((c2=*s2)==0 && (limit2==nullptr || (options&_STRNCMP_STYLE)))) { if(level2==0) { c2=-1; break; @@ -1587,7 +1587,7 @@ static int32_t _cmpFold( do { --level2; start2=stack2[level2].start; /*Not uninitialized*/ - } while(start2==NULL); + } while(start2==nullptr); s2=stack2[level2].s; /*Not uninitialized*/ limit2=stack2[level2].limit; /*Not uninitialized*/ } @@ -1614,7 +1614,7 @@ static int32_t _cmpFold( * has no matching code point in s1, so this implementation returns * 2 as the prefix match length ("Fu"). */ - next1=next2=NULL; + next1=next2=nullptr; if(level1==0) { next1=s1; } else if(s1==limit1) { @@ -1629,7 +1629,7 @@ static int32_t _cmpFold( next1=stack1[0].s; } - if (next1!=NULL) { + if (next1!=nullptr) { if(level2==0) { next2=s2; } else if(s2==limit2) { @@ -1638,7 +1638,7 @@ static int32_t _cmpFold( /* is s2 at the end of the current stack? */ next2=stack2[0].s; } - if(next2!=NULL) { + if(next2!=nullptr) { m1=next1; m2=next2; } @@ -1841,7 +1841,7 @@ u_strcmpFold(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, uint32_t options, UErrorCode *pErrorCode) { - return _cmpFold(s1, length1, s2, length2, options, NULL, NULL, pErrorCode); + return _cmpFold(s1, length1, s2, length2, options, nullptr, nullptr, pErrorCode); } /* public API functions */ @@ -1855,7 +1855,7 @@ u_strCaseCompare(const UChar *s1, int32_t length1, if(pErrorCode==0 || U_FAILURE(*pErrorCode)) { return 0; } - if(s1==NULL || length1<-1 || s2==NULL || length2<-1) { + if(s1==nullptr || length1<-1 || s2==nullptr || length2<-1) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } diff --git a/icu4c/source/common/ustrcase_locale.cpp b/icu4c/source/common/ustrcase_locale.cpp index 2ecd24f03ec..59e53050219 100644 --- a/icu4c/source/common/ustrcase_locale.cpp +++ b/icu4c/source/common/ustrcase_locale.cpp @@ -29,7 +29,7 @@ U_CFUNC int32_t ustrcase_getCaseLocale(const char *locale) { - if (locale == NULL) { + if (locale == nullptr) { locale = uloc_getDefault(); } if (*locale == 0) { diff --git a/icu4c/source/common/ustrenum.cpp b/icu4c/source/common/ustrenum.cpp index 08a1bf29c3a..19233a9cc8d 100644 --- a/icu4c/source/common/ustrenum.cpp +++ b/icu4c/source/common/ustrenum.cpp @@ -29,7 +29,7 @@ StringEnumeration::StringEnumeration() } StringEnumeration::~StringEnumeration() { - if (chars != NULL && chars != charsBuffer) { + if (chars != nullptr && chars != charsBuffer) { uprv_free(chars); } } @@ -37,17 +37,17 @@ StringEnumeration::~StringEnumeration() { // StringEnumeration base class clone() default implementation, does not clone StringEnumeration * StringEnumeration::clone() const { - return NULL; + return nullptr; } const char * StringEnumeration::next(int32_t *resultLength, UErrorCode &status) { const UnicodeString *s=snext(status); - if(U_SUCCESS(status) && s!=NULL) { + if(U_SUCCESS(status) && s!=nullptr) { unistr=*s; ensureCharsCapacity(unistr.length()+1, status); if(U_SUCCESS(status)) { - if(resultLength!=NULL) { + if(resultLength!=nullptr) { *resultLength=unistr.length(); } unistr.extract(0, INT32_MAX, chars, charsCapacity, US_INV); @@ -55,21 +55,21 @@ StringEnumeration::next(int32_t *resultLength, UErrorCode &status) { } } - return NULL; + return nullptr; } const UChar * StringEnumeration::unext(int32_t *resultLength, UErrorCode &status) { const UnicodeString *s=snext(status); - if(U_SUCCESS(status) && s!=NULL) { + if(U_SUCCESS(status) && s!=nullptr) { unistr=*s; - if(resultLength!=NULL) { + if(resultLength!=nullptr) { *resultLength=unistr.length(); } return unistr.getTerminatedBuffer(); } - return NULL; + return nullptr; } const UnicodeString * @@ -90,7 +90,7 @@ StringEnumeration::ensureCharsCapacity(int32_t capacity, UErrorCode &status) { uprv_free(chars); } chars=(char *)uprv_malloc(capacity); - if(chars==NULL) { + if(chars==nullptr) { chars=charsBuffer; charsCapacity=sizeof(charsBuffer); status=U_MEMORY_ALLOCATION_ERROR; @@ -102,13 +102,13 @@ StringEnumeration::ensureCharsCapacity(int32_t capacity, UErrorCode &status) { UnicodeString * StringEnumeration::setChars(const char *s, int32_t length, UErrorCode &status) { - if(U_SUCCESS(status) && s!=NULL) { + if(U_SUCCESS(status) && s!=nullptr) { if(length<0) { length=(int32_t)uprv_strlen(s); } UChar *buffer=unistr.getBuffer(length+1); - if(buffer!=NULL) { + if(buffer!=nullptr) { u_charsToUChars(s, buffer, length); buffer[length]=0; unistr.releaseBuffer(length); @@ -118,7 +118,7 @@ StringEnumeration::setChars(const char *s, int32_t length, UErrorCode &status) { } } - return NULL; + return nullptr; } bool StringEnumeration::operator==(const StringEnumeration& that)const { @@ -137,13 +137,13 @@ UStringEnumeration::fromUEnumeration( UEnumeration *uenumToAdopt, UErrorCode &status) { if (U_FAILURE(status)) { uenum_close(uenumToAdopt); - return NULL; + return nullptr; } UStringEnumeration *result = new UStringEnumeration(uenumToAdopt); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; uenum_close(uenumToAdopt); - return NULL; + return nullptr; } return result; } @@ -243,8 +243,8 @@ ustrenum_reset(UEnumeration* en, * The StringEnumeration pointer will be stored in 'context'. */ static const UEnumeration USTRENUM_VT = { - NULL, - NULL, // store StringEnumeration pointer here + nullptr, + nullptr, // store StringEnumeration pointer here ustrenum_close, ustrenum_count, ustrenum_unext, @@ -261,17 +261,17 @@ U_CDECL_END */ U_CAPI UEnumeration* U_EXPORT2 uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec) { - UEnumeration* result = NULL; - if (U_SUCCESS(*ec) && adopted != NULL) { + UEnumeration* result = nullptr; + if (U_SUCCESS(*ec) && adopted != nullptr) { result = (UEnumeration*) uprv_malloc(sizeof(UEnumeration)); - if (result == NULL) { + if (result == nullptr) { *ec = U_MEMORY_ALLOCATION_ERROR; } else { uprv_memcpy(result, &USTRENUM_VT, sizeof(USTRENUM_VT)); result->context = adopted; } } - if (result == NULL) { + if (result == nullptr) { delete adopted; } return result; @@ -303,7 +303,7 @@ ucharstrenum_unext(UEnumeration* en, UErrorCode* /*ec*/) { UCharStringEnumeration *e = (UCharStringEnumeration*) en; if (e->index >= e->count) { - return NULL; + return nullptr; } const UChar* result = ((const UChar**)e->uenum.context)[e->index++]; if (resultLength) { @@ -319,7 +319,7 @@ ucharstrenum_next(UEnumeration* en, UErrorCode* /*ec*/) { UCharStringEnumeration *e = (UCharStringEnumeration*) en; if (e->index >= e->count) { - return NULL; + return nullptr; } const char* result = ((const char**)e->uenum.context)[e->index++]; if (resultLength) { @@ -335,8 +335,8 @@ ucharstrenum_reset(UEnumeration* en, } static const UEnumeration UCHARSTRENUM_VT = { - NULL, - NULL, // store StringEnumeration pointer here + nullptr, + nullptr, // store StringEnumeration pointer here ucharstrenum_close, ucharstrenum_count, uenum_unextDefault, @@ -345,8 +345,8 @@ static const UEnumeration UCHARSTRENUM_VT = { }; static const UEnumeration UCHARSTRENUM_U_VT = { - NULL, - NULL, // store StringEnumeration pointer here + nullptr, + nullptr, // store StringEnumeration pointer here ucharstrenum_close, ucharstrenum_count, ucharstrenum_unext, @@ -359,10 +359,10 @@ U_CDECL_END U_CAPI UEnumeration* U_EXPORT2 uenum_openCharStringsEnumeration(const char* const strings[], int32_t count, UErrorCode* ec) { - UCharStringEnumeration* result = NULL; + UCharStringEnumeration* result = nullptr; if (U_SUCCESS(*ec) && count >= 0 && (count == 0 || strings != 0)) { result = (UCharStringEnumeration*) uprv_malloc(sizeof(UCharStringEnumeration)); - if (result == NULL) { + if (result == nullptr) { *ec = U_MEMORY_ALLOCATION_ERROR; } else { U_ASSERT((char*)result==(char*)(&result->uenum)); @@ -378,10 +378,10 @@ uenum_openCharStringsEnumeration(const char* const strings[], int32_t count, U_CAPI UEnumeration* U_EXPORT2 uenum_openUCharStringsEnumeration(const UChar* const strings[], int32_t count, UErrorCode* ec) { - UCharStringEnumeration* result = NULL; + UCharStringEnumeration* result = nullptr; if (U_SUCCESS(*ec) && count >= 0 && (count == 0 || strings != 0)) { result = (UCharStringEnumeration*) uprv_malloc(sizeof(UCharStringEnumeration)); - if (result == NULL) { + if (result == nullptr) { *ec = U_MEMORY_ALLOCATION_ERROR; } else { U_ASSERT((char*)result==(char*)(&result->uenum)); diff --git a/icu4c/source/common/ustrenum.h b/icu4c/source/common/ustrenum.h index 3703dedb97d..ff546ca0a1b 100644 --- a/icu4c/source/common/ustrenum.h +++ b/icu4c/source/common/ustrenum.h @@ -53,9 +53,9 @@ public: /** * Returns the next element a UnicodeString*. If there are no - * more elements, returns NULL. + * more elements, returns nullptr. * @param status the error code. - * @return a pointer to the string, or NULL. + * @return a pointer to the string, or nullptr. */ virtual const UnicodeString* snext(UErrorCode& status) override; diff --git a/icu4c/source/common/ustring.cpp b/icu4c/source/common/ustring.cpp index 5804976ef97..249c55a5b02 100644 --- a/icu4c/source/common/ustring.cpp +++ b/icu4c/source/common/ustring.cpp @@ -37,7 +37,7 @@ /* * Test if a substring match inside a string is at code point boundaries. * All pointers refer to the same buffer. - * The limit pointer may be NULL, all others must be real pointers. + * The limit pointer may be nullptr, all others must be real pointers. */ static inline UBool isMatchAtCPBoundary(const UChar *start, const UChar *match, const UChar *matchLimit, const UChar *limit) { @@ -58,11 +58,11 @@ u_strFindFirst(const UChar *s, int32_t length, const UChar *start, *p, *q, *subLimit; UChar c, cs, cq; - if(sub==NULL || subLength<-1) { + if(sub==nullptr || subLength<-1) { return (UChar *)s; } - if(s==NULL || length<-1) { - return NULL; + if(s==nullptr || length<-1) { + return nullptr; } start=s; @@ -84,14 +84,14 @@ u_strFindFirst(const UChar *s, int32_t length, q=sub; for(;;) { if((cq=*q)==0) { - if(isMatchAtCPBoundary(start, s-1, p, NULL)) { + if(isMatchAtCPBoundary(start, s-1, p, nullptr)) { return (UChar *)(s-1); /* well-formed match */ } else { break; /* no match because surrogate pair is split */ } } if((c=*p)==0) { - return NULL; /* no match, and none possible after s */ + return nullptr; /* no match, and none possible after s */ } if(c!=cq) { break; /* no match */ @@ -103,7 +103,7 @@ u_strFindFirst(const UChar *s, int32_t length, } /* not found */ - return NULL; + return nullptr; } if(subLength<0) { @@ -132,14 +132,14 @@ u_strFindFirst(const UChar *s, int32_t length, q=sub; for(;;) { if(q==subLimit) { - if(isMatchAtCPBoundary(start, s-1, p, NULL)) { + if(isMatchAtCPBoundary(start, s-1, p, nullptr)) { return (UChar *)(s-1); /* well-formed match */ } else { break; /* no match because surrogate pair is split */ } } if((c=*p)==0) { - return NULL; /* no match, and none possible after s */ + return nullptr; /* no match, and none possible after s */ } if(c!=*q) { break; /* no match */ @@ -154,7 +154,7 @@ u_strFindFirst(const UChar *s, int32_t length, /* subLength was decremented above */ if(length<=subLength) { - return NULL; /* s is shorter than sub */ + return nullptr; /* s is shorter than sub */ } limit=s+length; @@ -187,7 +187,7 @@ u_strFindFirst(const UChar *s, int32_t length, } /* not found */ - return NULL; + return nullptr; } U_CAPI UChar * U_EXPORT2 @@ -209,7 +209,7 @@ u_strchr(const UChar *s, UChar c) { return (UChar *)s; } if(cs==0) { - return NULL; + return nullptr; } ++s; } @@ -230,17 +230,17 @@ u_strchr32(const UChar *s, UChar32 c) { return (UChar *)(s-1); } } - return NULL; + return nullptr; } else { /* not a Unicode code point, not findable */ - return NULL; + return nullptr; } } U_CAPI UChar * U_EXPORT2 u_memchr(const UChar *s, UChar c, int32_t count) { if(count<=0) { - return NULL; /* no string */ + return nullptr; /* no string */ } else if(U16_IS_SURROGATE(c)) { /* make sure to not find half of a surrogate pair */ return u_strFindFirst(s, count, &c, 1); @@ -252,7 +252,7 @@ u_memchr(const UChar *s, UChar c, int32_t count) { return (UChar *)s; } } while(++s!=limit); - return NULL; + return nullptr; } } @@ -263,7 +263,7 @@ u_memchr32(const UChar *s, UChar32 c, int32_t count) { return u_memchr(s, (UChar)c, count); } else if(count<2) { /* too short for a surrogate pair */ - return NULL; + return nullptr; } else if((uint32_t)c<=UCHAR_MAX_VALUE) { /* find supplementary code point as surrogate pair */ const UChar *limit=s+count-1; /* -1 so that we do not need a separate check for the trail unit */ @@ -274,10 +274,10 @@ u_memchr32(const UChar *s, UChar32 c, int32_t count) { return (UChar *)s; } } while(++s!=limit); - return NULL; + return nullptr; } else { /* not a Unicode code point, not findable */ - return NULL; + return nullptr; } } @@ -289,11 +289,11 @@ u_strFindLast(const UChar *s, int32_t length, const UChar *start, *limit, *p, *q, *subLimit; UChar c, cs; - if(sub==NULL || subLength<-1) { + if(sub==nullptr || subLength<-1) { return (UChar *)s; } - if(s==NULL || length<-1) { - return NULL; + if(s==nullptr || length<-1) { + return nullptr; } /* @@ -329,7 +329,7 @@ u_strFindLast(const UChar *s, int32_t length, /* subLength was decremented above */ if(length<=subLength) { - return NULL; /* s is shorter than sub */ + return nullptr; /* s is shorter than sub */ } start=s; @@ -360,7 +360,7 @@ u_strFindLast(const UChar *s, int32_t length, } /* not found */ - return NULL; + return nullptr; } U_CAPI UChar * U_EXPORT2 @@ -374,7 +374,7 @@ u_strrchr(const UChar *s, UChar c) { /* make sure to not find half of a surrogate pair */ return u_strFindLast(s, -1, &c, 1); } else { - const UChar *result=NULL; + const UChar *result=nullptr; UChar cs; /* trivial search for a BMP code point */ @@ -397,7 +397,7 @@ u_strrchr32(const UChar *s, UChar32 c) { return u_strrchr(s, (UChar)c); } else if((uint32_t)c<=UCHAR_MAX_VALUE) { /* find supplementary code point as surrogate pair */ - const UChar *result=NULL; + const UChar *result=nullptr; UChar cs, lead=U16_LEAD(c), trail=U16_TRAIL(c); while((cs=*s++)!=0) { @@ -408,14 +408,14 @@ u_strrchr32(const UChar *s, UChar32 c) { return (UChar *)result; } else { /* not a Unicode code point, not findable */ - return NULL; + return nullptr; } } U_CAPI UChar * U_EXPORT2 u_memrchr(const UChar *s, UChar c, int32_t count) { if(count<=0) { - return NULL; /* no string */ + return nullptr; /* no string */ } else if(U16_IS_SURROGATE(c)) { /* make sure to not find half of a surrogate pair */ return u_strFindLast(s, count, &c, 1); @@ -427,7 +427,7 @@ u_memrchr(const UChar *s, UChar c, int32_t count) { return (UChar *)limit; } } while(s!=limit); - return NULL; + return nullptr; } } @@ -438,7 +438,7 @@ u_memrchr32(const UChar *s, UChar32 c, int32_t count) { return u_memrchr(s, (UChar)c, count); } else if(count<2) { /* too short for a surrogate pair */ - return NULL; + return nullptr; } else if((uint32_t)c<=UCHAR_MAX_VALUE) { /* find supplementary code point as surrogate pair */ const UChar *limit=s+count-1; @@ -449,10 +449,10 @@ u_memrchr32(const UChar *s, UChar32 c, int32_t count) { return (UChar *)(limit-1); } } while(s!=--limit); - return NULL; + return nullptr; } else { /* not a Unicode code point, not findable */ - return NULL; + return nullptr; } } @@ -544,7 +544,7 @@ u_strpbrk(const UChar *string, const UChar *matchSet) if(idx >= 0) { return (UChar *)string + idx; } else { - return NULL; + return nullptr; } } @@ -583,8 +583,8 @@ u_strtok_r(UChar *src, UChar *nextToken; uint32_t nonDelimIdx; - /* If saveState is NULL, the user messed up. */ - if (src != NULL) { + /* If saveState is nullptr, the user messed up. */ + if (src != nullptr) { tokSource = src; *saveState = src; /* Set to "src" in case there are no delimiters */ } @@ -592,9 +592,9 @@ u_strtok_r(UChar *src, tokSource = *saveState; } else { - /* src == NULL && *saveState == NULL */ + /* src == nullptr && *saveState == nullptr */ /* This shouldn't happen. We already finished tokenizing. */ - return NULL; + return nullptr; } /* Skip initial delimiters */ @@ -603,7 +603,7 @@ u_strtok_r(UChar *src, if (*tokSource) { nextToken = u_strpbrk(tokSource, delim); - if (nextToken != NULL) { + if (nextToken != nullptr) { /* Create a token */ *(nextToken++) = 0; *saveState = nextToken; @@ -611,15 +611,15 @@ u_strtok_r(UChar *src, } else if (*saveState) { /* Return the last token */ - *saveState = NULL; + *saveState = nullptr; return tokSource; } } else { /* No tokens were found. Only delimiters were left. */ - *saveState = NULL; + *saveState = nullptr; } - return NULL; + return nullptr; } /* Miscellaneous functions -------------------------------------------------- */ @@ -715,7 +715,7 @@ uprv_strCompare(const UChar *s1, int32_t length1, } /* setup for fix-up */ - limit1=limit2=NULL; + limit1=limit2=nullptr; } else if(strncmpStyle) { /* special handling for strncmp, assume length1==length2>=0 but also check for NUL */ if(s1==s2) { @@ -830,7 +830,7 @@ u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2, UBool codePointOrde UChar32 c1, c2; /* argument checking */ - if(iter1==NULL || iter2==NULL) { + if(iter1==nullptr || iter2==nullptr) { return 0; /* bad arguments */ } if(iter1==iter2) { @@ -926,7 +926,7 @@ u_strCompare(const UChar *s1, int32_t length1, const UChar *s2, int32_t length2, UBool codePointOrder) { /* argument checking */ - if(s1==NULL || length1<-1 || s2==NULL || length2<-1) { + if(s1==nullptr || length1<-1 || s2==nullptr || length2<-1) { return 0; } return uprv_strCompare(s1, length1, s2, length2, false, codePointOrder); @@ -1008,7 +1008,7 @@ U_CAPI int32_t U_EXPORT2 u_countChar32(const UChar *s, int32_t length) { int32_t count; - if(s==NULL || length<-1) { + if(s==nullptr || length<-1) { return 0; } @@ -1051,7 +1051,7 @@ u_strHasMoreChar32Than(const UChar *s, int32_t length, int32_t number) { if(number<0) { return true; } - if(s==NULL || length<-1) { + if(s==nullptr || length<-1) { return false; } @@ -1387,7 +1387,7 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { int32_t lenParsed = 0; UChar32 c32; if (src != segment) { - if (dest != NULL) { + if (dest != nullptr) { _appendUChars(dest + i, destCapacity - i, segment, (int32_t)(src - segment)); } @@ -1399,7 +1399,7 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { goto err; } src += lenParsed; /* advance past escape seq. */ - if (dest != NULL && U16_LENGTH(c32) <= (destCapacity - i)) { + if (dest != nullptr && U16_LENGTH(c32) <= (destCapacity - i)) { U16_APPEND_UNSAFE(dest, i, c32); } else { i += U16_LENGTH(c32); @@ -1410,19 +1410,19 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { } } if (src != segment) { - if (dest != NULL) { + if (dest != nullptr) { _appendUChars(dest + i, destCapacity - i, segment, (int32_t)(src - segment)); } i += (int32_t)(src - segment); } - if (dest != NULL && i < destCapacity) { + if (dest != nullptr && i < destCapacity) { dest[i] = 0; } return i; err: - if (dest != NULL && destCapacity > 0) { + if (dest != nullptr && destCapacity > 0) { *dest = 0; } return 0; @@ -1435,7 +1435,7 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { * Set warning and error codes accordingly. */ #define __TERMINATE_STRING(dest, destCapacity, length, pErrorCode) UPRV_BLOCK_MACRO_BEGIN { \ - if(pErrorCode!=NULL && U_SUCCESS(*pErrorCode)) { \ + if(pErrorCode!=nullptr && U_SUCCESS(*pErrorCode)) { \ /* not a public function, so no complete argument checking */ \ \ if(length<0) { \ @@ -1506,7 +1506,7 @@ u_terminateWChars(wchar_t *dest, int32_t destCapacity, int32_t length, UErrorCod #define STRING_HASH(TYPE, STR, STRLEN, DEREF) UPRV_BLOCK_MACRO_BEGIN { \ uint32_t hash = 0; \ const TYPE *p = (const TYPE*) STR; \ - if (p != NULL) { \ + if (p != nullptr) { \ int32_t len = (int32_t)(STRLEN); \ int32_t inc = ((len - 32) / 32) + 1; \ const TYPE *limit = p + len; \ diff --git a/icu4c/source/common/ustrtrns.cpp b/icu4c/source/common/ustrtrns.cpp index dcb9dc58783..24f20901355 100644 --- a/icu4c/source/common/ustrtrns.cpp +++ b/icu4c/source/common/ustrtrns.cpp @@ -53,22 +53,22 @@ u_strFromUTF32WithSub(UChar *dest, /* args check */ if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) || + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) || subchar > 0x10ffff || U_IS_SURROGATE(subchar) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(pNumSubstitutions != NULL) { + if(pNumSubstitutions != nullptr) { *pNumSubstitutions = 0; } pDest = dest; - destLimit = (dest!=NULL)?(dest + destCapacity):NULL; + destLimit = (dest!=nullptr)?(dest + destCapacity):nullptr; reqLength = 0; numSubstitutions = 0; @@ -89,7 +89,7 @@ u_strFromUTF32WithSub(UChar *dest, while(*++srcLimit != 0) {} } } else { - srcLimit = (src!=NULL)?(src + srcLength):NULL; + srcLimit = (src!=nullptr)?(src + srcLength):nullptr; } /* convert with length */ @@ -105,7 +105,7 @@ u_strFromUTF32WithSub(UChar *dest, } break; } else if(0x10000 <= ch && ch <= 0x10ffff) { - if(pDest!=NULL && ((pDest + 2) <= destLimit)) { + if(pDest!=nullptr && ((pDest + 2) <= destLimit)) { *pDest++ = U16_LEAD(ch); *pDest++ = U16_TRAIL(ch); } else { @@ -115,7 +115,7 @@ u_strFromUTF32WithSub(UChar *dest, } else if((ch = subchar) < 0) { /* surrogate code point, or not a Unicode code point at all */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else { ++numSubstitutions; } @@ -126,7 +126,7 @@ u_strFromUTF32WithSub(UChar *dest, if(pDestLength) { *pDestLength = reqLength; } - if(pNumSubstitutions != NULL) { + if(pNumSubstitutions != nullptr) { *pNumSubstitutions = numSubstitutions; } @@ -146,7 +146,7 @@ u_strFromUTF32(UChar *dest, return u_strFromUTF32WithSub( dest, destCapacity, pDestLength, src, srcLength, - U_SENTINEL, NULL, + U_SENTINEL, nullptr, pErrorCode); } @@ -168,22 +168,22 @@ u_strToUTF32WithSub(UChar32 *dest, /* args check */ if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) || + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) || subchar > 0x10ffff || U_IS_SURROGATE(subchar) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(pNumSubstitutions != NULL) { + if(pNumSubstitutions != nullptr) { *pNumSubstitutions = 0; } pDest = dest; - destLimit = (dest!=NULL)?(dest + destCapacity):NULL; + destLimit = (dest!=nullptr)?(dest + destCapacity):nullptr; reqLength = 0; numSubstitutions = 0; @@ -203,7 +203,7 @@ u_strToUTF32WithSub(UChar32 *dest, while(*++srcLimit != 0) {} } } else { - srcLimit = (src!=NULL)?(src + srcLength):NULL; + srcLimit = (src!=nullptr)?(src + srcLength):nullptr; } /* convert with length */ @@ -217,7 +217,7 @@ u_strToUTF32WithSub(UChar32 *dest, } else if((ch = subchar) < 0) { /* unpaired surrogate */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else { ++numSubstitutions; } @@ -232,7 +232,7 @@ u_strToUTF32WithSub(UChar32 *dest, if(pDestLength) { *pDestLength = reqLength; } - if(pNumSubstitutions != NULL) { + if(pNumSubstitutions != nullptr) { *pNumSubstitutions = numSubstitutions; } @@ -252,7 +252,7 @@ u_strToUTF32(UChar32 *dest, return u_strToUTF32WithSub( dest, destCapacity, pDestLength, src, srcLength, - U_SENTINEL, NULL, + U_SENTINEL, nullptr, pErrorCode); } @@ -266,17 +266,17 @@ u_strFromUTF8WithSub(UChar *dest, UErrorCode *pErrorCode){ /* args check */ if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) || + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) || subchar > 0x10ffff || U_IS_SURROGATE(subchar) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=0; } UChar *pDest = dest; @@ -328,7 +328,7 @@ u_strFromUTF8WithSub(UChar *dest, (c)=utf8_nextCharSafeBody((const uint8_t *)src, &(i), -1, c, -1); if(c<0 && (++numSubstitutions, c = subchar) < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else if(c<=0xFFFF) { *(pDest++)=(UChar)c; } else { @@ -368,7 +368,7 @@ u_strFromUTF8WithSub(UChar *dest, (c)=utf8_nextCharSafeBody((const uint8_t *)src, &(i), -1, c, -1); if(c<0 && (++numSubstitutions, c = subchar) < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } reqLength += U16_LENGTH(c); } @@ -433,7 +433,7 @@ u_strFromUTF8WithSub(UChar *dest, (c)=utf8_nextCharSafeBody((const uint8_t *)src, &(i), srcLength, c, -1); if(c<0 && (++numSubstitutions, c = subchar) < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else if(c<=0xFFFF) { *(pDest++)=(UChar)c; } else { @@ -470,7 +470,7 @@ u_strFromUTF8WithSub(UChar *dest, (c)=utf8_nextCharSafeBody((const uint8_t *)src, &(i), srcLength, c, -1); if(c<0 && (++numSubstitutions, c = subchar) < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else if(c<=0xFFFF) { *(pDest++)=(UChar)c; } else { @@ -512,7 +512,7 @@ u_strFromUTF8WithSub(UChar *dest, (c)=utf8_nextCharSafeBody((const uint8_t *)src, &(i), srcLength, c, -1); if(c<0 && (++numSubstitutions, c = subchar) < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } reqLength += U16_LENGTH(c); } @@ -522,7 +522,7 @@ u_strFromUTF8WithSub(UChar *dest, reqLength+=(int32_t)(pDest - dest); - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=numSubstitutions; } @@ -546,7 +546,7 @@ u_strFromUTF8(UChar *dest, return u_strFromUTF8WithSub( dest, destCapacity, pDestLength, src, srcLength, - U_SENTINEL, NULL, + U_SENTINEL, nullptr, pErrorCode); } @@ -564,19 +564,19 @@ u_strFromUTF8Lenient(UChar *dest, /* args check */ if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if(srcLength < 0) { /* Transform a NUL-terminated string. */ - UChar *pDestLimit = (dest!=NULL)?(dest+destCapacity):NULL; + UChar *pDestLimit = (dest!=nullptr)?(dest+destCapacity):nullptr; uint8_t t1, t2, t3; /* trail bytes */ while(((ch = *pSrc) != 0) && (pDest < pDestLimit)) { @@ -662,7 +662,7 @@ u_strFromUTF8Lenient(UChar *dest, break; } } else /* srcLength >= 0 */ { - const uint8_t *pSrcLimit = (pSrc!=NULL)?(pSrc + srcLength):NULL; + const uint8_t *pSrcLimit = (pSrc!=nullptr)?(pSrc + srcLength):nullptr; /* * This function requires that if srcLength is given, then it must be @@ -670,11 +670,11 @@ u_strFromUTF8Lenient(UChar *dest, * destination buffer overflow in the loop. */ if(destCapacity < srcLength) { - if(pDestLength != NULL) { + if(pDestLength != nullptr) { *pDestLength = srcLength; /* this likely overestimates the true destLength! */ } *pErrorCode = U_BUFFER_OVERFLOW_ERROR; - return NULL; + return nullptr; } if((pSrcLimit - pSrc) >= 4) { @@ -800,23 +800,23 @@ u_strToUTF8WithSub(char *dest, int32_t reqLength=0; uint32_t ch=0,ch2=0; uint8_t *pDest = (uint8_t *)dest; - uint8_t *pDestLimit = (pDest!=NULL)?(pDest + destCapacity):NULL; + uint8_t *pDestLimit = (pDest!=nullptr)?(pDest + destCapacity):nullptr; int32_t numSubstitutions; /* args check */ if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } - if( (pSrc==NULL && srcLength!=0) || srcLength < -1 || - (destCapacity<0) || (dest == NULL && destCapacity > 0) || + if( (pSrc==nullptr && srcLength!=0) || srcLength < -1 || + (destCapacity<0) || (dest == nullptr && destCapacity > 0) || subchar > 0x10ffff || U_IS_SURROGATE(subchar) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=0; } numSubstitutions=0; @@ -861,7 +861,7 @@ u_strToUTF8WithSub(char *dest, } else { /* Unicode 3.2 forbids surrogate code points in UTF-8 */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } length = U8_LENGTH(ch); @@ -890,11 +890,11 @@ u_strToUTF8WithSub(char *dest, } else { /* Unicode 3.2 forbids surrogate code points in UTF-8 */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } } } else { - const UChar *pSrcLimit = (pSrc!=NULL)?(pSrc+srcLength):NULL; + const UChar *pSrcLimit = (pSrc!=nullptr)?(pSrc+srcLength):nullptr; int32_t count; /* Faster loop without ongoing checking for pSrcLimit and pDestLimit. */ @@ -955,7 +955,7 @@ u_strToUTF8WithSub(char *dest, ++numSubstitutions; } else { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } /* convert and append*/ @@ -1003,7 +1003,7 @@ u_strToUTF8WithSub(char *dest, } else { /* Unicode 3.2 forbids surrogate code points in UTF-8 */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } length = U8_LENGTH(ch); @@ -1033,14 +1033,14 @@ u_strToUTF8WithSub(char *dest, } else { /* Unicode 3.2 forbids surrogate code points in UTF-8 */ *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } } } reqLength+=(int32_t)(pDest - (uint8_t *)dest); - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=numSubstitutions; } @@ -1063,7 +1063,7 @@ u_strToUTF8(char *dest, return u_strToUTF8WithSub( dest, destCapacity, pDestLength, pSrc, srcLength, - U_SENTINEL, NULL, + U_SENTINEL, nullptr, pErrorCode); } @@ -1078,17 +1078,17 @@ u_strFromJavaModifiedUTF8WithSub( UErrorCode *pErrorCode) { /* args check */ if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (dest==NULL && destCapacity!=0) || destCapacity<0 || + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (dest==nullptr && destCapacity!=0) || destCapacity<0 || subchar > 0x10ffff || U_IS_SURROGATE(subchar) ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=0; } UChar *pDest = dest; @@ -1185,7 +1185,7 @@ u_strFromJavaModifiedUTF8WithSub( if(subchar < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else if(subchar > 0xffff && --count == 0) { /* * We need to write two UChars, adjusted count for that, @@ -1234,7 +1234,7 @@ u_strFromJavaModifiedUTF8WithSub( if(subchar < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else { /* function call for error cases */ utf8_nextCharSafeBody((const uint8_t *)src, &(i), srcLength, ch, -1); @@ -1285,7 +1285,7 @@ u_strFromJavaModifiedUTF8WithSub( if(subchar < 0) { *pErrorCode = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } else { /* function call for error cases */ utf8_nextCharSafeBody((const uint8_t *)src, &(i), srcLength, ch, -1); @@ -1295,7 +1295,7 @@ u_strFromJavaModifiedUTF8WithSub( } } - if(pNumSubstitutions!=NULL) { + if(pNumSubstitutions!=nullptr) { *pNumSubstitutions=numSubstitutions; } @@ -1326,13 +1326,13 @@ u_strToJavaModifiedUTF8( /* args check */ if(U_FAILURE(*pErrorCode)){ - return NULL; + return nullptr; } - if( (src==NULL && srcLength!=0) || srcLength < -1 || - (dest==NULL && destCapacity!=0) || destCapacity<0 + if( (src==nullptr && srcLength!=0) || srcLength < -1 || + (dest==nullptr && destCapacity!=0) || destCapacity<0 ) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if(srcLength==-1) { @@ -1355,7 +1355,7 @@ u_strToJavaModifiedUTF8( } /* Faster loop without ongoing checking for pSrcLimit and pDestLimit. */ - pSrcLimit = (src!=NULL)?(src+srcLength):NULL; + pSrcLimit = (src!=nullptr)?(src+srcLength):nullptr; for(;;) { count = (int32_t)(pDestLimit - pDest); srcLength = (int32_t)(pSrcLimit - src); diff --git a/icu4c/source/common/utext.cpp b/icu4c/source/common/utext.cpp index 89e3d669f6e..e79b06257b9 100644 --- a/icu4c/source/common/utext.cpp +++ b/icu4c/source/common/utext.cpp @@ -434,7 +434,7 @@ utext_extract(UText *ut, U_CAPI UBool U_EXPORT2 utext_equals(const UText *a, const UText *b) { - if (a==NULL || b==NULL || + if (a==nullptr || b==nullptr || a->magic != UTEXT_MAGIC || b->magic != UTEXT_MAGIC) { // Null or invalid arguments don't compare equal to anything. @@ -527,7 +527,7 @@ utext_clone(UText *dest, const UText *src, UBool deep, UBool readOnly, UErrorCod if (U_FAILURE(*status)) { return result; } - if (result == NULL) { + if (result == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return result; } @@ -580,16 +580,16 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { return ut; } - if (ut == NULL) { + if (ut == nullptr) { // We need to heap-allocate storage for the new UText int32_t spaceRequired = sizeof(UText); if (extraSpace > 0) { spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(std::max_align_t); } ut = (UText *)uprv_malloc(spaceRequired); - if (ut == NULL) { + if (ut == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } else { *ut = emptyText; ut->flags |= UTEXT_HEAP_ALLOCATED; @@ -607,7 +607,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { } // If the ut is already open and there's a provider supplied close // function, call it. - if ((ut->flags & UTEXT_OPEN) && ut->pFuncs->close != NULL) { + if ((ut->flags & UTEXT_OPEN) && ut->pFuncs->close != nullptr) { ut->pFuncs->close(ut); } ut->flags &= ~UTEXT_OPEN; @@ -622,7 +622,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { ut->extraSize = 0; } ut->pExtra = uprv_malloc(extraSpace); - if (ut->pExtra == NULL) { + if (ut->pExtra == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { ut->extraSize = extraSpace; @@ -635,11 +635,11 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { // Initialize all remaining fields of the UText. // - ut->context = NULL; - ut->chunkContents = NULL; - ut->p = NULL; - ut->q = NULL; - ut->r = NULL; + ut->context = nullptr; + ut->chunkContents = nullptr; + ut->p = nullptr; + ut->q = nullptr; + ut->r = nullptr; ut->a = 0; ut->b = 0; ut->c = 0; @@ -652,8 +652,8 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { ut->privA = 0; ut->privB = 0; ut->privC = 0; - ut->privP = NULL; - if (ut->pExtra!=NULL && ut->extraSize>0) + ut->privP = nullptr; + if (ut->pExtra!=nullptr && ut->extraSize>0) uprv_memset(ut->pExtra, 0, ut->extraSize); } @@ -663,7 +663,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { U_CAPI UText * U_EXPORT2 utext_close(UText *ut) { - if (ut==NULL || + if (ut==nullptr || ut->magic != UTEXT_MAGIC || (ut->flags & UTEXT_OPEN) == 0) { @@ -674,7 +674,7 @@ utext_close(UText *ut) { // If the provider gave us a close function, call it now. // This will clean up anything allocated specifically by the provider. - if (ut->pFuncs->close != NULL) { + if (ut->pFuncs->close != nullptr) { ut->pFuncs->close(ut); } ut->flags &= ~UTEXT_OPEN; @@ -683,7 +683,7 @@ utext_close(UText *ut) { // delete it. if (ut->flags & UTEXT_EXTRA_HEAP_ALLOCATED) { uprv_free(ut->pExtra); - ut->pExtra = NULL; + ut->pExtra = nullptr; ut->flags &= ~UTEXT_EXTRA_HEAP_ALLOCATED; ut->extraSize = 0; } @@ -691,7 +691,7 @@ utext_close(UText *ut) { // Zero out function table of the closed UText. This is a defensive move, // intended to cause applications that inadvertently use a closed // utext to crash with null pointer errors. - ut->pFuncs = NULL; + ut->pFuncs = nullptr; if (ut->flags & UTEXT_HEAP_ALLOCATED) { // This UText was allocated by UText setup. We need to free it. @@ -699,7 +699,7 @@ utext_close(UText *ut) { // tries to reopen another UText using the deleted storage. ut->magic = 0; uprv_free(ut); - ut = NULL; + ut = nullptr; } return ut; } @@ -772,7 +772,7 @@ static void adjustPointer(UText *dest, const void **destPtr, const UText *src) { static UText * U_CALLCONV shallowTextClone(UText * dest, const UText * src, UErrorCode * status) { if (U_FAILURE(*status)) { - return NULL; + return nullptr; } int32_t srcExtraSize = src->extraSize; @@ -941,7 +941,7 @@ utf8TextAccess(UText *ut, int64_t index, UBool forward) { // return; // const uint8_t *s8=(const uint8_t *)ut->context; - UTF8Buf *u8b = NULL; + UTF8Buf *u8b = nullptr; int32_t length = ut->b; // Length of original utf-8 int32_t ix= (int32_t)index; // Requested index, trimmed to 32 bits. int32_t mapIndex = 0; @@ -1425,7 +1425,7 @@ utext_strFromUTF8(UChar *dest, { UChar *pDest = dest; - UChar *pDestLimit = (dest!=NULL)?(dest+destCapacity):NULL; + UChar *pDestLimit = (dest!=nullptr)?(dest+destCapacity):nullptr; UChar32 ch=0; int32_t index = 0; int32_t reqLength = 0; @@ -1484,7 +1484,7 @@ utf8TextExtract(UText *ut, if(U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0)) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1579,7 +1579,7 @@ utf8TextClone(UText *dest, const UText *src, UBool deep, UErrorCode *status) if (deep && U_SUCCESS(*status)) { int32_t len = (int32_t)utext_nativeLength((UText *)src); char *copyStr = (char *)uprv_malloc(len+1); - if (copyStr == NULL) { + if (copyStr == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { uprv_memcpy(copyStr, src->context, len+1); @@ -1599,7 +1599,7 @@ utf8TextClose(UText *ut) { if (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_OWNS_TEXT)) { char *s = (char *)ut->context; uprv_free(s); - ut->context = NULL; + ut->context = nullptr; } } @@ -1614,14 +1614,14 @@ static const struct UTextFuncs utf8Funcs = utf8TextLength, utf8TextAccess, utf8TextExtract, - NULL, /* replace*/ - NULL, /* copy */ + nullptr, /* replace*/ + nullptr, /* copy */ utf8TextMapOffsetToNative, utf8TextMapIndexToUTF16, utf8TextClose, - NULL, // spare 1 - NULL, // spare 2 - NULL // spare 3 + nullptr, // spare 1 + nullptr, // spare 2 + nullptr // spare 3 }; @@ -1630,15 +1630,15 @@ static const char gEmptyString[] = {0}; U_CAPI UText * U_EXPORT2 utext_openUTF8(UText *ut, const char *s, int64_t length, UErrorCode *status) { if(U_FAILURE(*status)) { - return NULL; + return nullptr; } - if(s==NULL && length==0) { + if(s==nullptr && length==0) { s = gEmptyString; } - if(s==NULL || length<-1 || length>INT32_MAX) { + if(s==nullptr || length<-1 || length>INT32_MAX) { *status=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } ut = utext_setup(ut, sizeof(UTF8Buf) * 2, status); @@ -1701,7 +1701,7 @@ repTextClone(UText *dest, const UText *src, UBool deep, UErrorCode *status) { // For deep clones, make a copy of the Replaceable. // The copied Replaceable storage is owned by the newly created UText clone. - // A non-NULL pointer in UText.p is the signal to the close() function to delete + // A non-nullptr pointer in UText.p is the signal to the close() function to delete // it. // if (deep && U_SUCCESS(*status)) { @@ -1724,7 +1724,7 @@ repTextClose(UText *ut) { if (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_OWNS_TEXT)) { Replaceable *rep = (Replaceable *)ut->context; delete rep; - ut->context = NULL; + ut->context = nullptr; } } @@ -1865,7 +1865,7 @@ repTextExtract(UText *ut, if(U_FAILURE(*status)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0)) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0)) { *status=U_ILLEGAL_ARGUMENT_ERROR; } if(start>limit) { @@ -1908,7 +1908,7 @@ repTextReplace(UText *ut, if(U_FAILURE(*status)) { return 0; } - if(src==NULL && length!=0) { + if(src==nullptr && length!=0) { *status=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -2025,12 +2025,12 @@ static const struct UTextFuncs repFuncs = repTextExtract, repTextReplace, repTextCopy, - NULL, // MapOffsetToNative, - NULL, // MapIndexToUTF16, + nullptr, // MapOffsetToNative, + nullptr, // MapIndexToUTF16, repTextClose, - NULL, // spare 1 - NULL, // spare 2 - NULL // spare 3 + nullptr, // spare 1 + nullptr, // spare 2 + nullptr // spare 3 }; @@ -2038,11 +2038,11 @@ U_CAPI UText * U_EXPORT2 utext_openReplaceable(UText *ut, Replaceable *rep, UErrorCode *status) { if(U_FAILURE(*status)) { - return NULL; + return nullptr; } - if(rep==NULL) { + if(rep==nullptr) { *status=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } ut = utext_setup(ut, sizeof(ReplExtra), status); if(U_FAILURE(*status)) { @@ -2077,7 +2077,7 @@ U_CDECL_END // Use of UText data members: // context pointer to UnicodeString // p pointer to UnicodeString IF this UText owns the string -// and it must be deleted on close(). NULL otherwise. +// and it must be deleted on close(). nullptr otherwise. // //------------------------------------------------------------------------------ @@ -2091,7 +2091,7 @@ unistrTextClone(UText *dest, const UText *src, UBool deep, UErrorCode *status) { // For deep clones, make a copy of the UnicodeSring. // The copied UnicodeString storage is owned by the newly created UText clone. - // A non-NULL pointer in UText.p is the signal to the close() function to delete + // A non-nullptr pointer in UText.p is the signal to the close() function to delete // the UText. // if (deep && U_SUCCESS(*status)) { @@ -2113,7 +2113,7 @@ unistrTextClose(UText *ut) { if (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_OWNS_TEXT)) { UnicodeString *str = (UnicodeString *)ut->context; delete str; - ut->context = NULL; + ut->context = nullptr; } } @@ -2147,7 +2147,7 @@ unistrTextExtract(UText *t, if(U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0)) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } if(start<0 || start>limit) { @@ -2159,7 +2159,7 @@ unistrTextExtract(UText *t, int32_t limit32 = limitgetChar32Start((int32_t)limit) : length; length=limit32-start32; - if (destCapacity>0 && dest!=NULL) { + if (destCapacity>0 && dest!=nullptr) { int32_t trimmedLength = length; if(trimmedLength>destCapacity) { trimmedLength=destCapacity; @@ -2184,7 +2184,7 @@ unistrTextReplace(UText *ut, if(U_FAILURE(*pErrorCode)) { return 0; } - if(src==NULL && length!=0) { + if(src==nullptr && length!=0) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } if(start>limit) { @@ -2279,12 +2279,12 @@ static const struct UTextFuncs unistrFuncs = unistrTextExtract, unistrTextReplace, unistrTextCopy, - NULL, // MapOffsetToNative, - NULL, // MapIndexToUTF16, + nullptr, // MapOffsetToNative, + nullptr, // MapIndexToUTF16, unistrTextClose, - NULL, // spare 1 - NULL, // spare 2 - NULL // spare 3 + nullptr, // spare 1 + nullptr, // spare 2 + nullptr // spare 3 }; @@ -2308,7 +2308,7 @@ utext_openConstUnicodeString(UText *ut, const UnicodeString *s, UErrorCode *stat if (U_SUCCESS(*status) && s->isBogus()) { // The UnicodeString is bogus, but we still need to detach the UText // from whatever it was hooked to before, if anything. - utext_openUChars(ut, NULL, 0, status); + utext_openUChars(ut, nullptr, 0, status); *status = U_ILLEGAL_ARGUMENT_ERROR; return ut; } @@ -2351,7 +2351,7 @@ ucstrTextClone(UText *dest, const UText * src, UBool deep, UErrorCode * status) // For deep clones, make a copy of the string. // The copied storage is owned by the newly created clone. - // A non-NULL pointer in UText.p is the signal to the close() function to delete + // A non-nullptr pointer in UText.p is the signal to the close() function to delete // it. // if (deep && U_SUCCESS(*status)) { @@ -2361,7 +2361,7 @@ ucstrTextClone(UText *dest, const UText * src, UBool deep, UErrorCode * status) // The cloned string IS going to be NUL terminated, whether or not the original was. const UChar *srcStr = (const UChar *)src->context; UChar *copyStr = (UChar *)uprv_malloc((len+1) * sizeof(UChar)); - if (copyStr == NULL) { + if (copyStr == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } else { int64_t i; @@ -2385,7 +2385,7 @@ ucstrTextClose(UText *ut) { if (ut->providerProperties & I32_FLAG(UTEXT_PROVIDER_OWNS_TEXT)) { UChar *s = (UChar *)ut->context; uprv_free(s); - ut->context = NULL; + ut->context = nullptr; } } @@ -2511,7 +2511,7 @@ ucstrTextExtract(UText *ut, if(U_FAILURE(*pErrorCode)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0) || start>limit) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0) || start>limit) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -2596,14 +2596,14 @@ static const struct UTextFuncs ucstrFuncs = ucstrTextLength, ucstrTextAccess, ucstrTextExtract, - NULL, // Replace - NULL, // Copy - NULL, // MapOffsetToNative, - NULL, // MapIndexToUTF16, + nullptr, // Replace + nullptr, // Copy + nullptr, // MapOffsetToNative, + nullptr, // MapIndexToUTF16, ucstrTextClose, - NULL, // spare 1 - NULL, // spare 2 - NULL, // spare 3 + nullptr, // spare 1 + nullptr, // spare 2 + nullptr, // spare 3 }; U_CDECL_END @@ -2613,14 +2613,14 @@ static const UChar gEmptyUString[] = {0}; U_CAPI UText * U_EXPORT2 utext_openUChars(UText *ut, const UChar *s, int64_t length, UErrorCode *status) { if (U_FAILURE(*status)) { - return NULL; + return nullptr; } - if(s==NULL && length==0) { + if(s==nullptr && length==0) { s = gEmptyUString; } - if (s==NULL || length < -1 || length>INT32_MAX) { + if (s==nullptr || length < -1 || length>INT32_MAX) { *status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } ut = utext_setup(ut, 0, status); if (U_SUCCESS(*status)) { @@ -2667,7 +2667,7 @@ charIterTextClose(UText *ut) { // owns it. This occurs if the UText was created by cloning. CharacterIterator *ci = (CharacterIterator *)ut->r; delete ci; - ut->r = NULL; + ut->r = nullptr; } static int64_t U_CALLCONV @@ -2697,7 +2697,7 @@ charIterTextAccess(UText *ut, int64_t index, UBool forward) { // Find the native index of the start of the buffer containing what we want. neededIndex -= neededIndex % CIBufSize; - UChar *buf = NULL; + UChar *buf = nullptr; UBool needChunkSetup = true; int i; if (ut->chunkNativeStart == neededIndex) { @@ -2748,13 +2748,13 @@ charIterTextAccess(UText *ut, int64_t index, UBool forward) { static UText * U_CALLCONV charIterTextClone(UText *dest, const UText *src, UBool deep, UErrorCode * status) { if (U_FAILURE(*status)) { - return NULL; + return nullptr; } if (deep) { // There is no CharacterIterator API for cloning the underlying text storage. *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } else { CharacterIterator *srcCI =(CharacterIterator *)src->context; srcCI = srcCI->clone(); @@ -2780,7 +2780,7 @@ charIterTextExtract(UText *ut, if(U_FAILURE(*status)) { return 0; } - if(destCapacity<0 || (dest==NULL && destCapacity>0) || start>limit) { + if(destCapacity<0 || (dest==nullptr && destCapacity>0) || start>limit) { *status=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -2823,14 +2823,14 @@ static const struct UTextFuncs charIterFuncs = charIterTextLength, charIterTextAccess, charIterTextExtract, - NULL, // Replace - NULL, // Copy - NULL, // MapOffsetToNative, - NULL, // MapIndexToUTF16, + nullptr, // Replace + nullptr, // Copy + nullptr, // MapOffsetToNative, + nullptr, // MapIndexToUTF16, charIterTextClose, - NULL, // spare 1 - NULL, // spare 2 - NULL // spare 3 + nullptr, // spare 1 + nullptr, // spare 2 + nullptr // spare 3 }; U_CDECL_END @@ -2838,13 +2838,13 @@ U_CDECL_END U_CAPI UText * U_EXPORT2 utext_openCharacterIterator(UText *ut, CharacterIterator *ci, UErrorCode *status) { if (U_FAILURE(*status)) { - return NULL; + return nullptr; } if (ci->startIndex() > 0) { // No support for CharacterIterators that do not start indexing from zero. *status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } // Extra space in UText for 2 buffers of CIBufSize UChars each. diff --git a/icu4c/source/common/utf_impl.cpp b/icu4c/source/common/utf_impl.cpp index a1f9c6529a7..827a82daf40 100644 --- a/icu4c/source/common/utf_impl.cpp +++ b/icu4c/source/common/utf_impl.cpp @@ -213,7 +213,7 @@ utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool } } /* c>0x10ffff or not enough space, write an error value */ - if(pIsError!=NULL) { + if(pIsError!=nullptr) { *pIsError=true; } else { length-=i; diff --git a/icu4c/source/common/util.cpp b/icu4c/source/common/util.cpp index 3dcc05578b7..1d7ff9b115a 100644 --- a/icu4c/source/common/util.cpp +++ b/icu4c/source/common/util.cpp @@ -425,7 +425,7 @@ void ICU_Utility::appendToRule(UnicodeString& rule, const UnicodeMatcher* matcher, UBool escapeUnprintable, UnicodeString& quoteBuf) { - if (matcher != NULL) { + if (matcher != nullptr) { UnicodeString pat; appendToRule(rule, matcher->toPattern(pat, escapeUnprintable), true, escapeUnprintable, quoteBuf); diff --git a/icu4c/source/common/utrace.cpp b/icu4c/source/common/utrace.cpp index f7b8ade6743..a64762bdd59 100644 --- a/icu4c/source/common/utrace.cpp +++ b/icu4c/source/common/utrace.cpp @@ -18,10 +18,10 @@ #include "ucln_cmn.h" -static UTraceEntry *pTraceEntryFunc = NULL; -static UTraceExit *pTraceExitFunc = NULL; -static UTraceData *pTraceDataFunc = NULL; -static const void *gTraceContext = NULL; +static UTraceEntry *pTraceEntryFunc = nullptr; +static UTraceExit *pTraceExitFunc = nullptr; +static UTraceData *pTraceDataFunc = nullptr; +static const void *gTraceContext = nullptr; /** * \var utrace_level @@ -32,7 +32,7 @@ utrace_level = UTRACE_ERROR; U_CAPI void U_EXPORT2 utrace_entry(int32_t fnNumber) { - if (pTraceEntryFunc != NULL) { + if (pTraceEntryFunc != nullptr) { (*pTraceEntryFunc)(gTraceContext, fnNumber); } } @@ -46,7 +46,7 @@ static const char gExitFmtPtrStatus[] = "Returns %d. Status = %p."; U_CAPI void U_EXPORT2 utrace_exit(int32_t fnNumber, int32_t returnType, ...) { - if (pTraceExitFunc != NULL) { + if (pTraceExitFunc != nullptr) { va_list args; const char *fmt; @@ -80,7 +80,7 @@ utrace_exit(int32_t fnNumber, int32_t returnType, ...) { U_CAPI void U_EXPORT2 utrace_data(int32_t fnNumber, int32_t level, const char *fmt, ...) { - if (pTraceDataFunc != NULL) { + if (pTraceDataFunc != nullptr) { va_list args; va_start(args, fmt ); (*pTraceDataFunc)(gTraceContext, fnNumber, level, fmt, args); @@ -117,9 +117,9 @@ static void outputChar(char c, char *outBuf, int32_t *outIx, int32_t capacity, i outBuf[*outIx] = c; } if (c != 0) { - /* Nulls only appear as end-of-string terminators. Move them to the output + /* NULs only appear as end-of-string terminators. Move them to the output * buffer, but do not update the length of the buffer, so that any - * following output will overwrite the null. */ + * following output will overwrite the NUL. */ (*outIx)++; } } @@ -157,7 +157,7 @@ static void outputPtrBytes(void *val, char *outBuf, int32_t *outIx, int32_t capa static void outputString(const char *s, char *outBuf, int32_t *outIx, int32_t capacity, int32_t indent) { int32_t i = 0; char c; - if (s==NULL) { + if (s==nullptr) { s = "*NULL*"; } do { @@ -172,8 +172,8 @@ static void outputUString(const UChar *s, int32_t len, char *outBuf, int32_t *outIx, int32_t capacity, int32_t indent) { int32_t i = 0; UChar c; - if (s==NULL) { - outputString(NULL, outBuf, outIx, capacity, indent); + if (s==nullptr) { + outputString(nullptr, outBuf, outIx, capacity, indent); return; } @@ -205,7 +205,7 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, /* Literal character, not part of a %sequence. Just copy it to the output. */ outputChar(fmtC, outBuf, &outIx, capacity, indent); if (fmtC == 0) { - /* We hit the null that terminates the format string. + /* We hit the NUL that terminates the format string. * This is the normal (and only) exit from the loop that * interprets the format */ @@ -225,13 +225,13 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, break; case 's': - /* char * string, null terminated. */ + /* char * string, NUL terminated. */ ptrArg = va_arg(args, char *); outputString((const char *)ptrArg, outBuf, &outIx, capacity, indent); break; case 'S': - /* UChar * string, with length, len==-1 for null terminated. */ + /* UChar * string, with length, len==-1 for NUL terminated. */ ptrArg = va_arg(args, char *); /* Ptr */ intArg =(int32_t)va_arg(args, int32_t); /* Length */ outputUString((const UChar *)ptrArg, intArg, outBuf, &outIx, capacity, indent); @@ -269,7 +269,7 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, case 0: /* Single '%' at end of fmt string. Output as literal '%'. - * Back up index into format string so that the terminating null will be + * Back up index into format string so that the terminating NUL will be * re-fetched in the outer loop, causing it to terminate. */ outputChar('%', outBuf, &outIx, capacity, indent); @@ -299,7 +299,7 @@ utrace_vformat(char *outBuf, int32_t capacity, int32_t indent, const char *fmt, i64Ptr = (int64_t *)i8Ptr; ptrPtr = (void **)i8Ptr; vectorLen =(int32_t)va_arg(args, int32_t); - if (ptrPtr == NULL) { + if (ptrPtr == nullptr) { outputString("*NULL* ", outBuf, &outIx, capacity, indent); } else { for (i=0; iisAllocated= (UBool)(fillIn==NULL); + trie->isAllocated= (UBool)(fillIn==nullptr); - if(aliasData!=NULL) { + if(aliasData!=nullptr) { trie->data=aliasData; trie->isDataAllocated=false; } else { trie->data=(uint32_t *)uprv_malloc(maxDataLength*4); - if(trie->data==NULL) { + if(trie->data==nullptr) { uprv_free(trie); - return NULL; + return nullptr; } trie->isDataAllocated=true; } @@ -118,18 +118,18 @@ utrie_clone(UNewTrie *fillIn, const UNewTrie *other, uint32_t *aliasData, int32_ UBool isDataAllocated; /* do not clone if other is not valid or already compacted */ - if(other==NULL || other->data==NULL || other->isCompacted) { - return NULL; + if(other==nullptr || other->data==nullptr || other->isCompacted) { + return nullptr; } /* clone data */ - if(aliasData!=NULL && aliasDataCapacity>=other->dataCapacity) { + if(aliasData!=nullptr && aliasDataCapacity>=other->dataCapacity) { isDataAllocated=false; } else { aliasDataCapacity=other->dataCapacity; aliasData=(uint32_t *)uprv_malloc(other->dataCapacity*4); - if(aliasData==NULL) { - return NULL; + if(aliasData==nullptr) { + return nullptr; } isDataAllocated=true; } @@ -137,7 +137,7 @@ utrie_clone(UNewTrie *fillIn, const UNewTrie *other, uint32_t *aliasData, int32_ trie=utrie_open(fillIn, aliasData, aliasDataCapacity, other->data[0], other->leadUnitValue, other->isLatin1Linear); - if(trie==NULL) { + if(trie==nullptr) { uprv_free(aliasData); } else { uprv_memcpy(trie->index, other->index, sizeof(trie->index)); @@ -151,10 +151,10 @@ utrie_clone(UNewTrie *fillIn, const UNewTrie *other, uint32_t *aliasData, int32_ U_CAPI void U_EXPORT2 utrie_close(UNewTrie *trie) { - if(trie!=NULL) { + if(trie!=nullptr) { if(trie->isDataAllocated) { uprv_free(trie->data); - trie->data=NULL; + trie->data=nullptr; } if(trie->isAllocated) { uprv_free(trie); @@ -164,8 +164,8 @@ utrie_close(UNewTrie *trie) { U_CAPI uint32_t * U_EXPORT2 utrie_getData(UNewTrie *trie, int32_t *pLength) { - if(trie==NULL || pLength==NULL) { - return NULL; + if(trie==nullptr || pLength==nullptr) { + return nullptr; } *pLength=trie->dataLength; @@ -223,7 +223,7 @@ utrie_set32(UNewTrie *trie, UChar32 c, uint32_t value) { int32_t block; /* valid, uncompacted trie and valid c? */ - if(trie==NULL || trie->isCompacted || (uint32_t)c>0x10ffff) { + if(trie==nullptr || trie->isCompacted || (uint32_t)c>0x10ffff) { return false; } @@ -241,15 +241,15 @@ utrie_get32(UNewTrie *trie, UChar32 c, UBool *pInBlockZero) { int32_t block; /* valid, uncompacted trie and valid c? */ - if(trie==NULL || trie->isCompacted || (uint32_t)c>0x10ffff) { - if(pInBlockZero!=NULL) { + if(trie==nullptr || trie->isCompacted || (uint32_t)c>0x10ffff) { + if(pInBlockZero!=nullptr) { *pInBlockZero=true; } return 0; } block=trie->index[c>>UTRIE_SHIFT]; - if(pInBlockZero!=NULL) { + if(pInBlockZero!=nullptr) { *pInBlockZero= (UBool)(block==0); } @@ -291,7 +291,7 @@ utrie_setRange32(UNewTrie *trie, UChar32 start, UChar32 limit, uint32_t value, U int32_t block, rest, repeatBlock; /* valid, uncompacted trie and valid indexes? */ - if( trie==NULL || trie->isCompacted || + if( trie==nullptr || trie->isCompacted || (uint32_t)start>0x10ffff || (uint32_t)limit>0x110000 || start>limit ) { return false; @@ -473,7 +473,7 @@ utrie_fold(UNewTrie *trie, UNewTrieGetFoldedValue *getFoldedValue, UErrorCode *p * set it for the lead surrogate code unit */ value=getFoldedValue(trie, c, block+UTRIE_SURROGATE_BLOCK_COUNT); - if(value!=utrie_get32(trie, U16_LEAD(c), NULL)) { + if(value!=utrie_get32(trie, U16_LEAD(c), nullptr)) { if(!utrie_set32(trie, U16_LEAD(c), value)) { /* data table overflow */ *pErrorCode=U_MEMORY_ALLOCATION_ERROR; @@ -590,12 +590,12 @@ static void utrie_compact(UNewTrie *trie, UBool overlap, UErrorCode *pErrorCode) { int32_t i, start, newStart, overlapStart; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return; } /* valid, uncompacted trie? */ - if(trie==NULL) { + if(trie==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -747,18 +747,18 @@ utrie_serialize(UNewTrie *trie, void *dt, int32_t capacity, uint32_t *p; uint16_t *dest16; int32_t i, length; - uint8_t* data = NULL; + uint8_t* data = nullptr; /* argument check */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(trie==NULL || capacity<0 || (capacity>0 && dt==NULL)) { + if(trie==nullptr || capacity<0 || (capacity>0 && dt==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } - if(getFoldedValue==NULL) { + if(getFoldedValue==nullptr) { getFoldedValue=defaultGetFoldedValue; } @@ -859,7 +859,7 @@ utrie_unserialize(UTrie *trie, const void *data, int32_t length, UErrorCode *pEr const uint16_t *p16; uint32_t options; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return -1; } @@ -918,7 +918,7 @@ utrie_unserialize(UTrie *trie, const void *data, int32_t length, UErrorCode *pEr } /* the "data16" data is used via the index pointer */ - trie->data32=NULL; + trie->data32=nullptr; trie->initialValue=trie->index[trie->indexLength]; length=(int32_t)sizeof(UTrieHeader)+2*trie->indexLength+2*trie->dataLength; } @@ -938,7 +938,7 @@ utrie_unserializeDummy(UTrie *trie, int32_t actualLength, latin1Length, i, limit; uint16_t block; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return -1; } @@ -991,7 +991,7 @@ utrie_unserializeDummy(UTrie *trie, } } - trie->data32=NULL; + trie->data32=nullptr; /* Latin-1 data */ p16+=trie->indexLength; @@ -1066,10 +1066,10 @@ utrie_enum(const UTrie *trie, int32_t l, i, j, block, prevBlock, nullBlock, offset; /* check arguments */ - if(trie==NULL || trie->index==NULL || enumRange==NULL) { + if(trie==nullptr || trie->index==nullptr || enumRange==nullptr) { return; } - if(enumValue==NULL) { + if(enumValue==nullptr) { enumValue=enumSameValue; } @@ -1079,7 +1079,7 @@ utrie_enum(const UTrie *trie, /* get the enumeration value that corresponds to an initial-value trie data entry */ initialValue=enumValue(context, trie->initialValue); - if(data32==NULL) { + if(data32==nullptr) { nullBlock=trie->indexLength; } else { nullBlock=0; @@ -1120,7 +1120,7 @@ utrie_enum(const UTrie *trie, } else { prevBlock=block; for(j=0; jgetFoldingOffset(value); @@ -1206,7 +1206,7 @@ utrie_enum(const UTrie *trie, } else { prevBlock=block; for(j=0; jdata16!=NULL) { + if(trie->data16!=nullptr) { return UTRIE2_GET16(trie, c); - } else if(trie->data32!=NULL) { + } else if(trie->data32!=nullptr) { return UTRIE2_GET32(trie, c); } else if((uint32_t)c>0x10ffff) { return trie->errorValue; @@ -75,9 +75,9 @@ utrie2_get32FromLeadSurrogateCodeUnit(const UTrie2 *trie, UChar32 c) { if(!U_IS_LEAD(c)) { return trie->errorValue; } - if(trie->data16!=NULL) { + if(trie->data16!=nullptr) { return UTRIE2_GET16_FROM_U16_SINGLE_LEAD(trie, c); - } else if(trie->data32!=NULL) { + } else if(trie->data32!=nullptr) { return UTRIE2_GET32_FROM_U16_SINGLE_LEAD(trie, c); } else { return get32(trie->newTrie, c, false); @@ -89,7 +89,7 @@ u8Index(const UTrie2 *trie, UChar32 c, int32_t i) { int32_t idx= _UTRIE2_INDEX_FROM_CP( trie, - trie->data32==NULL ? trie->indexLength : 0, + trie->data32==nullptr ? trie->indexLength : 0, c); return (idx<<3)|i; } @@ -193,7 +193,7 @@ utrie2_openFromSerialized(UTrie2ValueBits valueBits, /* allocate the trie */ trie=(UTrie2 *)uprv_malloc(sizeof(UTrie2)); - if(trie==NULL) { + if(trie==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -214,12 +214,12 @@ utrie2_openFromSerialized(UTrie2ValueBits valueBits, switch(valueBits) { case UTRIE2_16_VALUE_BITS: trie->data16=p16; - trie->data32=NULL; + trie->data32=nullptr; trie->initialValue=trie->index[trie->dataNullOffset]; trie->errorValue=trie->data16[UTRIE2_BAD_UTF8_DATA_OFFSET]; break; case UTRIE2_32_VALUE_BITS: - trie->data16=NULL; + trie->data16=nullptr; trie->data32=(const uint32_t *)p16; trie->initialValue=trie->data32[trie->dataNullOffset]; trie->errorValue=trie->data32[UTRIE2_BAD_UTF8_DATA_OFFSET]; @@ -229,7 +229,7 @@ utrie2_openFromSerialized(UTrie2ValueBits valueBits, return 0; } - if(pActualLength!=NULL) { + if(pActualLength!=nullptr) { *pActualLength=actualLength; } return trie; @@ -267,13 +267,13 @@ utrie2_openDummy(UTrie2ValueBits valueBits, /* allocate the trie */ trie=(UTrie2 *)uprv_malloc(sizeof(UTrie2)); - if(trie==NULL) { + if(trie==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return 0; } uprv_memset(trie, 0, sizeof(UTrie2)); trie->memory=uprv_malloc(length); - if(trie->memory==NULL) { + if(trie->memory==nullptr) { uprv_free(trie); *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return 0; @@ -334,7 +334,7 @@ utrie2_openDummy(UTrie2ValueBits valueBits, case UTRIE2_16_VALUE_BITS: /* write 16-bit data values */ trie->data16=dest16; - trie->data32=NULL; + trie->data32=nullptr; for(i=0; i<0x80; ++i) { *dest16++=(uint16_t)initialValue; } @@ -349,7 +349,7 @@ utrie2_openDummy(UTrie2ValueBits valueBits, case UTRIE2_32_VALUE_BITS: /* write 32-bit data values */ p=(uint32_t *)dest16; - trie->data16=NULL; + trie->data16=nullptr; trie->data32=p; for(i=0; i<0x80; ++i) { *p++=initialValue; @@ -372,11 +372,11 @@ utrie2_openDummy(UTrie2ValueBits valueBits, U_CAPI void U_EXPORT2 utrie2_close(UTrie2 *trie) { - if(trie!=NULL) { + if(trie!=nullptr) { if(trie->isMemoryOwned) { uprv_free(trie->memory); } - if(trie->newTrie!=NULL) { + if(trie->newTrie!=nullptr) { uprv_free(trie->newTrie->data); #ifdef UCPTRIE_DEBUG umutablecptrie_close(trie->newTrie->t3); @@ -389,7 +389,7 @@ utrie2_close(UTrie2 *trie) { U_CAPI UBool U_EXPORT2 utrie2_isFrozen(const UTrie2 *trie) { - return (UBool)(trie->newTrie==NULL); + return (UBool)(trie->newTrie==nullptr); } U_CAPI int32_t U_EXPORT2 @@ -401,8 +401,8 @@ utrie2_serialize(const UTrie2 *trie, return 0; } - if( trie==NULL || trie->memory==NULL || trie->newTrie!=NULL || - capacity<0 || (capacity>0 && (data==NULL || (U_POINTER_MASK_LSB(data, 3)!=0))) + if( trie==nullptr || trie->memory==nullptr || trie->newTrie!=nullptr || + capacity<0 || (capacity>0 && (data==nullptr || (U_POINTER_MASK_LSB(data, 3)!=0))) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -450,26 +450,26 @@ enumEitherTrie(const UTrie2 *trie, UChar32 c, prev, highStart; int32_t j, i2Block, prevI2Block, index2NullOffset, block, prevBlock, nullBlock; - if(enumRange==NULL) { + if(enumRange==nullptr) { return; } - if(enumValue==NULL) { + if(enumValue==nullptr) { enumValue=enumSameValue; } - if(trie->newTrie==NULL) { + if(trie->newTrie==nullptr) { /* frozen trie */ idx=trie->index; - U_ASSERT(idx!=NULL); /* the following code assumes trie->newTrie is not NULL when idx is NULL */ + U_ASSERT(idx!=nullptr); /* the following code assumes trie->newTrie is not nullptr when idx is nullptr */ data32=trie->data32; index2NullOffset=trie->index2NullOffset; nullBlock=trie->dataNullOffset; } else { /* unfrozen, mutable trie */ - idx=NULL; + idx=nullptr; data32=trie->newTrie->data; - U_ASSERT(data32!=NULL); /* the following code assumes idx is not NULL when data32 is NULL */ + U_ASSERT(data32!=nullptr); /* the following code assumes idx is not nullptr when data32 is nullptr */ index2NullOffset=trie->newTrie->index2NullOffset; nullBlock=trie->newTrie->dataNullOffset; @@ -513,7 +513,7 @@ enumEitherTrie(const UTrie2 *trie, } } else { /* supplementary code points */ - if(idx!=NULL) { + if(idx!=nullptr) { i2Block=idx[(UTRIE2_INDEX_1_OFFSET-UTRIE2_OMITTED_BMP_INDEX_1_LENGTH)+ (c>>UTRIE2_SHIFT_1)]; } else { @@ -551,7 +551,7 @@ enumEitherTrie(const UTrie2 *trie, i2Limit=UTRIE2_INDEX_2_BLOCK_LENGTH; } for(; i2newTrie->index2[i2Block+i2]; @@ -574,7 +574,7 @@ enumEitherTrie(const UTrie2 *trie, c+=UTRIE2_DATA_BLOCK_LENGTH; } else { for(j=0; jhighValueIndex] : idx[trie->highValueIndex]; } else { diff --git a/icu4c/source/common/utrie2.h b/icu4c/source/common/utrie2.h index ace52cce37b..8a204008b30 100644 --- a/icu4c/source/common/utrie2.h +++ b/icu4c/source/common/utrie2.h @@ -619,7 +619,7 @@ public: class ForwardUTrie2StringIterator : public UTrie2StringIterator { public: - // Iteration limit l can be NULL. + // Iteration limit l can be nullptr. // In that case, the caller must detect c==0 and stop. ForwardUTrie2StringIterator(const UTrie2 *t, const UChar *p, const UChar *l) : UTrie2StringIterator(t, p), limit(l) {} diff --git a/icu4c/source/common/utrie2_builder.cpp b/icu4c/source/common/utrie2_builder.cpp index 2513332b80a..93656b0de4f 100644 --- a/icu4c/source/common/utrie2_builder.cpp +++ b/icu4c/source/common/utrie2_builder.cpp @@ -120,13 +120,13 @@ utrie2_open(uint32_t initialValue, uint32_t errorValue, UErrorCode *pErrorCode) int32_t i, j; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } trie=(UTrie2 *)uprv_malloc(sizeof(UTrie2)); newTrie=(UNewTrie2 *)uprv_malloc(sizeof(UNewTrie2)); data=(uint32_t *)uprv_malloc(UNEWTRIE2_INITIAL_DATA_LENGTH*4); - if(trie==NULL || newTrie==NULL || data==NULL) { + if(trie==nullptr || newTrie==nullptr || data==nullptr) { uprv_free(trie); uprv_free(newTrie); uprv_free(data); @@ -250,14 +250,14 @@ cloneBuilder(const UNewTrie2 *other) { UNewTrie2 *trie; trie=(UNewTrie2 *)uprv_malloc(sizeof(UNewTrie2)); - if(trie==NULL) { - return NULL; + if(trie==nullptr) { + return nullptr; } trie->data=(uint32_t *)uprv_malloc(other->dataCapacity*4); - if(trie->data==NULL) { + if(trie->data==nullptr) { uprv_free(trie); - return NULL; + return nullptr; } #ifdef UCPTRIE_DEBUG if(other->t3==nullptr) { @@ -300,43 +300,43 @@ utrie2_clone(const UTrie2 *other, UErrorCode *pErrorCode) { UTrie2 *trie; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if(other==NULL || (other->memory==NULL && other->newTrie==NULL)) { + if(other==nullptr || (other->memory==nullptr && other->newTrie==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } trie=(UTrie2 *)uprv_malloc(sizeof(UTrie2)); - if(trie==NULL) { + if(trie==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } uprv_memcpy(trie, other, sizeof(UTrie2)); - if(other->memory!=NULL) { + if(other->memory!=nullptr) { trie->memory=uprv_malloc(other->length); - if(trie->memory!=NULL) { + if(trie->memory!=nullptr) { trie->isMemoryOwned=true; uprv_memcpy(trie->memory, other->memory, other->length); /* make the clone's pointers point to its own memory */ trie->index=(uint16_t *)trie->memory+(other->index-(uint16_t *)other->memory); - if(other->data16!=NULL) { + if(other->data16!=nullptr) { trie->data16=(uint16_t *)trie->memory+(other->data16-(uint16_t *)other->memory); } - if(other->data32!=NULL) { + if(other->data32!=nullptr) { trie->data32=(uint32_t *)trie->memory+(other->data32-(uint32_t *)other->memory); } } - } else /* other->newTrie!=NULL */ { + } else /* other->newTrie!=nullptr */ { trie->newTrie=cloneBuilder(other->newTrie); } - if(trie->memory==NULL && trie->newTrie==NULL) { + if(trie->memory==nullptr && trie->newTrie==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; uprv_free(trie); - trie=NULL; + trie=nullptr; } return trie; } @@ -386,7 +386,7 @@ static void utrie_printLengths(const UTrie *trie) { long indexLength=trie->indexLength; long dataLength=(long)trie->dataLength; - long totalLength=(long)sizeof(UTrieHeader)+indexLength*2+dataLength*(trie->data32!=NULL ? 4 : 2); + long totalLength=(long)sizeof(UTrieHeader)+indexLength*2+dataLength*(trie->data32!=nullptr ? 4 : 2); printf("**UTrieLengths** index:%6ld data:%6ld serialized:%6ld\n", indexLength, dataLength, totalLength); } @@ -395,7 +395,7 @@ static void utrie2_printLengths(const UTrie2 *trie, const char *which) { long indexLength=trie->indexLength; long dataLength=(long)trie->dataLength; - long totalLength=(long)sizeof(UTrie2Header)+indexLength*2+dataLength*(trie->data32!=NULL ? 4 : 2); + long totalLength=(long)sizeof(UTrie2Header)+indexLength*2+dataLength*(trie->data32!=nullptr ? 4 : 2); printf("**UTrie2Lengths(%s %s)** index:%6ld data:%6ld countInitial:%6ld serialized:%6ld\n", which, trie->name, indexLength, dataLength, countInitial(trie), totalLength); } @@ -407,28 +407,28 @@ utrie2_cloneAsThawed(const UTrie2 *other, UErrorCode *pErrorCode) { UChar lead; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if(other==NULL || (other->memory==NULL && other->newTrie==NULL)) { + if(other==nullptr || (other->memory==nullptr && other->newTrie==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(other->newTrie!=NULL && !other->newTrie->isCompacted) { + if(other->newTrie!=nullptr && !other->newTrie->isCompacted) { return utrie2_clone(other, pErrorCode); /* clone an unfrozen trie */ } /* Clone the frozen trie by enumerating it and building a new one. */ context.trie=utrie2_open(other->initialValue, other->errorValue, pErrorCode); if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } context.exclusiveLimit=false; context.errorCode=*pErrorCode; - utrie2_enum(other, NULL, copyEnumRange, &context); + utrie2_enum(other, nullptr, copyEnumRange, &context); *pErrorCode=context.errorCode; for(lead=0xd800; lead<0xdc00; ++lead) { uint32_t value; - if(other->data32==NULL) { + if(other->data32==nullptr) { value=UTRIE2_GET16_FROM_U16_SINGLE_LEAD(other, lead); } else { value=UTRIE2_GET32_FROM_U16_SINGLE_LEAD(other, lead); @@ -439,7 +439,7 @@ utrie2_cloneAsThawed(const UTrie2 *other, UErrorCode *pErrorCode) { } if(U_FAILURE(*pErrorCode)) { utrie2_close(context.trie); - context.trie=NULL; + context.trie=nullptr; } return context.trie; } @@ -451,23 +451,23 @@ utrie2_fromUTrie(const UTrie *trie1, uint32_t errorValue, UErrorCode *pErrorCode UChar lead; if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } - if(trie1==NULL) { + if(trie1==nullptr) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } context.trie=utrie2_open(trie1->initialValue, errorValue, pErrorCode); if(U_FAILURE(*pErrorCode)) { - return NULL; + return nullptr; } context.exclusiveLimit=true; context.errorCode=*pErrorCode; - utrie_enum(trie1, NULL, copyEnumRange, &context); + utrie_enum(trie1, nullptr, copyEnumRange, &context); *pErrorCode=context.errorCode; for(lead=0xd800; lead<0xdc00; ++lead) { uint32_t value; - if(trie1->data32==NULL) { + if(trie1->data32==nullptr) { value=UTRIE_GET16_FROM_LEAD(trie1, lead); } else { value=UTRIE_GET32_FROM_LEAD(trie1, lead); @@ -478,7 +478,7 @@ utrie2_fromUTrie(const UTrie *trie1, uint32_t errorValue, UErrorCode *pErrorCode } if(U_SUCCESS(*pErrorCode)) { utrie2_freeze(context.trie, - trie1->data32!=NULL ? UTRIE2_32_VALUE_BITS : UTRIE2_16_VALUE_BITS, + trie1->data32!=nullptr ? UTRIE2_32_VALUE_BITS : UTRIE2_16_VALUE_BITS, pErrorCode); } #ifdef UTRIE2_DEBUG @@ -489,7 +489,7 @@ utrie2_fromUTrie(const UTrie *trie1, uint32_t errorValue, UErrorCode *pErrorCode #endif if(U_FAILURE(*pErrorCode)) { utrie2_close(context.trie); - context.trie=NULL; + context.trie=nullptr; } return context.trie; } @@ -578,7 +578,7 @@ allocDataBlock(UNewTrie2 *trie, int32_t copyBlock) { return -1; } data=(uint32_t *)uprv_malloc(capacity*4); - if(data==NULL) { + if(data==nullptr) { return -1; } uprv_memcpy(data, trie->data, (size_t)trie->dataLength*4); @@ -657,7 +657,7 @@ set32(UNewTrie2 *trie, UErrorCode *pErrorCode) { int32_t block; - if(trie==NULL || trie->isCompacted) { + if(trie==nullptr || trie->isCompacted) { *pErrorCode=U_NO_WRITE_PERMISSION; return; } @@ -755,7 +755,7 @@ utrie2_setRange32(UTrie2 *trie, return; } newTrie=trie->newTrie; - if(newTrie==NULL || newTrie->isCompacted) { + if(newTrie==nullptr || newTrie->isCompacted) { *pErrorCode=U_NO_WRITE_PERMISSION; return; } @@ -1317,17 +1317,17 @@ utrie2_freeze(UTrie2 *trie, UTrie2ValueBits valueBits, UErrorCode *pErrorCode) { if(U_FAILURE(*pErrorCode)) { return; } - if( trie==NULL || + if( trie==nullptr || valueBits<0 || UTRIE2_COUNT_VALUE_BITS<=valueBits ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } newTrie=trie->newTrie; - if(newTrie==NULL) { + if(newTrie==nullptr) { /* already frozen */ UTrie2ValueBits frozenValueBits= - trie->data16!=NULL ? UTRIE2_16_VALUE_BITS : UTRIE2_32_VALUE_BITS; + trie->data16!=nullptr ? UTRIE2_16_VALUE_BITS : UTRIE2_32_VALUE_BITS; if(valueBits!=frozenValueBits) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; } @@ -1377,7 +1377,7 @@ utrie2_freeze(UTrie2 *trie, UTrie2ValueBits valueBits, UErrorCode *pErrorCode) { } trie->memory=uprv_malloc(length); - if(trie->memory==NULL) { + if(trie->memory==nullptr) { *pErrorCode=U_MEMORY_ALLOCATION_ERROR; return; } @@ -1449,7 +1449,7 @@ utrie2_freeze(UTrie2 *trie, UTrie2ValueBits valueBits, UErrorCode *pErrorCode) { case UTRIE2_16_VALUE_BITS: /* write 16-bit data values */ trie->data16=dest16; - trie->data32=NULL; + trie->data32=nullptr; p=newTrie->data; for(i=newTrie->dataLength; i>0; --i) { *dest16++=(uint16_t)*p++; @@ -1457,7 +1457,7 @@ utrie2_freeze(UTrie2 *trie, UTrie2ValueBits valueBits, UErrorCode *pErrorCode) { break; case UTRIE2_32_VALUE_BITS: /* write 32-bit data values */ - trie->data16=NULL; + trie->data16=nullptr; trie->data32=(uint32_t *)dest16; uprv_memcpy(dest16, newTrie->data, (size_t)newTrie->dataLength*4); break; @@ -1479,5 +1479,5 @@ utrie2_freeze(UTrie2 *trie, UTrie2ValueBits valueBits, UErrorCode *pErrorCode) { /* Delete the UNewTrie2. */ uprv_free(newTrie->data); uprv_free(newTrie); - trie->newTrie=NULL; + trie->newTrie=nullptr; } diff --git a/icu4c/source/common/utrie_swap.cpp b/icu4c/source/common/utrie_swap.cpp index b01b94601e4..83d183699d1 100644 --- a/icu4c/source/common/utrie_swap.cpp +++ b/icu4c/source/common/utrie_swap.cpp @@ -31,10 +31,10 @@ utrie_swap(const UDataSwapper *ds, int32_t size; UBool dataIs32; - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || (length>=0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || (length>=0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -105,7 +105,7 @@ utrie2_swap(const UDataSwapper *ds, if(U_FAILURE(*pErrorCode)) { return 0; } - if(ds==NULL || inData==NULL || (length>=0 && outData==NULL)) { + if(ds==nullptr || inData==nullptr || (length>=0 && outData==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } diff --git a/icu4c/source/common/uts46.cpp b/icu4c/source/common/uts46.cpp index 10a4f565973..f1d757b5b9a 100644 --- a/icu4c/source/common/uts46.cpp +++ b/icu4c/source/common/uts46.cpp @@ -201,22 +201,22 @@ IDNA * IDNA::createUTS46Instance(uint32_t options, UErrorCode &errorCode) { if(U_SUCCESS(errorCode)) { IDNA *idna=new UTS46(options, errorCode); - if(idna==NULL) { + if(idna==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; } else if(U_FAILURE(errorCode)) { delete idna; - idna=NULL; + idna=nullptr; } return idna; } else { - return NULL; + return nullptr; } } // UTS46 implementation ---------------------------------------------------- *** UTS46::UTS46(uint32_t opt, UErrorCode &errorCode) - : uts46Norm2(*Normalizer2::getInstance(NULL, "uts46", UNORM2_COMPOSE, errorCode)), + : uts46Norm2(*Normalizer2::getInstance(nullptr, "uts46", UNORM2_COMPOSE, errorCode)), options(opt) {} UTS46::~UTS46() {} @@ -311,7 +311,7 @@ UTS46::process(const UnicodeString &src, return dest; } const UChar *srcArray=src.getBuffer(); - if(&dest==&src || srcArray==NULL) { + if(&dest==&src || srcArray==nullptr) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; dest.setToBogus(); return dest; @@ -325,7 +325,7 @@ UTS46::process(const UnicodeString &src, return dest; } UChar *destArray=dest.getBuffer(srcLength); - if(destArray==NULL) { + if(destArray==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return dest; } @@ -412,7 +412,7 @@ UTS46::processUTF8(StringPiece src, } const char *srcArray=src.data(); int32_t srcLength=src.length(); - if(srcArray==NULL && srcLength!=0) { + if(srcArray==nullptr && srcLength!=0) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -605,7 +605,7 @@ UTS46::mapDevChars(UnicodeString &dest, int32_t labelStart, int32_t mappingStart } int32_t length=dest.length(); UChar *s=dest.getBuffer(dest[mappingStart]==0xdf ? length+1 : length); - if(s==NULL) { + if(s==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return length; } @@ -624,7 +624,7 @@ UTS46::mapDevChars(UnicodeString &dest, int32_t labelStart, int32_t mappingStart if(length==capacity) { dest.releaseBuffer(length); s=dest.getBuffer(length+1); - if(s==NULL) { + if(s==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return length; } @@ -726,7 +726,7 @@ UTS46::processLabel(UnicodeString &dest, } wasPunycode=true; UChar *unicodeBuffer=fromPunycode.getBuffer(-1); // capacity==-1: most labels should fit - if(unicodeBuffer==NULL) { + if(unicodeBuffer==nullptr) { // Should never occur if we used capacity==-1 which uses the internal buffer. errorCode=U_MEMORY_ALLOCATION_ERROR; return labelLength; @@ -734,18 +734,18 @@ UTS46::processLabel(UnicodeString &dest, UErrorCode punycodeErrorCode=U_ZERO_ERROR; int32_t unicodeLength=u_strFromPunycode(label+4, labelLength-4, unicodeBuffer, fromPunycode.getCapacity(), - NULL, &punycodeErrorCode); + nullptr, &punycodeErrorCode); if(punycodeErrorCode==U_BUFFER_OVERFLOW_ERROR) { fromPunycode.releaseBuffer(0); unicodeBuffer=fromPunycode.getBuffer(unicodeLength); - if(unicodeBuffer==NULL) { + if(unicodeBuffer==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return labelLength; } punycodeErrorCode=U_ZERO_ERROR; unicodeLength=u_strFromPunycode(label+4, labelLength-4, unicodeBuffer, fromPunycode.getCapacity(), - NULL, &punycodeErrorCode); + nullptr, &punycodeErrorCode); } fromPunycode.releaseBuffer(unicodeLength); if(U_FAILURE(punycodeErrorCode)) { @@ -869,7 +869,7 @@ UTS46::processLabel(UnicodeString &dest, // Contains non-ASCII characters. UnicodeString punycode; UChar *buffer=punycode.getBuffer(63); // 63==maximum DNS label length - if(buffer==NULL) { + if(buffer==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return destLabelLength; } @@ -879,18 +879,18 @@ UTS46::processLabel(UnicodeString &dest, buffer[3]=0x2d; int32_t punycodeLength=u_strToPunycode(label, labelLength, buffer+4, punycode.getCapacity()-4, - NULL, &errorCode); + nullptr, &errorCode); if(errorCode==U_BUFFER_OVERFLOW_ERROR) { errorCode=U_ZERO_ERROR; punycode.releaseBuffer(4); buffer=punycode.getBuffer(4+punycodeLength); - if(buffer==NULL) { + if(buffer==nullptr) { errorCode=U_MEMORY_ALLOCATION_ERROR; return destLabelLength; } punycodeLength=u_strToPunycode(label, labelLength, buffer+4, punycode.getCapacity()-4, - NULL, &errorCode); + nullptr, &errorCode); } punycodeLength+=4; punycode.releaseBuffer(punycodeLength); @@ -1341,13 +1341,13 @@ checkArgs(const void *label, int32_t length, return false; } // sizeof(UIDNAInfo)=16 in the first API version. - if(pInfo==NULL || pInfo->size<16) { + if(pInfo==nullptr || pInfo->size<16) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return false; } - if( (label==NULL ? length!=0 : length<-1) || - (dest==NULL ? capacity!=0 : capacity<0) || - (dest==label && label!=NULL) + if( (label==nullptr ? length!=0 : length<-1) || + (dest==nullptr ? capacity!=0 : capacity<0) || + (dest==label && label!=nullptr) ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return false; diff --git a/icu4c/source/common/uvector.h b/icu4c/source/common/uvector.h index 1eb7d136e7a..aa5fa2a5d74 100644 --- a/icu4c/source/common/uvector.h +++ b/icu4c/source/common/uvector.h @@ -197,7 +197,7 @@ public: * Change the size of this vector as follows: If newSize is * smaller, then truncate the array, possibly deleting held * elements for i >= newSize. If newSize is larger, grow the - * array, filling in new slots with NULL. + * array, filling in new slots with nullptr. */ void setSize(int32_t newSize, UErrorCode &status); diff --git a/icu4c/source/common/uvectr32.cpp b/icu4c/source/common/uvectr32.cpp index 952f51792b3..9c42e68f1f0 100644 --- a/icu4c/source/common/uvectr32.cpp +++ b/icu4c/source/common/uvectr32.cpp @@ -30,7 +30,7 @@ UVector32::UVector32(UErrorCode &status) : count(0), capacity(0), maxCapacity(0), - elements(NULL) + elements(nullptr) { _init(DEFAULT_CAPACITY, status); } @@ -229,7 +229,7 @@ UBool UVector32::expandCapacity(int32_t minimumCapacity, UErrorCode &status) { return false; } int32_t* newElems = (int32_t *)uprv_realloc(elements, sizeof(int32_t)*newCap); - if (newElems == NULL) { + if (newElems == nullptr) { // We keep the original contents on the memory failure on realloc. status = U_MEMORY_ALLOCATION_ERROR; return false; @@ -257,7 +257,7 @@ void UVector32::setMaxCapacity(int32_t limit) { // New maximum capacity is smaller than the current size. // Realloc the storage to the new, smaller size. int32_t* newElems = (int32_t *)uprv_realloc(elements, sizeof(int32_t)*maxCapacity); - if (newElems == NULL) { + if (newElems == nullptr) { // Realloc to smaller failed. // Just keep what we had. No need to call it a failure. return; @@ -273,7 +273,7 @@ void UVector32::setMaxCapacity(int32_t limit) { * Change the size of this vector as follows: If newSize is smaller, * then truncate the array, possibly deleting held elements for i >= * newSize. If newSize is larger, grow the array, filling in new - * slots with NULL. + * slots with nullptr. */ void UVector32::setSize(int32_t newSize) { int32_t i; diff --git a/icu4c/source/common/uvectr32.h b/icu4c/source/common/uvectr32.h index a7fada38335..5aa948d2d41 100644 --- a/icu4c/source/common/uvectr32.h +++ b/icu4c/source/common/uvectr32.h @@ -234,7 +234,7 @@ inline void UVector32::addElement(int32_t elem, UErrorCode &status) { inline int32_t *UVector32::reserveBlock(int32_t size, UErrorCode &status) { if (ensureCapacity(count+size, status) == false) { - return NULL; + return nullptr; } int32_t *rp = elements+count; count += size; diff --git a/icu4c/source/common/uvectr64.cpp b/icu4c/source/common/uvectr64.cpp index 8bd5cd78393..d6be264764a 100644 --- a/icu4c/source/common/uvectr64.cpp +++ b/icu4c/source/common/uvectr64.cpp @@ -27,7 +27,7 @@ UVector64::UVector64(UErrorCode &status) : count(0), capacity(0), maxCapacity(0), - elements(NULL) + elements(nullptr) { _init(DEFAULT_CAPACITY, status); } @@ -147,7 +147,7 @@ UBool UVector64::expandCapacity(int32_t minimumCapacity, UErrorCode &status) { return false; } int64_t* newElems = (int64_t *)uprv_realloc(elements, sizeof(int64_t)*newCap); - if (newElems == NULL) { + if (newElems == nullptr) { // We keep the original contents on the memory failure on realloc. status = U_MEMORY_ALLOCATION_ERROR; return false; @@ -175,7 +175,7 @@ void UVector64::setMaxCapacity(int32_t limit) { // New maximum capacity is smaller than the current size. // Realloc the storage to the new, smaller size. int64_t* newElems = (int64_t *)uprv_realloc(elements, sizeof(int64_t)*maxCapacity); - if (newElems == NULL) { + if (newElems == nullptr) { // Realloc to smaller failed. // Just keep what we had. No need to call it a failure. return; @@ -191,7 +191,7 @@ void UVector64::setMaxCapacity(int32_t limit) { * Change the size of this vector as follows: If newSize is smaller, * then truncate the array, possibly deleting held elements for i >= * newSize. If newSize is larger, grow the array, filling in new - * slots with NULL. + * slots with nullptr. */ void UVector64::setSize(int32_t newSize) { int32_t i; diff --git a/icu4c/source/common/uvectr64.h b/icu4c/source/common/uvectr64.h index 070e2dd67d2..56ffea076c5 100644 --- a/icu4c/source/common/uvectr64.h +++ b/icu4c/source/common/uvectr64.h @@ -223,7 +223,7 @@ inline void UVector64::addElement(int64_t elem, UErrorCode &status) { inline int64_t *UVector64::reserveBlock(int32_t size, UErrorCode &status) { if (ensureCapacity(count+size, status) == false) { - return NULL; + return nullptr; } int64_t *rp = elements+count; count += size; diff --git a/icu4c/source/common/wintz.cpp b/icu4c/source/common/wintz.cpp index 3ca12703c4f..044ab1cc752 100644 --- a/icu4c/source/common/wintz.cpp +++ b/icu4c/source/common/wintz.cpp @@ -69,7 +69,7 @@ typedef struct _REG_TZI_FORMAT { * as this API returns a non-localized time zone name which can be then mapped to an ICU time zone. * * However, in some RDP/terminal services situations, this struct isn't always fully complete, and the TimeZoneKeyName -* field of the struct might be NULL. This can happen with some 3rd party RDP clients, and also when using older versions +* field of the struct might be nullptr. This can happen with some 3rd party RDP clients, and also when using older versions * of the RDP protocol, which don't send the newer TimeZoneKeyNamei information and only send the StandardName and DaylightName. * * Since these 3rd party clients and older RDP clients only send the pre-Vista time zone information to the server, this means that we @@ -150,7 +150,7 @@ uprv_detectWindowsTimeZone() } } - // If DST is NOT disabled, but the TimeZoneKeyName field of the struct is NULL, then we may be dealing with a + // If DST is NOT disabled, but the TimeZoneKeyName field of the struct is nullptr, then we may be dealing with a // RDP/terminal services session where the 'Time Zone Redirection' feature is enabled. However, either the RDP // client sent the server incomplete info (some 3rd party RDP clients only send the StandardName and DaylightName, // but do not send the important TimeZoneKeyName), or if the RDP server has not appropriately populated the struct correctly. diff --git a/icu4c/source/extra/scrptrun/scrptrun.h b/icu4c/source/extra/scrptrun/scrptrun.h index 7f033a72834..c26be4dc650 100644 --- a/icu4c/source/extra/scrptrun/scrptrun.h +++ b/icu4c/source/extra/scrptrun/scrptrun.h @@ -103,7 +103,7 @@ private: inline ScriptRun::ScriptRun() { - reset(NULL, 0, 0); + reset(nullptr, 0, 0); } inline ScriptRun::ScriptRun(const UChar chars[], int32_t length) diff --git a/icu4c/source/extra/uconv/uconv.cpp b/icu4c/source/extra/uconv/uconv.cpp index f2d2e33b05b..4c8a864af65 100644 --- a/icu4c/source/extra/uconv/uconv.cpp +++ b/icu4c/source/extra/uconv/uconv.cpp @@ -325,7 +325,7 @@ static int printConverters(const char *pname, const char *lookfor, const char *standardName; UBool isFirst = true; UErrorCode enumError = U_ZERO_ERROR; - while ((standardName = uenum_next(nameEnum, NULL, &enumError))) { + while ((standardName = uenum_next(nameEnum, nullptr, &enumError))) { /* See if this alias is supported by this standard. */ if (!strcmp(standardName, alias)) { if (!t) { @@ -518,10 +518,10 @@ cnvSigType(UConverter *cnv) { ucnv_fromUnicode(cnv, &out, buffer + sizeof(buffer), &in, a + 1, - NULL, true, &err); + nullptr, true, &err); ucnv_resetFromUnicode(cnv); - if (NULL != ucnv_detectUnicodeSignature(buffer, (int32_t)(out - buffer), NULL, &err) && + if (nullptr != ucnv_detectUnicodeSignature(buffer, (int32_t)(out - buffer), nullptr, &err) && U_SUCCESS(err) ) { result = CNV_ADDS_FEFF; @@ -534,7 +534,7 @@ cnvSigType(UConverter *cnv) { class ConvertFile { public: ConvertFile() : - buf(NULL), outbuf(NULL), fromoffsets(NULL), + buf(nullptr), outbuf(nullptr), fromoffsets(nullptr), bufsz(0), signature(0) {} void @@ -650,7 +650,7 @@ ConvertFile::convertFile(const char *pname, #if !UCONFIG_NO_TRANSLITERATION // Create transliterator as needed. - if (translit != NULL && *translit) { + if (translit != nullptr && *translit) { UParseError parse; UnicodeString str(translit), pestr; @@ -691,7 +691,7 @@ ConvertFile::convertFile(const char *pname, #endif // Create codepage converter. If the codepage or its aliases weren't - // available, it returns NULL and a failure code. We also set the + // available, it returns nullptr and a failure code. We also set the // callbacks, and return errors in the same way. convfrom = ucnv_open(fromcpage, &err); @@ -770,7 +770,7 @@ ConvertFile::convertFile(const char *pname, // Use bufsz instead of u.getCapacity() for the targetLimit // so that we don't overflow fromoffsets[]. ucnv_toUnicode(convfrom, &unibufp, unibuf + bufsz, &cbufp, - buf + rd, useOffsets ? fromoffsets : NULL, flush, &err); + buf + rd, useOffsets ? fromoffsets : nullptr, flush, &err); ulen = (int32_t)(unibufp - unibuf); u.releaseBuffer(U_SUCCESS(err) ? ulen : 0); @@ -862,7 +862,7 @@ ConvertFile::convertFile(const char *pname, // while avoiding the slower keyboard mode. // The end-of-chunk characters are completely included in the // transformed string in case they are to be transformed themselves. - if (t != NULL) { + if (t != nullptr) { UnicodeString out; int32_t chunkLimit; @@ -929,7 +929,7 @@ ConvertFile::convertFile(const char *pname, ucnv_fromUnicode(convto, &bufp, outbuf + bufsz, &unibufbp, unibuf + ulen, - NULL, (UBool)(flush && fromSawEndOfBytes), &err); + nullptr, (UBool)(flush && fromSawEndOfBytes), &err); // toSawEndOfUnicode indicates that ucnv_fromUnicode() is done // converting all of the intermediate UChars. @@ -977,7 +977,7 @@ ConvertFile::convertFile(const char *pname, ferroffset = static_cast(infoffset + (prevbufp - buf) + fromoffset); errtag = "problemCvtFromU"; } else { - // Do not use fromoffsets if (t != NULL) because the Unicode text may + // Do not use fromoffsets if (t != nullptr) because the Unicode text may // be different from what the offsets refer to. // output file offset diff --git a/icu4c/source/i18n/alphaindex.cpp b/icu4c/source/i18n/alphaindex.cpp index 16b9d99395b..b25b666cc78 100644 --- a/icu4c/source/i18n/alphaindex.cpp +++ b/icu4c/source/i18n/alphaindex.cpp @@ -64,12 +64,12 @@ namespace { UnicodeString *ownedString(const UnicodeString &s, LocalPointer &owned, UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } if (owned.isValid()) { return owned.orphan(); } UnicodeString *p = new UnicodeString(s); - if (p == NULL) { + if (p == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; } return p; @@ -158,7 +158,7 @@ public: } } const AlphabeticIndex::Bucket *bucket = getBucket(*bucketList_, start); - if (bucket->displayBucket_ != NULL) { + if (bucket->displayBucket_ != nullptr) { bucket = bucket->displayBucket_; } return bucket->displayIndex_; @@ -198,29 +198,29 @@ AlphabeticIndex::ImmutableIndex::getBucket(int32_t index) const { if (0 <= index && index < buckets_->getBucketCount()) { return icu::getBucket(*buckets_->immutableVisibleList_, index); } else { - return NULL; + return nullptr; } } AlphabeticIndex::AlphabeticIndex(const Locale &locale, UErrorCode &status) - : inputList_(NULL), - labelsIterIndex_(-1), itemsIterIndex_(0), currentBucket_(NULL), + : inputList_(nullptr), + labelsIterIndex_(-1), itemsIterIndex_(0), currentBucket_(nullptr), maxLabelCount_(99), - initialLabels_(NULL), firstCharsInScripts_(NULL), - collator_(NULL), collatorPrimaryOnly_(NULL), - buckets_(NULL) { + initialLabels_(nullptr), firstCharsInScripts_(nullptr), + collator_(nullptr), collatorPrimaryOnly_(nullptr), + buckets_(nullptr) { init(&locale, status); } AlphabeticIndex::AlphabeticIndex(RuleBasedCollator *collator, UErrorCode &status) - : inputList_(NULL), - labelsIterIndex_(-1), itemsIterIndex_(0), currentBucket_(NULL), + : inputList_(nullptr), + labelsIterIndex_(-1), itemsIterIndex_(0), currentBucket_(nullptr), maxLabelCount_(99), - initialLabels_(NULL), firstCharsInScripts_(NULL), - collator_(collator), collatorPrimaryOnly_(NULL), - buckets_(NULL) { - init(NULL, status); + initialLabels_(nullptr), firstCharsInScripts_(nullptr), + collator_(collator), collatorPrimaryOnly_(nullptr), + buckets_(nullptr) { + init(nullptr, status); } @@ -253,22 +253,22 @@ AlphabeticIndex &AlphabeticIndex::addLabels(const Locale &locale, UErrorCode &st AlphabeticIndex::ImmutableIndex *AlphabeticIndex::buildImmutableIndex(UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } // In C++, the ImmutableIndex must own its copy of the BucketList, // even if it contains no records, for proper memory management. - // We could clone the buckets_ if they are not NULL, + // We could clone the buckets_ if they are not nullptr, // but that would be worth it only if this method is called multiple times, // or called after using the old-style bucket iterator API. LocalPointer immutableBucketList(createBucketList(errorCode)); LocalPointer coll(collatorPrimaryOnly_->clone()); if (immutableBucketList.isNull() || coll.isNull()) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } ImmutableIndex *immIndex = new ImmutableIndex(immutableBucketList.getAlias(), coll.getAlias()); - if (immIndex == NULL) { + if (immIndex == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // The ImmutableIndex adopted its parameter objects. immutableBucketList.orphan(); @@ -286,7 +286,7 @@ int32_t AlphabeticIndex::getBucketCount(UErrorCode &status) { int32_t AlphabeticIndex::getRecordCount(UErrorCode &status) { - if (U_FAILURE(status) || inputList_ == NULL) { + if (U_FAILURE(status) || inputList_ == nullptr) { return 0; } return inputList_->size(); @@ -319,7 +319,7 @@ void AlphabeticIndex::initLabels(UVector &indexCharacters, UErrorCode &errorCode // even if the label string sorts the same when all contractions are suppressed. ownedItem.adoptInstead(new UnicodeString(*item, 0, itemLength - 1)); item = ownedItem.getAlias(); - if (item == NULL) { + if (item == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -421,7 +421,7 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { UVector indexCharacters(errorCode); indexCharacters.setDeleter(uprv_deleteUObject); initLabels(indexCharacters, errorCode); - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } // Variables for hasMultiplePrimaryWeights(). UVector64 ces(errorCode); @@ -435,28 +435,28 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { // Helper arrays for Chinese Pinyin collation. Bucket *asciiBuckets[26] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; Bucket *pinyinBuckets[26] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; UBool hasPinyin = false; LocalPointer bucketList(new UVector(errorCode), errorCode); if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } bucketList->setDeleter(uprv_deleteUObject); // underflow bucket LocalPointer bucket(new Bucket(getUnderflowLabel(), emptyString_, U_ALPHAINDEX_UNDERFLOW), errorCode); if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } bucketList->adoptElement(bucket.orphan(), errorCode); - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } UnicodeString temp; @@ -513,7 +513,7 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { // underflow or inflow label. break; } - if (singleBucket->displayBucket_ == NULL && + if (singleBucket->displayBucket_ == nullptr && !hasMultiplePrimaryWeights(*collatorPrimaryOnly_, variableTop, singleBucket->lowerBoundary_, ces, errorCode)) { @@ -526,7 +526,7 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { U_ALPHAINDEX_NORMAL), errorCode); if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } bucket->displayBucket_ = singleBucket; bucketList->adoptElement(bucket.orphan(), errorCode); @@ -537,13 +537,13 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { } } } - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } if (bucketList->size() == 1) { // No real labels, show only the underflow label. BucketList *bl = new BucketList(bucketList.getAlias(), bucketList.getAlias()); - if (bl == NULL) { + if (bl == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } bucketList.orphan(); return bl; @@ -556,24 +556,24 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { if (hasPinyin) { // Redirect Pinyin buckets. - Bucket *asciiBucket = NULL; + Bucket *asciiBucket = nullptr; for (int32_t i = 0; i < 26; ++i) { - if (asciiBuckets[i] != NULL) { + if (asciiBuckets[i] != nullptr) { asciiBucket = asciiBuckets[i]; } - if (pinyinBuckets[i] != NULL && asciiBucket != NULL) { + if (pinyinBuckets[i] != nullptr && asciiBucket != nullptr) { pinyinBuckets[i]->displayBucket_ = asciiBucket; hasInvisibleBuckets = true; } } } - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } if (!hasInvisibleBuckets) { BucketList *bl = new BucketList(bucketList.getAlias(), bucketList.getAlias()); - if (bl == NULL) { + if (bl == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } bucketList.orphan(); return bl; @@ -584,7 +584,7 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { Bucket *nextBucket = getBucket(*bucketList, i); while (--i > 0) { Bucket *bucket = getBucket(*bucketList, i); - if (bucket->displayBucket_ != NULL) { + if (bucket->displayBucket_ != nullptr) { continue; // skip invisible buckets } if (bucket->labelType_ == U_ALPHAINDEX_INFLOW) { @@ -598,21 +598,21 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { LocalPointer publicBucketList(new UVector(errorCode), errorCode); if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } // Do not call publicBucketList->setDeleter(): // This vector shares its objects with the bucketList. for (int32_t j = 0; j < bucketList->size(); ++j) { Bucket *bucket = getBucket(*bucketList, j); - if (bucket->displayBucket_ == NULL) { + if (bucket->displayBucket_ == nullptr) { publicBucketList->addElement(bucket, errorCode); } } - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } BucketList *bl = new BucketList(bucketList.getAlias(), publicBucketList.getAlias()); - if (bl == NULL) { + if (bl == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } bucketList.orphan(); publicBucketList.orphan(); @@ -623,11 +623,11 @@ BucketList *AlphabeticIndex::createBucketList(UErrorCode &errorCode) const { * Creates an index, and buckets and sorts the list of records into the index. */ void AlphabeticIndex::initBuckets(UErrorCode &errorCode) { - if (U_FAILURE(errorCode) || buckets_ != NULL) { + if (U_FAILURE(errorCode) || buckets_ != nullptr) { return; } buckets_ = createBucketList(errorCode); - if (U_FAILURE(errorCode) || inputList_ == NULL || inputList_->isEmpty()) { + if (U_FAILURE(errorCode) || inputList_ == nullptr || inputList_->isEmpty()) { return; } @@ -649,14 +649,14 @@ void AlphabeticIndex::initBuckets(UErrorCode &errorCode) { nextBucket = getBucket(*buckets_->bucketList_, bucketIndex++); upperBoundary = &nextBucket->lowerBoundary_; } else { - nextBucket = NULL; - upperBoundary = NULL; + nextBucket = nullptr; + upperBoundary = nullptr; } for (int32_t i = 0; i < inputList_->size(); ++i) { Record *r = getRecord(*inputList_, i); // if the current bucket isn't the right one, find the one that is // We have a special flag for the last bucket so that we don't look any further - while (upperBoundary != NULL && + while (upperBoundary != nullptr && collatorPrimaryOnly_->compare(r->name_, *upperBoundary, errorCode) >= 0) { currentBucket = nextBucket; // now reset the boundary that we compare against @@ -664,15 +664,15 @@ void AlphabeticIndex::initBuckets(UErrorCode &errorCode) { nextBucket = getBucket(*buckets_->bucketList_, bucketIndex++); upperBoundary = &nextBucket->lowerBoundary_; } else { - upperBoundary = NULL; + upperBoundary = nullptr; } } // now put the record into the bucket. Bucket *bucket = currentBucket; - if (bucket->displayBucket_ != NULL) { + if (bucket->displayBucket_ != nullptr) { bucket = bucket->displayBucket_; } - if (bucket->records_ == NULL) { + if (bucket->records_ == nullptr) { LocalPointer records(new UVector(errorCode), errorCode); if (U_FAILURE(errorCode)) { return; @@ -684,16 +684,16 @@ void AlphabeticIndex::initBuckets(UErrorCode &errorCode) { } void AlphabeticIndex::clearBuckets() { - if (buckets_ != NULL) { + if (buckets_ != nullptr) { delete buckets_; - buckets_ = NULL; + buckets_ = nullptr; internalResetBucketIterator(); } } void AlphabeticIndex::internalResetBucketIterator() { labelsIterIndex_ = -1; - currentBucket_ = NULL; + currentBucket_ = nullptr; } @@ -869,13 +869,13 @@ AlphabeticIndex &AlphabeticIndex::setMaxLabelCount(int32_t maxLabelCount, UError void AlphabeticIndex::init(const Locale *locale, UErrorCode &status) { if (U_FAILURE(status)) { return; } - if (locale == NULL && collator_ == NULL) { + if (locale == nullptr && collator_ == nullptr) { status = U_ILLEGAL_ARGUMENT_ERROR; return; } initialLabels_ = new UnicodeSet(); - if (initialLabels_ == NULL) { + if (initialLabels_ == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -884,25 +884,25 @@ void AlphabeticIndex::init(const Locale *locale, UErrorCode &status) { overflowLabel_ = inflowLabel_; underflowLabel_ = inflowLabel_; - if (collator_ == NULL) { + if (collator_ == nullptr) { Collator *coll = Collator::createInstance(*locale, status); if (U_FAILURE(status)) { delete coll; return; } - if (coll == NULL) { + if (coll == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } collator_ = dynamic_cast(coll); - if (collator_ == NULL) { + if (collator_ == nullptr) { delete coll; status = U_UNSUPPORTED_ERROR; return; } } collatorPrimaryOnly_ = collator_->clone(); - if (collatorPrimaryOnly_ == NULL) { + if (collatorPrimaryOnly_ == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -930,7 +930,7 @@ void AlphabeticIndex::init(const Locale *locale, UErrorCode &status) { // Chinese index characters, which are specific to each of the several Chinese tailorings, // take precedence over the single locale data exemplar set per language. - if (!addChineseIndexCharacters(status) && locale != NULL) { + if (!addChineseIndexCharacters(status) && locale != nullptr) { addIndexExemplars(*locale, status); } } @@ -947,13 +947,13 @@ collatorComparator(const void *context, const void *left, const void *right) { const UnicodeString *rightString = static_cast(rightElement->pointer); if (leftString == rightString) { - // Catches case where both are NULL + // Catches case where both are nullptr return 0; } - if (leftString == NULL) { + if (leftString == nullptr) { return 1; } - if (rightString == NULL) { + if (rightString == nullptr) { return -1; } const Collator *col = static_cast(context); @@ -977,11 +977,11 @@ recordCompareFn(const void *context, const void *left, const void *right) { UVector *AlphabeticIndex::firstStringsInScript(UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } LocalPointer dest(new UVector(status), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } dest->setDeleter(uprv_deleteUObject); // Fetch the script-first-primary contractions which are defined in the root collator. @@ -989,11 +989,11 @@ UVector *AlphabeticIndex::firstStringsInScript(UErrorCode &status) { UnicodeSet set; collatorPrimaryOnly_->internalAddContractions(0xFDD1, set, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (set.isEmpty()) { status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } UnicodeSetIterator iter(set); while (iter.next()) { @@ -1059,7 +1059,7 @@ AlphabeticIndex & AlphabeticIndex::addRecord(const UnicodeString &name, const vo if (U_FAILURE(status)) { return *this; } - if (inputList_ == NULL) { + if (inputList_ == nullptr) { LocalPointer inputList(new UVector(status), status); if (U_FAILURE(status)) { return *this; @@ -1082,7 +1082,7 @@ AlphabeticIndex & AlphabeticIndex::addRecord(const UnicodeString &name, const vo AlphabeticIndex &AlphabeticIndex::clearRecords(UErrorCode &status) { - if (U_SUCCESS(status) && inputList_ != NULL && !inputList_->isEmpty()) { + if (U_SUCCESS(status) && inputList_ != nullptr && !inputList_->isEmpty()) { inputList_->removeAllElements(); clearBuckets(); } @@ -1107,7 +1107,7 @@ UBool AlphabeticIndex::nextBucket(UErrorCode &status) { if (U_FAILURE(status)) { return false; } - if (buckets_ == NULL && currentBucket_ != NULL) { + if (buckets_ == nullptr && currentBucket_ != nullptr) { status = U_ENUM_OUT_OF_SYNC_ERROR; return false; } @@ -1126,7 +1126,7 @@ UBool AlphabeticIndex::nextBucket(UErrorCode &status) { } const UnicodeString &AlphabeticIndex::getBucketLabel() const { - if (currentBucket_ != NULL) { + if (currentBucket_ != nullptr) { return currentBucket_->label_; } else { return emptyString_; @@ -1135,7 +1135,7 @@ const UnicodeString &AlphabeticIndex::getBucketLabel() const { UAlphabeticIndexLabelType AlphabeticIndex::getBucketLabelType() const { - if (currentBucket_ != NULL) { + if (currentBucket_ != nullptr) { return currentBucket_->labelType_; } else { return U_ALPHAINDEX_NORMAL; @@ -1144,7 +1144,7 @@ UAlphabeticIndexLabelType AlphabeticIndex::getBucketLabelType() const { int32_t AlphabeticIndex::getBucketRecordCount() const { - if (currentBucket_ != NULL && currentBucket_->records_ != NULL) { + if (currentBucket_ != nullptr && currentBucket_->records_ != nullptr) { return currentBucket_->records_->size(); } else { return 0; @@ -1165,17 +1165,17 @@ UBool AlphabeticIndex::nextRecord(UErrorCode &status) { if (U_FAILURE(status)) { return false; } - if (currentBucket_ == NULL) { + if (currentBucket_ == nullptr) { // We are trying to iterate over the items in a bucket, but there is no // current bucket from the enumeration of buckets. status = U_INVALID_STATE_ERROR; return false; } - if (buckets_ == NULL) { + if (buckets_ == nullptr) { status = U_ENUM_OUT_OF_SYNC_ERROR; return false; } - if (currentBucket_->records_ == NULL) { + if (currentBucket_->records_ == nullptr) { return false; } ++itemsIterIndex_; @@ -1189,7 +1189,7 @@ UBool AlphabeticIndex::nextRecord(UErrorCode &status) { const UnicodeString &AlphabeticIndex::getRecordName() const { const UnicodeString *retStr = &emptyString_; - if (currentBucket_ != NULL && currentBucket_->records_ != NULL && + if (currentBucket_ != nullptr && currentBucket_->records_ != nullptr && itemsIterIndex_ >= 0 && itemsIterIndex_ < currentBucket_->records_->size()) { Record *item = static_cast(currentBucket_->records_->elementAt(itemsIterIndex_)); @@ -1199,8 +1199,8 @@ const UnicodeString &AlphabeticIndex::getRecordName() const { } const void *AlphabeticIndex::getRecordData() const { - const void *retPtr = NULL; - if (currentBucket_ != NULL && currentBucket_->records_ != NULL && + const void *retPtr = nullptr; + if (currentBucket_ != nullptr && currentBucket_->records_ != nullptr && itemsIterIndex_ >= 0 && itemsIterIndex_ < currentBucket_->records_->size()) { Record *item = static_cast(currentBucket_->records_->elementAt(itemsIterIndex_)); @@ -1221,8 +1221,8 @@ AlphabeticIndex::Bucket::Bucket(const UnicodeString &label, const UnicodeString &lowerBoundary, UAlphabeticIndexLabelType type) : label_(label), lowerBoundary_(lowerBoundary), labelType_(type), - displayBucket_(NULL), displayIndex_(-1), - records_(NULL) { + displayBucket_(nullptr), displayIndex_(-1), + records_(nullptr) { } diff --git a/icu4c/source/i18n/anytrans.cpp b/icu4c/source/i18n/anytrans.cpp index e10ff479ddd..c97b69404f3 100644 --- a/icu4c/source/i18n/anytrans.cpp +++ b/icu4c/source/i18n/anytrans.cpp @@ -187,10 +187,10 @@ AnyTransliterator::AnyTransliterator(const UnicodeString& id, const UnicodeString& theVariant, UScriptCode theTargetScript, UErrorCode& ec) : - Transliterator(id, NULL), + Transliterator(id, nullptr), targetScript(theTargetScript) { - cache = uhash_openSize(uhash_hashLong, uhash_compareLong, NULL, ANY_TRANS_CACHE_INIT_SIZE, &ec); + cache = uhash_openSize(uhash_hashLong, uhash_compareLong, nullptr, ANY_TRANS_CACHE_INIT_SIZE, &ec); if (U_FAILURE(ec)) { return; } @@ -216,7 +216,7 @@ AnyTransliterator::AnyTransliterator(const AnyTransliterator& o) : { // Don't copy the cache contents UErrorCode ec = U_ZERO_ERROR; - cache = uhash_openSize(uhash_hashLong, uhash_compareLong, NULL, ANY_TRANS_CACHE_INIT_SIZE, &ec); + cache = uhash_openSize(uhash_hashLong, uhash_compareLong, nullptr, ANY_TRANS_CACHE_INIT_SIZE, &ec); if (U_FAILURE(ec)) { return; } @@ -248,7 +248,7 @@ void AnyTransliterator::handleTransliterate(Replaceable& text, UTransPosition& p // our target or target/variant Transliterator* t = getTransliterator(it.scriptCode); - if (t == NULL) { + if (t == nullptr) { // We have no transliterator. Do nothing, but keep // pos.start up to date. pos.start = it.limit; @@ -280,40 +280,40 @@ void AnyTransliterator::handleTransliterate(Replaceable& text, UTransPosition& p Transliterator* AnyTransliterator::getTransliterator(UScriptCode source) const { if (source == targetScript || source == USCRIPT_INVALID_CODE) { - return NULL; + return nullptr; } - Transliterator* t = NULL; + Transliterator* t = nullptr; { - Mutex m(NULL); + Mutex m(nullptr); t = (Transliterator*) uhash_iget(cache, (int32_t) source); } - if (t == NULL) { + if (t == nullptr) { UErrorCode ec = U_ZERO_ERROR; UnicodeString sourceName(uscript_getShortName(source), -1, US_INV); UnicodeString id(sourceName); id.append(TARGET_SEP).append(target); t = Transliterator::createInstance(id, UTRANS_FORWARD, ec); - if (U_FAILURE(ec) || t == NULL) { + if (U_FAILURE(ec) || t == nullptr) { delete t; // Try to pivot around Latin, our most common script id = sourceName; id.append(LATIN_PIVOT, -1).append(target); t = Transliterator::createInstance(id, UTRANS_FORWARD, ec); - if (U_FAILURE(ec) || t == NULL) { + if (U_FAILURE(ec) || t == nullptr) { delete t; - t = NULL; + t = nullptr; } } - if (t != NULL) { - Transliterator *rt = NULL; + if (t != nullptr) { + Transliterator *rt = nullptr; { - Mutex m(NULL); + Mutex m(nullptr); rt = static_cast (uhash_iget(cache, (int32_t) source)); - if (rt == NULL) { + if (rt == nullptr) { // Common case, no race to cache this new transliterator. uhash_iput(cache, (int32_t) source, t, &ec); } else { @@ -341,7 +341,7 @@ static UScriptCode scriptNameToCode(const UnicodeString& name) { if (isInvariant) { name.extract(0, nameLen, buf, (int32_t)sizeof(buf), US_INV); - buf[127] = 0; // Make sure that we NULL terminate the string. + buf[127] = 0; // Make sure that we nullptr terminate the string. } if (!isInvariant || uscript_getCode(buf, &code, 1, &ec) != 1 || U_FAILURE(ec)) { diff --git a/icu4c/source/i18n/anytrans.h b/icu4c/source/i18n/anytrans.h index 67ebb2e7d2f..9aa7eef2ce7 100644 --- a/icu4c/source/i18n/anytrans.h +++ b/icu4c/source/i18n/anytrans.h @@ -107,7 +107,7 @@ private: /** * Returns a transliterator from the given source to our target or - * target/variant. Returns NULL if the source is the same as our + * target/variant. Returns nullptr if the source is the same as our * target script, or if the source is USCRIPT_INVALID_CODE. * Caches the result and returns the same transliterator the next * time. The caller does NOT own the result and must not delete diff --git a/icu4c/source/i18n/astro.cpp b/icu4c/source/i18n/astro.cpp index cf9b4769ecc..40f9fe3e367 100644 --- a/icu4c/source/i18n/astro.cpp +++ b/icu4c/source/i18n/astro.cpp @@ -44,8 +44,8 @@ static void debug_astro_msg(const char *pat, ...) #include "unicode/ustring.h" static const char * debug_astro_date(UDate d) { static char gStrBuf[1024]; - static DateFormat *df = NULL; - if(df == NULL) { + static DateFormat *df = nullptr; + if(df == nullptr) { df = DateFormat::createDateTimeInstance(DateFormat::MEDIUM, DateFormat::MEDIUM, Locale::getUS()); df->adoptTimeZone(TimeZone::getGMT()->clone()); } @@ -1532,13 +1532,13 @@ UnicodeString CalendarAstronomer::Horizon::toString() const void CalendarCache::createCache(CalendarCache** cache, UErrorCode& status) { ucln_i18n_registerCleanup(UCLN_I18N_ASTRO_CALENDAR, calendar_astro_cleanup); - if(cache == NULL) { + if(cache == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } else { *cache = new CalendarCache(32, status); if(U_FAILURE(status)) { delete *cache; - *cache = NULL; + *cache = nullptr; } } } @@ -1551,7 +1551,7 @@ int32_t CalendarCache::get(CalendarCache** cache, int32_t key, UErrorCode &statu } umtx_lock(&ccLock); - if(*cache == NULL) { + if(*cache == nullptr) { createCache(cache, status); if(U_FAILURE(status)) { umtx_unlock(&ccLock); @@ -1572,7 +1572,7 @@ void CalendarCache::put(CalendarCache** cache, int32_t key, int32_t value, UErro } umtx_lock(&ccLock); - if(*cache == NULL) { + if(*cache == nullptr) { createCache(cache, status); if(U_FAILURE(status)) { umtx_unlock(&ccLock); @@ -1587,12 +1587,12 @@ void CalendarCache::put(CalendarCache** cache, int32_t key, int32_t value, UErro } CalendarCache::CalendarCache(int32_t size, UErrorCode &status) { - fTable = uhash_openSize(uhash_hashLong, uhash_compareLong, NULL, size, &status); + fTable = uhash_openSize(uhash_hashLong, uhash_compareLong, nullptr, size, &status); U_DEBUG_ASTRO_MSG(("%p: Opening.\n", fTable)); } CalendarCache::~CalendarCache() { - if(fTable != NULL) { + if(fTable != nullptr) { U_DEBUG_ASTRO_MSG(("%p: Closing.\n", fTable)); uhash_close(fTable); } diff --git a/icu4c/source/i18n/basictz.cpp b/icu4c/source/i18n/basictz.cpp index dfc3aea6cbc..2490fadcc91 100644 --- a/icu4c/source/i18n/basictz.cpp +++ b/icu4c/source/i18n/basictz.cpp @@ -131,17 +131,17 @@ BasicTimeZone::hasEquivalentTransitions(const BasicTimeZone& tz, UDate start, UD void BasicTimeZone::getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial, AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) const { - initial = NULL; - std = NULL; - dst = NULL; + initial = nullptr; + std = nullptr; + dst = nullptr; if (U_FAILURE(status)) { return; } int32_t initialRaw, initialDst; UnicodeString initialName; - AnnualTimeZoneRule *ar1 = NULL; - AnnualTimeZoneRule *ar2 = NULL; + AnnualTimeZoneRule *ar1 = nullptr; + AnnualTimeZoneRule *ar2 = nullptr; UnicodeString name; UBool avail; @@ -207,12 +207,12 @@ BasicTimeZone::getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial, || initialDst != tr.getTo()->getDSTSavings()) { // We cannot use this rule as the second transition rule delete ar2; - ar2 = NULL; + ar2 = nullptr; } } } } - if (ar2 == NULL) { + if (ar2 == nullptr) { // Try previous transition avail = getPreviousTransition(date, true, tr); if (avail) { @@ -238,15 +238,15 @@ BasicTimeZone::getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial, if (!avail || d <= nextTransitionTime) { // We cannot use this rule as the second transition rule delete ar2; - ar2 = NULL; + ar2 = nullptr; } } } } - if (ar2 == NULL) { + if (ar2 == nullptr) { // Cannot find a good pair of AnnualTimeZoneRule delete ar1; - ar1 = NULL; + ar1 = nullptr; } else { // The initial rule should represent the rule before the previous transition ar1->getName(initialName); @@ -274,7 +274,7 @@ BasicTimeZone::getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial, initial = new InitialTimeZoneRule(initialName, initialRaw, initialDst); // Set the standard and daylight saving rules - if (ar1 != NULL && ar2 != NULL) { + if (ar1 != nullptr && ar2 != nullptr) { if (ar1->getDSTSavings() != 0) { dst = ar1; std = ar2; @@ -405,7 +405,7 @@ BasicTimeZone::getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial, } const TimeArrayTimeZoneRule *tar = dynamic_cast(toRule); const AnnualTimeZoneRule *ar; - if (tar != NULL) { + if (tar != nullptr) { // Get the previous raw offset and DST savings before the very first start time TimeZoneTransition tzt0; t = start; @@ -472,7 +472,7 @@ BasicTimeZone::getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial, } } } - } else if ((ar = dynamic_cast(toRule)) != NULL) { + } else if ((ar = dynamic_cast(toRule)) != nullptr) { ar->getFirstStart(tzt.getFrom()->getRawOffset(), tzt.getFrom()->getDSTSavings(), firstStart); if (firstStart == tzt.getTime()) { // Just add the rule as is diff --git a/icu4c/source/i18n/brktrans.cpp b/icu4c/source/i18n/brktrans.cpp index f0ec8407db2..c62911e785a 100644 --- a/icu4c/source/i18n/brktrans.cpp +++ b/icu4c/source/i18n/brktrans.cpp @@ -43,7 +43,7 @@ static const UChar SPACE = 32; // ' ' */ BreakTransliterator::BreakTransliterator(UnicodeFilter* adoptedFilter) : Transliterator(UNICODE_STRING("Any-BreakInternal", 17), adoptedFilter), - cachedBI(NULL), cachedBoundaries(NULL), fInsertion(SPACE) { + cachedBI(nullptr), cachedBoundaries(nullptr), fInsertion(SPACE) { } @@ -57,7 +57,7 @@ BreakTransliterator::~BreakTransliterator() { * Copy constructor. */ BreakTransliterator::BreakTransliterator(const BreakTransliterator& o) : - Transliterator(o), cachedBI(NULL), cachedBoundaries(NULL), fInsertion(o.fInsertion) { + Transliterator(o), cachedBI(nullptr), cachedBoundaries(nullptr), fInsertion(o.fInsertion) { } @@ -182,7 +182,7 @@ void BreakTransliterator::setInsertion(const UnicodeString &insertion) { UnicodeString BreakTransliterator::replaceableAsString(Replaceable &r) { UnicodeString s; UnicodeString *rs = dynamic_cast(&r); - if (rs != NULL) { + if (rs != nullptr) { s = *rs; } else { r.extractBetween(0, r.length(), s); diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp index c67525140ab..59756e3e528 100644 --- a/icu4c/source/i18n/calendar.cpp +++ b/icu4c/source/i18n/calendar.cpp @@ -65,7 +65,7 @@ #include "ulocimp.h" #if !UCONFIG_NO_SERVICE -static icu::ICULocaleService* gService = NULL; +static icu::ICULocaleService* gService = nullptr; static icu::UInitOnce gServiceInitOnce {}; // INTERNAL - for cleanup @@ -74,7 +74,7 @@ static UBool calendar_cleanup(void) { #if !UCONFIG_NO_SERVICE if (gService) { delete gService; - gService = NULL; + gService = nullptr; } gServiceInitOnce.reset(); #endif @@ -176,7 +176,7 @@ static const char * const gCalTypes[] = { "islamic-umalqura", "islamic-tbla", "islamic-rgsa", - NULL + nullptr }; // Must be in the order of gCalTypes above @@ -229,7 +229,7 @@ const SharedCalendar *LocaleCacheKey::createObject( } static ECalType getCalendarType(const char *s) { - for (int i = 0; gCalTypes[i] != NULL; i++) { + for (int i = 0; gCalTypes[i] != nullptr; i++) { if (uprv_stricmp(s, gCalTypes[i]) == 0) { return (ECalType)i; } @@ -302,16 +302,16 @@ static ECalType getCalendarTypeForLocale(const char *locid) { } // Read preferred calendar values from supplementalData calendarPreference - UResourceBundle *rb = ures_openDirect(NULL, "supplementalData", &status); + UResourceBundle *rb = ures_openDirect(nullptr, "supplementalData", &status); ures_getByKey(rb, "calendarPreferenceData", rb, &status); - UResourceBundle *order = ures_getByKey(rb, region, NULL, &status); - if (status == U_MISSING_RESOURCE_ERROR && rb != NULL) { + UResourceBundle *order = ures_getByKey(rb, region, nullptr, &status); + if (status == U_MISSING_RESOURCE_ERROR && rb != nullptr) { status = U_ZERO_ERROR; - order = ures_getByKey(rb, "001", NULL, &status); + order = ures_getByKey(rb, "001", nullptr, &status); } calTypeBuf[0] = 0; - if (U_SUCCESS(status) && order != NULL) { + if (U_SUCCESS(status) && order != nullptr) { // the first calendar type is the default for the region int32_t len = 0; const UChar *uCalType = ures_getStringByIndex(order, 0, &len, &status); @@ -431,7 +431,7 @@ protected: virtual void updateVisibleIDs(Hashtable& result, UErrorCode& status) const override { if (U_SUCCESS(status)) { - for(int32_t i=0;gCalTypes[i] != NULL;i++) { + for(int32_t i=0;gCalTypes[i] != nullptr;i++) { UnicodeString id((UChar)0x40); /* '@' a variant character */ id.append(UNICODE_STRING_SIMPLE("calendar=")); id.append(UnicodeString(gCalTypes[i], -1, US_INV)); @@ -445,7 +445,7 @@ protected: return nullptr; } #ifdef U_DEBUG_CALSVC - if(dynamic_cast(&key) == NULL) { + if(dynamic_cast(&key) == nullptr) { fprintf(stderr, "::create - not a LocaleKey!\n"); } #endif @@ -471,7 +471,7 @@ protected: fprintf(stderr, "BasicCalendarFactory - not handling %s.[%s]\n", (const char*) curLoc.getName(), tmp ); #endif - return NULL; + return nullptr; } return createStandardCalendar(getCalendarType(keyword), canLoc, status); @@ -526,7 +526,7 @@ public: virtual UObject* cloneInstance(UObject* instance) const override { UnicodeString *s = dynamic_cast(instance); - if(s != NULL) { + if(s != nullptr) { return s->clone(); } else { #ifdef U_DEBUG_CALSVC_F @@ -592,7 +592,7 @@ initCalendarService(UErrorCode &status) } ucln_i18n_registerCleanup(UCLN_I18N_CALENDAR, calendar_cleanup); gService = new CalendarService(); - if (gService == NULL) { + if (gService == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -612,7 +612,7 @@ initCalendarService(UErrorCode &status) fprintf(stderr, "err (%s) registering classes, deleting service.....\n", u_errorName(status)); #endif delete gService; - gService = NULL; + gService = nullptr; } } @@ -729,7 +729,7 @@ fAreFieldsVirtuallySet(false), fNextStamp((int32_t)kMinimumUserStamp), fTime(0), fLenient(true), -fZone(NULL), +fZone(nullptr), fRepeatedWallTime(UCAL_WALLTIME_LAST), fSkippedWallTime(UCAL_WALLTIME_LAST) { @@ -740,10 +740,10 @@ fSkippedWallTime(UCAL_WALLTIME_LAST) return; } fZone = TimeZone::createDefault(); - if (fZone == NULL) { + if (fZone == nullptr) { success = U_MEMORY_ALLOCATION_ERROR; } - setWeekData(Locale::getDefault(), NULL, success); + setWeekData(Locale::getDefault(), nullptr, success); } // ------------------------------------- @@ -757,7 +757,7 @@ fAreFieldsVirtuallySet(false), fNextStamp((int32_t)kMinimumUserStamp), fTime(0), fLenient(true), -fZone(NULL), +fZone(nullptr), fRepeatedWallTime(UCAL_WALLTIME_LAST), fSkippedWallTime(UCAL_WALLTIME_LAST) { @@ -778,7 +778,7 @@ fSkippedWallTime(UCAL_WALLTIME_LAST) clear(); fZone = zone; - setWeekData(aLocale, NULL, success); + setWeekData(aLocale, nullptr, success); } // ------------------------------------- @@ -792,7 +792,7 @@ fAreFieldsVirtuallySet(false), fNextStamp((int32_t)kMinimumUserStamp), fTime(0), fLenient(true), -fZone(NULL), +fZone(nullptr), fRepeatedWallTime(UCAL_WALLTIME_LAST), fSkippedWallTime(UCAL_WALLTIME_LAST) { @@ -803,10 +803,10 @@ fSkippedWallTime(UCAL_WALLTIME_LAST) } clear(); fZone = zone.clone(); - if (fZone == NULL) { + if (fZone == nullptr) { success = U_MEMORY_ALLOCATION_ERROR; } - setWeekData(aLocale, NULL, success); + setWeekData(aLocale, nullptr, success); } // ------------------------------------- @@ -821,7 +821,7 @@ Calendar::~Calendar() Calendar::Calendar(const Calendar &source) : UObject(source) { - fZone = NULL; + fZone = nullptr; *this = source; } @@ -843,8 +843,8 @@ Calendar::operator=(const Calendar &right) fRepeatedWallTime = right.fRepeatedWallTime; fSkippedWallTime = right.fSkippedWallTime; delete fZone; - fZone = NULL; - if (right.fZone != NULL) { + fZone = nullptr; + if (right.fZone != nullptr) { fZone = right.fZone->clone(); } fFirstDayOfWeek = right.fFirstDayOfWeek; @@ -894,11 +894,11 @@ Calendar::createInstance(const Locale& aLocale, UErrorCode& success) Calendar * U_EXPORT2 Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { if (U_FAILURE(success)) { - return NULL; + return nullptr; } Locale actualLoc; - UObject* u = NULL; + UObject* u = nullptr; #if !UCONFIG_NO_SERVICE if (isCalendarServiceUsed()) { @@ -909,18 +909,18 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { { u = createStandardCalendar(getCalendarTypeForLocale(aLocale.getName()), aLocale, success); } - Calendar* c = NULL; + Calendar* c = nullptr; if(U_FAILURE(success) || !u) { if(U_SUCCESS(success)) { // Propagate some kind of err success = U_INTERNAL_PROGRAM_ERROR; } - return NULL; + return nullptr; } #if !UCONFIG_NO_SERVICE const UnicodeString* str = dynamic_cast(u); - if(str != NULL) { + if(str != nullptr) { // It's a unicode string telling us what type of calendar to load ("gregorian", etc) // Create a Locale over this string Locale l(""); @@ -932,7 +932,7 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { Locale actualLoc2; delete u; - u = NULL; + u = nullptr; // Don't overwrite actualLoc, since the actual loc from this call // may be something like "@calendar=gregorian" -- TODO investigate @@ -943,11 +943,11 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { if(U_SUCCESS(success)) { success = U_INTERNAL_PROGRAM_ERROR; // Propagate some err } - return NULL; + return nullptr; } str = dynamic_cast(c); - if(str != NULL) { + if(str != nullptr) { // recursed! Second lookup returned a UnicodeString. // Perhaps DefaultCalendar{} was set to another locale. #ifdef U_DEBUG_CALSVC @@ -965,7 +965,7 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { #endif success = U_MISSING_RESOURCE_ERROR; // requested a calendar type which could NOT be found. delete c; - return NULL; + return nullptr; } #ifdef U_DEBUG_CALSVC fprintf(stderr, "%p: setting week count data to locale %s, actual locale %s\n", c, (const char*)aLocale.getName(), (const char *)actualLoc.getName()); @@ -994,16 +994,16 @@ Calendar* U_EXPORT2 Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& success) { LocalPointer zonePtr(zone); - const SharedCalendar *shared = NULL; + const SharedCalendar *shared = nullptr; UnifiedCache::getByLocale(aLocale, shared, success); if (U_FAILURE(success)) { - return NULL; + return nullptr; } Calendar *c = (*shared)->clone(); shared->removeRef(); - if (c == NULL) { + if (c == nullptr) { success = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // Now, reset calendar to default state: @@ -1033,7 +1033,7 @@ Calendar::getCalendarTypeFromLocale( char *typeBuffer, int32_t typeBufferSize, UErrorCode &success) { - const SharedCalendar *shared = NULL; + const SharedCalendar *shared = nullptr; UnifiedCache::getByLocale(aLocale, shared, success); if (U_FAILURE(success)) { return; @@ -1117,7 +1117,7 @@ Calendar::getKeywordValuesForLocale(const char* key, commonlyUsed, &status); if (U_FAILURE(status)) { uenum_close(uenum); - return NULL; + return nullptr; } UStringEnumeration* ustringenum = new UStringEnumeration(uenum); if (ustringenum == nullptr) { @@ -2360,8 +2360,8 @@ int32_t Calendar::fieldDifference(UDate targetMs, UCalendarDateFields field, UEr void Calendar::adoptTimeZone(TimeZone* zone) { - // Do nothing if passed-in zone is NULL - if (zone == NULL) return; + // Do nothing if passed-in zone is nullptr + if (zone == nullptr) return; // fZone should always be non-null delete fZone; @@ -2383,7 +2383,7 @@ Calendar::setTimeZone(const TimeZone& zone) const TimeZone& Calendar::getTimeZone() const { - U_ASSERT(fZone != NULL); + U_ASSERT(fZone != nullptr); return *fZone; } @@ -2394,9 +2394,9 @@ Calendar::orphanTimeZone() { // we let go of the time zone; the new time zone is the system default time zone TimeZone *defaultZone = TimeZone::createDefault(); - if (defaultZone == NULL) { - // No error handling available. Must keep fZone non-NULL, there are many unchecked uses. - return NULL; + if (defaultZone == nullptr) { + // No error handling available. Must keep fZone non-nullptr, there are many unchecked uses. + return nullptr; } TimeZone *z = fZone; fZone = defaultZone; @@ -2564,7 +2564,7 @@ Calendar::isWeekend(UDate date, UErrorCode &status) const } // clone the calendar so we don't mess with the real one. Calendar *work = this->clone(); - if (work == NULL) { + if (work == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return false; } @@ -2726,7 +2726,7 @@ Calendar::getActualMinimum(UCalendarDateFields field, UErrorCode& status) const // clone the calendar so we don't mess with the real one, and set it to // accept anything for the field values Calendar *work = this->clone(); - if (work == NULL) { + if (work == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -3890,12 +3890,12 @@ Calendar::setWeekData(const Locale& desiredLocale, const char *type, UErrorCode& // Get the monthNames resource bundle for the calendar 'type'. Fallback to gregorian if the resource is not // found. - LocalUResourceBundlePointer calData(ures_open(NULL, useLocale.getBaseName(), &status)); + LocalUResourceBundlePointer calData(ures_open(nullptr, useLocale.getBaseName(), &status)); ures_getByKey(calData.getAlias(), gCalendar, calData.getAlias(), &status); LocalUResourceBundlePointer monthNames; - if (type != NULL && *type != '\0' && uprv_strcmp(type, gGregorian) != 0) { - monthNames.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), type, NULL, &status)); + if (type != nullptr && *type != '\0' && uprv_strcmp(type, gGregorian) != 0) { + monthNames.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), type, nullptr, &status)); ures_getByKeyWithFallback(monthNames.getAlias(), gMonthNames, monthNames.getAlias(), &status); } @@ -3921,12 +3921,12 @@ Calendar::setWeekData(const Locale& desiredLocale, const char *type, UErrorCode& (void)ulocimp_getRegionForSupplementalData(desiredLocale.getName(), true, region, sizeof(region), &status); // Read week data values from supplementalData week data - UResourceBundle *rb = ures_openDirect(NULL, "supplementalData", &status); + UResourceBundle *rb = ures_openDirect(nullptr, "supplementalData", &status); ures_getByKey(rb, "weekData", rb, &status); - UResourceBundle *weekData = ures_getByKey(rb, region, NULL, &status); - if (status == U_MISSING_RESOURCE_ERROR && rb != NULL) { + UResourceBundle *weekData = ures_getByKey(rb, region, nullptr, &status); + if (status == U_MISSING_RESOURCE_ERROR && rb != nullptr) { status = U_ZERO_ERROR; - weekData = ures_getByKey(rb, "001", NULL, &status); + weekData = ures_getByKey(rb, "001", nullptr, &status); } if (U_FAILURE(status)) { @@ -4060,13 +4060,13 @@ int32_t Calendar::internalGetMonth(int32_t defaultValue) const { BasicTimeZone* Calendar::getBasicTimeZone(void) const { - if (dynamic_cast(fZone) != NULL - || dynamic_cast(fZone) != NULL - || dynamic_cast(fZone) != NULL - || dynamic_cast(fZone) != NULL) { + if (dynamic_cast(fZone) != nullptr + || dynamic_cast(fZone) != nullptr + || dynamic_cast(fZone) != nullptr + || dynamic_cast(fZone) != nullptr) { return (BasicTimeZone*)fZone; } - return NULL; + return nullptr; } U_NAMESPACE_END diff --git a/icu4c/source/i18n/chnsecal.cpp b/icu4c/source/i18n/chnsecal.cpp index 01ddbd1ee41..e6604c95aca 100644 --- a/icu4c/source/i18n/chnsecal.cpp +++ b/icu4c/source/i18n/chnsecal.cpp @@ -53,13 +53,13 @@ static void debug_chnsecal_msg(const char *pat, ...) // --- The cache -- static icu::UMutex astroLock; -static icu::CalendarAstronomer *gChineseCalendarAstro = NULL; +static icu::CalendarAstronomer *gChineseCalendarAstro = nullptr; // Lazy Creation & Access synchronized by class CalendarCache with a mutex. -static icu::CalendarCache *gChineseCalendarWinterSolsticeCache = NULL; -static icu::CalendarCache *gChineseCalendarNewYearCache = NULL; +static icu::CalendarCache *gChineseCalendarWinterSolsticeCache = nullptr; +static icu::CalendarCache *gChineseCalendarNewYearCache = nullptr; -static icu::TimeZone *gChineseCalendarZoneAstroCalc = NULL; +static icu::TimeZone *gChineseCalendarZoneAstroCalc = nullptr; static icu::UInitOnce gChineseCalendarZoneAstroCalcInitOnce {}; /** @@ -89,19 +89,19 @@ U_CDECL_BEGIN static UBool calendar_chinese_cleanup(void) { if (gChineseCalendarAstro) { delete gChineseCalendarAstro; - gChineseCalendarAstro = NULL; + gChineseCalendarAstro = nullptr; } if (gChineseCalendarWinterSolsticeCache) { delete gChineseCalendarWinterSolsticeCache; - gChineseCalendarWinterSolsticeCache = NULL; + gChineseCalendarWinterSolsticeCache = nullptr; } if (gChineseCalendarNewYearCache) { delete gChineseCalendarNewYearCache; - gChineseCalendarNewYearCache = NULL; + gChineseCalendarNewYearCache = nullptr; } if (gChineseCalendarZoneAstroCalc) { delete gChineseCalendarZoneAstroCalc; - gChineseCalendarZoneAstroCalc = NULL; + gChineseCalendarZoneAstroCalc = nullptr; } gChineseCalendarZoneAstroCalcInitOnce.reset(); return true; @@ -486,7 +486,7 @@ void ChineseCalendar::roll(EDateFields field, int32_t amount, UErrorCode& status */ double ChineseCalendar::daysToMillis(double days) const { double millis = days * (double)kOneDay; - if (fZoneAstroCalc != NULL) { + if (fZoneAstroCalc != nullptr) { int32_t rawOffset, dstOffset; UErrorCode status = U_ZERO_ERROR; fZoneAstroCalc->getOffset(millis, false, rawOffset, dstOffset, status); @@ -503,7 +503,7 @@ double ChineseCalendar::daysToMillis(double days) const { * @return days after January 1, 1970 0:00 in the astronomical base zone */ double ChineseCalendar::millisToDays(double millis) const { - if (fZoneAstroCalc != NULL) { + if (fZoneAstroCalc != nullptr) { int32_t rawOffset, dstOffset; UErrorCode status = U_ZERO_ERROR; fZoneAstroCalc->getOffset(millis, false, rawOffset, dstOffset, status); @@ -540,7 +540,7 @@ int32_t ChineseCalendar::winterSolstice(int32_t gyear) const { double ms = daysToMillis(Grego::fieldsToDay(gyear, UCAL_DECEMBER, 1)); umtx_lock(&astroLock); - if(gChineseCalendarAstro == NULL) { + if(gChineseCalendarAstro == nullptr) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } @@ -570,7 +570,7 @@ int32_t ChineseCalendar::winterSolstice(int32_t gyear) const { int32_t ChineseCalendar::newMoonNear(double days, UBool after) const { umtx_lock(&astroLock); - if(gChineseCalendarAstro == NULL) { + if(gChineseCalendarAstro == nullptr) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } @@ -602,7 +602,7 @@ int32_t ChineseCalendar::synodicMonthsBetween(int32_t day1, int32_t day2) const int32_t ChineseCalendar::majorSolarTerm(int32_t days) const { umtx_lock(&astroLock); - if(gChineseCalendarAstro == NULL) { + if(gChineseCalendarAstro == nullptr) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp index 008bb5a7a39..5e8e8663158 100644 --- a/icu4c/source/i18n/choicfmt.cpp +++ b/icu4c/source/i18n/choicfmt.cpp @@ -92,7 +92,7 @@ ChoiceFormat::ChoiceFormat(const double* limits, : constructorErrorCode(U_ZERO_ERROR), msgPattern(constructorErrorCode) { - setChoices(limits, NULL, formats, cnt, constructorErrorCode); + setChoices(limits, nullptr, formats, cnt, constructorErrorCode); } // ------------------------------------- @@ -209,7 +209,7 @@ ChoiceFormat::dtos(double value, while (*itrPtr) { *(expPtr++) = *(itrPtr++); } - // NULL terminate + // NUL terminate *expPtr = 0; } } @@ -225,7 +225,7 @@ void ChoiceFormat::applyPattern(const UnicodeString& pattern, UErrorCode& status) { - msgPattern.parseChoiceStyle(pattern, NULL, status); + msgPattern.parseChoiceStyle(pattern, nullptr, status); constructorErrorCode = status; } @@ -257,7 +257,7 @@ ChoiceFormat::setChoices( const double* limits, int32_t cnt ) { UErrorCode errorCode = U_ZERO_ERROR; - setChoices(limits, NULL, formats, cnt, errorCode); + setChoices(limits, nullptr, formats, cnt, errorCode); } // ------------------------------------- @@ -281,7 +281,7 @@ ChoiceFormat::setChoices(const double* limits, if (U_FAILURE(errorCode)) { return; } - if (limits == NULL || formats == NULL) { + if (limits == nullptr || formats == nullptr) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -301,7 +301,7 @@ ChoiceFormat::setChoices(const double* limits, } else { result += dtos(limits[i], buf); } - if (closures != NULL && closures[i]) { + if (closures != nullptr && closures[i]) { result += LESS_THAN; } else { result += LESS_EQUAL; @@ -347,7 +347,7 @@ const double* ChoiceFormat::getLimits(int32_t& cnt) const { cnt = 0; - return NULL; + return nullptr; } // ------------------------------------- @@ -357,7 +357,7 @@ const UBool* ChoiceFormat::getClosures(int32_t& cnt) const { cnt = 0; - return NULL; + return nullptr; } // ------------------------------------- @@ -367,7 +367,7 @@ const UnicodeString* ChoiceFormat::getFormats(int32_t& cnt) const { cnt = 0; - return NULL; + return nullptr; } // ------------------------------------- diff --git a/icu4c/source/i18n/coleitr.cpp b/icu4c/source/i18n/coleitr.cpp index 05039502734..a9c6b3de1f2 100644 --- a/icu4c/source/i18n/coleitr.cpp +++ b/icu4c/source/i18n/coleitr.cpp @@ -54,7 +54,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CollationElementIterator) CollationElementIterator::CollationElementIterator( const CollationElementIterator& other) - : UObject(other), iter_(NULL), rbc_(NULL), otherHalf_(0), dir_(0), offsets_(NULL) { + : UObject(other), iter_(nullptr), rbc_(nullptr), otherHalf_(0), dir_(0), offsets_(nullptr) { *this = other; } @@ -82,7 +82,7 @@ UBool ceNeedsTwoParts(int64_t ce) { int32_t CollationElementIterator::getOffset() const { - if (dir_ < 0 && offsets_ != NULL && !offsets_->isEmpty()) { + if (dir_ < 0 && offsets_ != nullptr && !offsets_->isEmpty()) { // CollationIterator::previousCE() decrements the CEs length // while it pops CEs from its internal buffer. int32_t i = iter_->getCEsLength(); @@ -185,9 +185,9 @@ int32_t CollationElementIterator::previous(UErrorCode& status) status = U_INVALID_STATE_ERROR; return NULLORDER; } - if (offsets_ == NULL) { + if (offsets_ == nullptr) { offsets_ = new UVector32(status); - if (offsets_ == NULL) { + if (offsets_ == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return NULLORDER; } @@ -286,7 +286,7 @@ void CollationElementIterator::setText(const UnicodeString& source, } else { newIter = new FCDUTF16CollationIterator(rbc_->data, numeric, s, s, s + string_.length()); } - if (newIter == NULL) { + if (newIter == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -331,7 +331,7 @@ CollationElementIterator::CollationElementIterator( const UnicodeString &source, const RuleBasedCollator *coll, UErrorCode &status) - : iter_(NULL), rbc_(coll), otherHalf_(0), dir_(0), offsets_(NULL) { + : iter_(nullptr), rbc_(coll), otherHalf_(0), dir_(0), offsets_(nullptr) { setText(source, status); } @@ -343,7 +343,7 @@ CollationElementIterator::CollationElementIterator( const CharacterIterator &source, const RuleBasedCollator *coll, UErrorCode &status) - : iter_(NULL), rbc_(coll), otherHalf_(0), dir_(0), offsets_(NULL) { + : iter_(nullptr), rbc_(coll), otherHalf_(0), dir_(0), offsets_(nullptr) { // We only call source.getText() which should be const anyway. setText(const_cast(source), status); } @@ -360,18 +360,18 @@ const CollationElementIterator& CollationElementIterator::operator=( CollationIterator *newIter; const FCDUTF16CollationIterator *otherFCDIter = dynamic_cast(other.iter_); - if(otherFCDIter != NULL) { + if(otherFCDIter != nullptr) { newIter = new FCDUTF16CollationIterator(*otherFCDIter, string_.getBuffer()); } else { const UTF16CollationIterator *otherIter = dynamic_cast(other.iter_); - if(otherIter != NULL) { + if(otherIter != nullptr) { newIter = new UTF16CollationIterator(*otherIter, string_.getBuffer()); } else { - newIter = NULL; + newIter = nullptr; } } - if(newIter != NULL) { + if(newIter != nullptr) { delete iter_; iter_ = newIter; rbc_ = other.rbc_; @@ -380,12 +380,12 @@ const CollationElementIterator& CollationElementIterator::operator=( string_ = other.string_; } - if(other.dir_ < 0 && other.offsets_ != NULL && !other.offsets_->isEmpty()) { + if(other.dir_ < 0 && other.offsets_ != nullptr && !other.offsets_->isEmpty()) { UErrorCode errorCode = U_ZERO_ERROR; - if(offsets_ == NULL) { + if(offsets_ == nullptr) { offsets_ = new UVector32(other.offsets_->size(), errorCode); } - if(offsets_ != NULL) { + if(offsets_ != nullptr) { offsets_->assign(*other.offsets_, errorCode); } } @@ -435,15 +435,15 @@ MaxExpSink::~MaxExpSink() {} UHashtable * CollationElementIterator::computeMaxExpansions(const CollationData *data, UErrorCode &errorCode) { - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } UHashtable *maxExpansions = uhash_open(uhash_hashLong, uhash_compareLong, uhash_compareLong, &errorCode); - if (U_FAILURE(errorCode)) { return NULL; } + if (U_FAILURE(errorCode)) { return nullptr; } MaxExpSink sink(maxExpansions, errorCode); - ContractionsAndExpansions(NULL, NULL, &sink, true).forData(data, errorCode); + ContractionsAndExpansions(nullptr, nullptr, &sink, true).forData(data, errorCode); if (U_FAILURE(errorCode)) { uhash_close(maxExpansions); - return NULL; + return nullptr; } return maxExpansions; } @@ -457,7 +457,7 @@ int32_t CollationElementIterator::getMaxExpansion(const UHashtable *maxExpansions, int32_t order) { if (order == 0) { return 1; } int32_t max; - if(maxExpansions != NULL && (max = uhash_igeti(maxExpansions, order)) != 0) { + if(maxExpansions != nullptr && (max = uhash_igeti(maxExpansions, order)) != 0) { return max; } if ((order & 0xc0) == 0xc0) { diff --git a/icu4c/source/i18n/coll.cpp b/icu4c/source/i18n/coll.cpp index b22a9d58760..e0322eda91e 100644 --- a/icu4c/source/i18n/coll.cpp +++ b/icu4c/source/i18n/coll.cpp @@ -61,10 +61,10 @@ #include "uresimp.h" #include "ucln_in.h" -static icu::Locale* availableLocaleList = NULL; +static icu::Locale* availableLocaleList = nullptr; static int32_t availableLocaleListCount; #if !UCONFIG_NO_SERVICE -static icu::ICULocaleService* gService = NULL; +static icu::ICULocaleService* gService = nullptr; static icu::UInitOnce gServiceInitOnce {}; #endif static icu::UInitOnce gAvailableLocaleListInitOnce {}; @@ -77,13 +77,13 @@ static UBool U_CALLCONV collator_cleanup(void) { #if !UCONFIG_NO_SERVICE if (gService) { delete gService; - gService = NULL; + gService = nullptr; } gServiceInitOnce.reset(); #endif if (availableLocaleList) { delete []availableLocaleList; - availableLocaleList = NULL; + availableLocaleList = nullptr; } availableLocaleListCount = 0; gAvailableLocaleListInitOnce.reset(); @@ -146,7 +146,7 @@ ICUCollatorFactory::create(const ICUServiceKey& key, const ICUService* /* servic return Collator::makeInstance(loc, status); } - return NULL; + return nullptr; } // ------------------------------------- @@ -181,7 +181,7 @@ public: virtual UObject* getKey(ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode& status) const override { UnicodeString ar; - if (actualReturn == NULL) { + if (actualReturn == nullptr) { actualReturn = &ar; } return (Collator*)ICULocaleService::getKey(key, actualReturn, status); @@ -214,7 +214,7 @@ getService(void) static inline UBool hasService(void) { - UBool retVal = !gServiceInitOnce.isReset() && (getService() != NULL); + UBool retVal = !gServiceInitOnce.isReset() && (getService() != nullptr); return retVal; } @@ -223,9 +223,9 @@ hasService(void) static void U_CALLCONV initAvailableLocaleList(UErrorCode &status) { U_ASSERT(availableLocaleListCount == 0); - U_ASSERT(availableLocaleList == NULL); + U_ASSERT(availableLocaleList == nullptr); // for now, there is a hardcoded list, so just walk through that list and set it up. - UResourceBundle *index = NULL; + UResourceBundle *index = nullptr; StackUResourceBundle installed; int32_t i = 0; @@ -236,11 +236,11 @@ initAvailableLocaleList(UErrorCode &status) { availableLocaleListCount = ures_getSize(installed.getAlias()); availableLocaleList = new Locale[availableLocaleListCount]; - if (availableLocaleList != NULL) { + if (availableLocaleList != nullptr) { ures_resetIterator(installed.getAlias()); while(ures_hasNext(installed.getAlias())) { - const char *tempKey = NULL; - ures_getNextString(installed.getAlias(), NULL, &tempKey, &status); + const char *tempKey = nullptr; + ures_getNextString(installed.getAlias(), nullptr, &tempKey, &status); availableLocaleList[i++] = Locale(tempKey); } } @@ -434,7 +434,7 @@ Collator* U_EXPORT2 Collator::createInstance(const Locale& desiredLocale, if (desiredLocale.isBogus()) { // Locale constructed from malformed locale ID or language tag. status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } Collator* coll; @@ -446,18 +446,18 @@ Collator* U_EXPORT2 Collator::createInstance(const Locale& desiredLocale, #endif { coll = makeInstance(desiredLocale, status); - // Either returns NULL with U_FAILURE(status), or non-NULL with U_SUCCESS(status) + // Either returns nullptr with U_FAILURE(status), or non-nullptr with U_SUCCESS(status) } - // The use of *coll in setAttributesFromKeywords can cause the NULL check to be + // The use of *coll in setAttributesFromKeywords can cause the nullptr check to be // optimized out of the delete even though setAttributesFromKeywords returns // immediately if U_FAILURE(status), so we add a check here. if (U_FAILURE(status)) { - return NULL; + return nullptr; } setAttributesFromKeywords(desiredLocale, *coll, status); if (U_FAILURE(status)) { delete coll; - return NULL; + return nullptr; } return coll; } @@ -467,7 +467,7 @@ Collator* Collator::makeInstance(const Locale& desiredLocale, UErrorCode& statu const CollationCacheEntry *entry = CollationLoader::loadTailoring(desiredLocale, status); if (U_SUCCESS(status)) { Collator *result = new RuleBasedCollator(entry); - if (result != NULL) { + if (result != nullptr) { // Both the unified cache's get() and the RBC constructor // did addRef(). Undo one of them. entry->removeRef(); @@ -475,11 +475,11 @@ Collator* Collator::makeInstance(const Locale& desiredLocale, UErrorCode& statu } status = U_MEMORY_ALLOCATION_ERROR; } - if (entry != NULL) { + if (entry != nullptr) { // Undo the addRef() from the cache.get(). entry->removeRef(); } - return NULL; + return nullptr; } Collator * @@ -561,7 +561,7 @@ UBool Collator::greater(const UnicodeString& source, const Locale* U_EXPORT2 Collator::getAvailableLocales(int32_t& count) { UErrorCode status = U_ZERO_ERROR; - Locale *result = NULL; + Locale *result = nullptr; count = 0; if (isAvailableLocaleListInitialized(status)) { @@ -594,7 +594,7 @@ UnicodeString& U_EXPORT2 Collator::getDisplayName(const Locale& objectLocale, /* This is useless information */ /*void Collator::getVersion(UVersionInfo versionInfo) const { - if (versionInfo!=NULL) + if (versionInfo!=nullptr) uprv_memcpy(versionInfo, fVersion, U_MAX_VERSION_LENGTH); } */ @@ -665,7 +665,7 @@ Collator::setLocales(const Locale& /* requestedLocale */, const Locale& /* valid UnicodeSet *Collator::getTailoredSet(UErrorCode &status) const { if(U_FAILURE(status)) { - return NULL; + return nullptr; } // everything can be changed return new UnicodeSet(0, 0x10FFFF); @@ -684,7 +684,7 @@ Collator::registerInstance(Collator* toAdopt, const Locale& locale, UErrorCode& toAdopt->setLocales(locale, locale, locale); return getService()->registerInstance(toAdopt, locale, status); } - return NULL; + return nullptr; } // ------------------------------------- @@ -698,7 +698,7 @@ public: CFactory(CollatorFactory* delegate, UErrorCode& status) : LocaleKeyFactory(delegate->visible() ? VISIBLE : INVISIBLE) , _delegate(delegate) - , _ids(NULL) + , _ids(nullptr) { if (U_SUCCESS(status)) { int32_t count = 0; @@ -709,7 +709,7 @@ public: _ids->put(idlist[i], (void*)this, status); if (U_FAILURE(status)) { delete _ids; - _ids = NULL; + _ids = nullptr; return; } } @@ -729,7 +729,7 @@ protected: if (U_SUCCESS(status)) { return _ids; } - return NULL; + return nullptr; } virtual UnicodeString& @@ -751,7 +751,7 @@ CFactory::create(const ICUServiceKey& key, const ICUService* /* service */, UErr lkey.currentLocale(validLoc); return _delegate->createCollator(validLoc); } - return NULL; + return nullptr; } UnicodeString& @@ -760,7 +760,7 @@ CFactory::getDisplayName(const UnicodeString& id, const Locale& locale, UnicodeS if ((_coverage & 0x1) == 0) { UErrorCode status = U_ZERO_ERROR; const Hashtable* ids = getSupportedIDs(status); - if (ids && (ids->get(id) != NULL)) { + if (ids && (ids->get(id) != nullptr)) { Locale loc; LocaleUtility::initLocaleFromName(id, loc); return _delegate->getDisplayName(loc, locale, result); @@ -780,7 +780,7 @@ Collator::registerFactory(CollatorFactory* toAdopt, UErrorCode& status) } status = U_MEMORY_ALLOCATION_ERROR; } - return NULL; + return nullptr; } // ------------------------------------- @@ -831,14 +831,14 @@ public: const char* result; if(index < availableLocaleListCount) { result = availableLocaleList[index++].getName(); - if(resultLength != NULL) { + if(resultLength != nullptr) { *resultLength = (int32_t)uprv_strlen(result); } } else { - if(resultLength != NULL) { + if(resultLength != nullptr) { *resultLength = 0; } - result = NULL; + result = nullptr; } return result; } @@ -873,7 +873,7 @@ Collator::getAvailableLocales(void) if (isAvailableLocaleListInitialized(status)) { return new CollationLocaleListEnumeration(); } - return NULL; + return nullptr; } StringEnumeration* U_EXPORT2 @@ -961,7 +961,7 @@ Collator::getEquivalentReorderCodes(int32_t reorderCode, int32_t *dest, int32_t capacity, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return 0; } - if(capacity < 0 || (dest == NULL && capacity > 0)) { + if(capacity < 0 || (dest == nullptr && capacity > 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -986,7 +986,7 @@ Collator::internalCompareUTF8(const char *left, int32_t leftLength, const char *right, int32_t rightLength, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return UCOL_EQUAL; } - if((left == NULL && leftLength != 0) || (right == NULL && rightLength != 0)) { + if((left == nullptr && leftLength != 0) || (right == nullptr && rightLength != 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return UCOL_EQUAL; } diff --git a/icu4c/source/i18n/collationbuilder.cpp b/icu4c/source/i18n/collationbuilder.cpp index fbf09a313d6..81109c13957 100644 --- a/icu4c/source/i18n/collationbuilder.cpp +++ b/icu4c/source/i18n/collationbuilder.cpp @@ -83,72 +83,72 @@ BundleImporter::getRules( // most code will not have a static dependency on the builder code. RuleBasedCollator::RuleBasedCollator() - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { } RuleBasedCollator::RuleBasedCollator(const UnicodeString &rules, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { - internalBuildTailoring(rules, UCOL_DEFAULT, UCOL_DEFAULT, NULL, NULL, errorCode); + internalBuildTailoring(rules, UCOL_DEFAULT, UCOL_DEFAULT, nullptr, nullptr, errorCode); } RuleBasedCollator::RuleBasedCollator(const UnicodeString &rules, ECollationStrength strength, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { - internalBuildTailoring(rules, strength, UCOL_DEFAULT, NULL, NULL, errorCode); + internalBuildTailoring(rules, strength, UCOL_DEFAULT, nullptr, nullptr, errorCode); } RuleBasedCollator::RuleBasedCollator(const UnicodeString &rules, UColAttributeValue decompositionMode, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { - internalBuildTailoring(rules, UCOL_DEFAULT, decompositionMode, NULL, NULL, errorCode); + internalBuildTailoring(rules, UCOL_DEFAULT, decompositionMode, nullptr, nullptr, errorCode); } RuleBasedCollator::RuleBasedCollator(const UnicodeString &rules, ECollationStrength strength, UColAttributeValue decompositionMode, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { - internalBuildTailoring(rules, strength, decompositionMode, NULL, NULL, errorCode); + internalBuildTailoring(rules, strength, decompositionMode, nullptr, nullptr, errorCode); } RuleBasedCollator::RuleBasedCollator(const UnicodeString &rules, UParseError &parseError, UnicodeString &reason, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { @@ -163,7 +163,7 @@ RuleBasedCollator::internalBuildTailoring(const UnicodeString &rules, UErrorCode &errorCode) { const CollationTailoring *base = CollationRoot::getRoot(errorCode); if(U_FAILURE(errorCode)) { return; } - if(outReason != NULL) { outReason->remove(); } + if(outReason != nullptr) { outReason->remove(); } CollationBuilder builder(base, errorCode); UVersionInfo noVersion = { 0, 0, 0, 0 }; BundleImporter importer; @@ -172,7 +172,7 @@ RuleBasedCollator::internalBuildTailoring(const UnicodeString &rules, outParseError, errorCode)); if(U_FAILURE(errorCode)) { const char *reason = builder.getErrorReason(); - if(reason != NULL && outReason != NULL) { + if(reason != nullptr && outReason != nullptr) { *outReason = UnicodeString(reason, -1, US_INV); } return; @@ -201,7 +201,7 @@ CollationBuilder::CollationBuilder(const CollationTailoring *b, UBool icu4xMode, variableTop(0), dataBuilder(new CollationDataBuilder(icu4xMode, errorCode)), fastLatinEnabled(true), icu4xMode(icu4xMode), - errorReason(NULL), + errorReason(nullptr), cesLength(0), rootPrimaryIndexes(errorCode), nodes(errorCode) { nfcImpl.ensureCanonIterData(errorCode); @@ -209,7 +209,7 @@ CollationBuilder::CollationBuilder(const CollationTailoring *b, UBool icu4xMode, errorReason = "CollationBuilder fields initialization failed"; return; } - if(dataBuilder == NULL) { + if(dataBuilder == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -233,19 +233,19 @@ CollationBuilder::parseAndBuild(const UnicodeString &ruleString, CollationRuleParser::Importer *importer, UParseError *outParseError, UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } - if(baseData->rootElements == NULL) { + if(U_FAILURE(errorCode)) { return nullptr; } + if(baseData->rootElements == nullptr) { errorCode = U_MISSING_RESOURCE_ERROR; errorReason = "missing root elements data, tailoring not supported"; - return NULL; + return nullptr; } LocalPointer tailoring(new CollationTailoring(base->settings)); if(tailoring.isNull() || tailoring->isBogus()) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } CollationRuleParser parser(baseData, errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } // Note: This always bases &[last variable] and &[first regular] // on the root collator's maxVariable/variableTop. // If we wanted this to change after [maxVariable x], then we would keep @@ -257,7 +257,7 @@ CollationBuilder::parseAndBuild(const UnicodeString &ruleString, CollationSettings &ownedSettings = *SharedObject::copyOnWrite(tailoring->settings); parser.parse(ruleString, ownedSettings, outParseError, errorCode); errorReason = parser.getErrorReason(); - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } if(dataBuilder->hasMappings()) { makeTailoredCEs(errorCode); if (!icu4xMode) { @@ -274,15 +274,15 @@ CollationBuilder::parseAndBuild(const UnicodeString &ruleString, dataBuilder->optimize(optimizeSet, errorCode); } tailoring->ensureOwnedData(errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } if(fastLatinEnabled) { dataBuilder->enableFastLatin(); } dataBuilder->build(*tailoring->ownedData, errorCode); tailoring->builder = dataBuilder; - dataBuilder = NULL; + dataBuilder = nullptr; } else { tailoring->data = baseData; } - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } ownedSettings.fastLatinOptions = CollationFastLatin::getOptions( tailoring->data, ownedSettings, ownedSettings.fastLatinPrimaries, UPRV_LENGTHOF(ownedSettings.fastLatinPrimaries)); @@ -1644,21 +1644,21 @@ U_CAPI UCollator * U_EXPORT2 ucol_openRules(const UChar *rules, int32_t rulesLength, UColAttributeValue normalizationMode, UCollationStrength strength, UParseError *parseError, UErrorCode *pErrorCode) { - if(U_FAILURE(*pErrorCode)) { return NULL; } - if(rules == NULL && rulesLength != 0) { + if(U_FAILURE(*pErrorCode)) { return nullptr; } + if(rules == nullptr && rulesLength != 0) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } RuleBasedCollator *coll = new RuleBasedCollator(); - if(coll == NULL) { + if(coll == nullptr) { *pErrorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } UnicodeString r((UBool)(rulesLength < 0), rules, rulesLength); - coll->internalBuildTailoring(r, strength, normalizationMode, parseError, NULL, *pErrorCode); + coll->internalBuildTailoring(r, strength, normalizationMode, parseError, nullptr, *pErrorCode); if(U_FAILURE(*pErrorCode)) { delete coll; - return NULL; + return nullptr; } return coll->toUCollator(); } @@ -1696,14 +1696,14 @@ ucol_getUnsafeSet( const UCollator *coll, USet *contractions = uset_open(0,0); int32_t i = 0, j = 0; - ucol_getContractionsAndExpansions(coll, contractions, NULL, false, status); + ucol_getContractionsAndExpansions(coll, contractions, nullptr, false, status); int32_t contsSize = uset_size(contractions); UChar32 c = 0; // Contraction set consists only of strings // to get unsafe code points, we need to // break the strings apart and add them to the unsafe set for(i = 0; i < contsSize; i++) { - len = uset_getItem(contractions, i, NULL, NULL, buffer, internalBufferSize, status); + len = uset_getItem(contractions, i, nullptr, nullptr, buffer, internalBufferSize, status); if(len > 0) { j = 0; while(j < len) { diff --git a/icu4c/source/i18n/collationdata.h b/icu4c/source/i18n/collationdata.h index 71bf17abd0d..69ea3d68007 100644 --- a/icu4c/source/i18n/collationdata.h +++ b/icu4c/source/i18n/collationdata.h @@ -49,17 +49,17 @@ struct U_I18N_API CollationData : public UMemory { static constexpr int32_t MAX_NUM_SCRIPT_RANGES = 256; CollationData(const Normalizer2Impl &nfc) - : trie(NULL), - ce32s(NULL), ces(NULL), contexts(NULL), base(NULL), - jamoCE32s(NULL), + : trie(nullptr), + ce32s(nullptr), ces(nullptr), contexts(nullptr), base(nullptr), + jamoCE32s(nullptr), nfcImpl(nfc), numericPrimary(0x12000000), ce32sLength(0), cesLength(0), contextsLength(0), - compressibleBytes(NULL), - unsafeBackwardSet(NULL), - fastLatinTable(NULL), fastLatinTableLength(0), - numScripts(0), scriptsIndex(NULL), scriptStarts(NULL), scriptStartsLength(0), - rootElements(NULL), rootElementsLength(0) {} + compressibleBytes(nullptr), + unsafeBackwardSet(nullptr), + fastLatinTable(nullptr), fastLatinTableLength(0), + numScripts(0), scriptsIndex(nullptr), scriptStarts(nullptr), scriptStartsLength(0), + rootElements(nullptr), rootElementsLength(0) {} uint32_t getCE32(UChar32 c) const { return UTRIE2_GET32(trie, c); @@ -179,7 +179,7 @@ struct U_I18N_API CollationData : public UMemory { const int64_t *ces; /** Array of prefix and contraction-suffix matching data. */ const UChar *contexts; - /** Base collation data, or NULL if this data itself is a base. */ + /** Base collation data, or nullptr if this data itself is a base. */ const CollationData *base; /** * Simple array of JAMO_CE32S_LENGTH=19+21+27 CE32s, one per canonical Jamo L/V/T. @@ -238,7 +238,7 @@ struct U_I18N_API CollationData : public UMemory { /** * Collation elements in the root collator. * Used by the CollationRootElements class. The data structure is described there. - * NULL in a tailoring. + * nullptr in a tailoring. */ const uint32_t *rootElements; int32_t rootElementsLength; diff --git a/icu4c/source/i18n/collationdatabuilder.cpp b/icu4c/source/i18n/collationdatabuilder.cpp index e7c3da1ea5e..9f33550368c 100644 --- a/icu4c/source/i18n/collationdatabuilder.cpp +++ b/icu4c/source/i18n/collationdatabuilder.cpp @@ -166,7 +166,7 @@ protected: DataBuilderCollationIterator::DataBuilderCollationIterator(CollationDataBuilder &b) : CollationIterator(&builderData, /*numeric=*/ false), builder(b), builderData(b.nfcImpl), - s(NULL), pos(0) { + s(nullptr), pos(0) { builderData.base = builder.base; // Set all of the jamoCE32s[] to indirection CE32s. for(int32_t j = 0; j < CollationData::JAMO_CE32S_LENGTH; ++j) { // Count across Jamo types. @@ -298,13 +298,13 @@ DataBuilderCollationIterator::getCE32FromBuilderData(uint32_t ce32, UErrorCode & CollationDataBuilder::CollationDataBuilder(UBool icu4xMode, UErrorCode &errorCode) : nfcImpl(*Normalizer2Factory::getNFCImpl(errorCode)), - base(NULL), baseSettings(NULL), - trie(NULL), + base(nullptr), baseSettings(nullptr), + trie(nullptr), ce32s(errorCode), ce64s(errorCode), conditionalCE32s(errorCode), modified(false), icu4xMode(icu4xMode), - fastLatinEnabled(false), fastLatinBuilder(NULL), - collIter(NULL) { + fastLatinEnabled(false), fastLatinBuilder(nullptr), + collIter(nullptr) { // Reserve the first CE32 for U+0000. if (!icu4xMode) { ce32s.addElement(0, errorCode); @@ -321,11 +321,11 @@ CollationDataBuilder::~CollationDataBuilder() { void CollationDataBuilder::initForTailoring(const CollationData *b, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(trie != NULL) { + if(trie != nullptr) { errorCode = U_INVALID_STATE_ERROR; return; } - if(b == NULL) { + if(b == nullptr) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -566,7 +566,7 @@ CollationDataBuilder::addCE32(const UnicodeString &prefix, const UnicodeString & errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } - if(trie == NULL || utrie2_isFrozen(trie)) { + if(trie == nullptr || utrie2_isFrozen(trie)) { errorCode = U_INVALID_STATE_ERROR; return; } @@ -777,7 +777,7 @@ CollationDataBuilder::encodeCEs(const int64_t ces[], int32_t cesLength, errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } - if(trie == NULL || utrie2_isFrozen(trie)) { + if(trie == nullptr || utrie2_isFrozen(trie)) { errorCode = U_INVALID_STATE_ERROR; return 0; } @@ -1148,12 +1148,12 @@ void CollationDataBuilder::copyFrom(const CollationDataBuilder &src, const CEModifier &modifier, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(trie == NULL || utrie2_isFrozen(trie)) { + if(trie == nullptr || utrie2_isFrozen(trie)) { errorCode = U_INVALID_STATE_ERROR; return; } CopyHelper helper(src, *this, modifier, errorCode); - utrie2_enum(src.trie, NULL, enumRangeForCopy, &helper); + utrie2_enum(src.trie, nullptr, enumRangeForCopy, &helper); errorCode = helper.errorCode; // Update the contextChars and the unsafeBackwardSet while copying, // in case a character had conditional mappings in the source builder @@ -1205,7 +1205,7 @@ CollationDataBuilder::suppressContractions(const UnicodeSet &set, UErrorCode &er UBool CollationDataBuilder::getJamoCE32s(uint32_t jamoCE32s[], UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return false; } - UBool anyJamoAssigned = base == NULL; // always set jamoCE32s in the base data + UBool anyJamoAssigned = base == nullptr; // always set jamoCE32s in the base data UBool needToCopyFromBase = false; for(int32_t j = 0; j < CollationData::JAMO_CE32S_LENGTH; ++j) { // Count across Jamo types. UChar32 jamo = jamoCpFromIndex(j); @@ -1320,7 +1320,7 @@ void CollationDataBuilder::setLeadSurrogates(UErrorCode &errorCode) { for(UChar lead = 0xd800; lead < 0xdc00; ++lead) { int32_t value = -1; - utrie2_enumForLeadSurrogate(trie, lead, NULL, enumRangeLeadValue, &value); + utrie2_enumForLeadSurrogate(trie, lead, nullptr, enumRangeLeadValue, &value); utrie2_set32ForLeadSurrogateCodeUnit( trie, lead, Collation::makeCE32FromTagAndIndex(Collation::LEAD_SURROGATE_TAG, 0) | (uint32_t)value, @@ -1331,7 +1331,7 @@ CollationDataBuilder::setLeadSurrogates(UErrorCode &errorCode) { void CollationDataBuilder::build(CollationData &data, UErrorCode &errorCode) { buildMappings(data, errorCode); - if(base != NULL) { + if(base != nullptr) { data.numericPrimary = base->numericPrimary; data.compressibleBytes = base->compressibleBytes; data.numScripts = base->numScripts; @@ -1345,7 +1345,7 @@ CollationDataBuilder::build(CollationData &data, UErrorCode &errorCode) { void CollationDataBuilder::buildMappings(CollationData &data, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(trie == NULL || utrie2_isFrozen(trie)) { + if(trie == nullptr || utrie2_isFrozen(trie)) { errorCode = U_INVALID_STATE_ERROR; return; } @@ -1630,25 +1630,25 @@ CollationDataBuilder::buildFastLatinTable(CollationData &data, UErrorCode &error delete fastLatinBuilder; fastLatinBuilder = new CollationFastLatinBuilder(errorCode); - if(fastLatinBuilder == NULL) { + if(fastLatinBuilder == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } if(fastLatinBuilder->forData(data, errorCode)) { const uint16_t *table = fastLatinBuilder->getTable(); int32_t length = fastLatinBuilder->lengthOfTable(); - if(base != NULL && length == base->fastLatinTableLength && + if(base != nullptr && length == base->fastLatinTableLength && uprv_memcmp(table, base->fastLatinTable, length * 2) == 0) { // Same fast Latin table as in the base, use that one instead. delete fastLatinBuilder; - fastLatinBuilder = NULL; + fastLatinBuilder = nullptr; table = base->fastLatinTable; } data.fastLatinTable = table; data.fastLatinTableLength = length; } else { delete fastLatinBuilder; - fastLatinBuilder = NULL; + fastLatinBuilder = nullptr; } } @@ -1671,9 +1671,9 @@ CollationDataBuilder::getCEs(const UnicodeString &prefix, const UnicodeString &s int32_t CollationDataBuilder::getCEs(const UnicodeString &s, int32_t start, int64_t ces[], int32_t cesLength) { - if(collIter == NULL) { + if(collIter == nullptr) { collIter = new DataBuilderCollationIterator(*this); - if(collIter == NULL) { return 0; } + if(collIter == nullptr) { return 0; } } return collIter->fetchCEs(s, start, ces, cesLength); } diff --git a/icu4c/source/i18n/collationdatareader.cpp b/icu4c/source/i18n/collationdatareader.cpp index a96982cd946..33a834f498c 100644 --- a/icu4c/source/i18n/collationdatareader.cpp +++ b/icu4c/source/i18n/collationdatareader.cpp @@ -47,14 +47,14 @@ void CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes, int32_t inLength, CollationTailoring &tailoring, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(base != NULL) { - if(inBytes == NULL || (0 <= inLength && inLength < 24)) { + if(base != nullptr) { + if(inBytes == nullptr || (0 <= inLength && inLength < 24)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } const DataHeader *header = reinterpret_cast(inBytes); if(!(header->dataHeader.magic1 == 0xda && header->dataHeader.magic2 == 0x27 && - isAcceptable(tailoring.version, NULL, NULL, &header->info))) { + isAcceptable(tailoring.version, nullptr, nullptr, &header->info))) { errorCode = U_INVALID_FORMAT_ERROR; return; } @@ -69,7 +69,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes } } - if(inBytes == NULL || (0 <= inLength && inLength < 8)) { + if(inBytes == nullptr || (0 <= inLength && inLength < 8)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -81,7 +81,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes } // Assume that the tailoring data is in initial state, - // with NULL pointers and 0 lengths. + // with nullptr pointers and 0 lengths. // Set pointers to non-empty data parts. // Do this in order of their byte offsets. (Should help porting to Java.) @@ -102,16 +102,16 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes return; } - const CollationData *baseData = base == NULL ? NULL : base->data; - const int32_t *reorderCodes = NULL; + const CollationData *baseData = base == nullptr ? nullptr : base->data; + const int32_t *reorderCodes = nullptr; int32_t reorderCodesLength = 0; - const uint32_t *reorderRanges = NULL; + const uint32_t *reorderRanges = nullptr; int32_t reorderRangesLength = 0; index = IX_REORDER_CODES_OFFSET; offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 4) { - if(baseData == NULL) { + if(baseData == nullptr) { // We assume for collation settings that // the base data does not have a reordering. errorCode = U_INVALID_FORMAT_ERROR; @@ -138,7 +138,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes // There should be a reorder table only if there are reorder codes. // However, when there are reorder codes the reorder table may be omitted to reduce // the data size. - const uint8_t *reorderTable = NULL; + const uint8_t *reorderTable = nullptr; index = IX_REORDER_TABLE_OFFSET; offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; @@ -153,11 +153,11 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes // when the CollationData is otherwise complete. } - if(baseData != NULL && baseData->numericPrimary != (inIndexes[IX_OPTIONS] & 0xff000000)) { + if(baseData != nullptr && baseData->numericPrimary != (inIndexes[IX_OPTIONS] & 0xff000000)) { errorCode = U_INVALID_FORMAT_ERROR; return; } - CollationData *data = NULL; // Remains NULL if there are no mappings. + CollationData *data = nullptr; // Remains nullptr if there are no mappings. index = IX_TRIE_OFFSET; offset = getIndex(inIndexes, indexesLength, index); @@ -168,10 +168,10 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes data->base = baseData; data->numericPrimary = inIndexes[IX_OPTIONS] & 0xff000000; data->trie = tailoring.trie = utrie2_openFromSerialized( - UTRIE2_32_VALUE_BITS, inBytes + offset, length, NULL, + UTRIE2_32_VALUE_BITS, inBytes + offset, length, nullptr, &errorCode); if(U_FAILURE(errorCode)) { return; } - } else if(baseData != NULL) { + } else if(baseData != nullptr) { // Use the base data. Only the settings are tailored. tailoring.data = baseData; } else { @@ -183,7 +183,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 8) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; // Tailored ces without tailored trie. return; } @@ -195,7 +195,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 4) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; // Tailored ce32s without tailored trie. return; } @@ -205,14 +205,14 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes int32_t jamoCE32sStart = getIndex(inIndexes, indexesLength, IX_JAMO_CE32S_START); if(jamoCE32sStart >= 0) { - if(data == NULL || data->ce32s == NULL) { + if(data == nullptr || data->ce32s == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; // Index into non-existent ce32s[]. return; } data->jamoCE32s = data->ce32s + jamoCE32sStart; - } else if(data == NULL) { + } else if(data == nullptr) { // Nothing to do. - } else if(baseData != NULL) { + } else if(baseData != nullptr) { data->jamoCE32s = baseData->jamoCE32s; } else { errorCode = U_INVALID_FORMAT_ERROR; // No Jamo CE32s for Hangul processing. @@ -224,7 +224,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 4) { length /= 4; - if(data == NULL || length <= CollationRootElements::IX_SEC_TER_BOUNDARIES) { + if(data == nullptr || length <= CollationRootElements::IX_SEC_TER_BOUNDARIES) { errorCode = U_INVALID_FORMAT_ERROR; return; } @@ -248,7 +248,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 2) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; // Tailored contexts without tailored trie. return; } @@ -260,14 +260,14 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 2) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; return; } - if(baseData == NULL) { + if(baseData == nullptr) { #if defined(COLLUNSAFE_COLL_VERSION) && defined (COLLUNSAFE_SERIALIZE) tailoring.unsafeBackwardSet = new UnicodeSet(unsafe_serializedData, unsafe_serializedCount, UnicodeSet::kSerialized, errorCode); - if(tailoring.unsafeBackwardSet == NULL) { + if(tailoring.unsafeBackwardSet == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } else if (U_FAILURE(errorCode)) { @@ -286,7 +286,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes // new UnicodeSet("[[:^lccc=0:][\\udc00-\\udfff]]"). // It is faster and requires fewer code dependencies. tailoring.unsafeBackwardSet = new UnicodeSet(0xdc00, 0xdfff); // trail surrogates - if(tailoring.unsafeBackwardSet == NULL) { + if(tailoring.unsafeBackwardSet == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -296,7 +296,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes // Clone the root collator's set contents. tailoring.unsafeBackwardSet = static_cast( baseData->unsafeBackwardSet->cloneAsThawed()); - if(tailoring.unsafeBackwardSet == NULL) { + if(tailoring.unsafeBackwardSet == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -324,9 +324,9 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes } tailoring.unsafeBackwardSet->freeze(); data->unsafeBackwardSet = tailoring.unsafeBackwardSet; - } else if(data == NULL) { + } else if(data == nullptr) { // Nothing to do. - } else if(baseData != NULL) { + } else if(baseData != nullptr) { // No tailoring-specific data: Alias the root collator's set. data->unsafeBackwardSet = baseData->unsafeBackwardSet; } else { @@ -337,8 +337,8 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes // If the fast Latin format version is different, // or the version is set to 0 for "no fast Latin table", // then just always use the normal string comparison path. - if(data != NULL) { - data->fastLatinTable = NULL; + if(data != nullptr) { + data->fastLatinTable = nullptr; data->fastLatinTableLength = 0; if(((inIndexes[IX_OPTIONS] >> 16) & 0xff) == CollationFastLatin::VERSION) { index = IX_FAST_LATIN_TABLE_OFFSET; @@ -351,7 +351,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes errorCode = U_INVALID_FORMAT_ERROR; // header vs. table version mismatch return; } - } else if(baseData != NULL) { + } else if(baseData != nullptr) { data->fastLatinTable = baseData->fastLatinTable; data->fastLatinTableLength = baseData->fastLatinTableLength; } @@ -362,7 +362,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 2) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; return; } @@ -385,9 +385,9 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes errorCode = U_INVALID_FORMAT_ERROR; return; } - } else if(data == NULL) { + } else if(data == nullptr) { // Nothing to do. - } else if(baseData != NULL) { + } else if(baseData != nullptr) { data->numScripts = baseData->numScripts; data->scriptsIndex = baseData->scriptsIndex; data->scriptStarts = baseData->scriptStarts; @@ -398,14 +398,14 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes offset = getIndex(inIndexes, indexesLength, index); length = getIndex(inIndexes, indexesLength, index + 1) - offset; if(length >= 256) { - if(data == NULL) { + if(data == nullptr) { errorCode = U_INVALID_FORMAT_ERROR; return; } data->compressibleBytes = reinterpret_cast(inBytes + offset); - } else if(data == NULL) { + } else if(data == nullptr) { // Nothing to do. - } else if(baseData != NULL) { + } else if(baseData != nullptr) { data->compressibleBytes = baseData->compressibleBytes; } else { errorCode = U_INVALID_FORMAT_ERROR; // No compressibleBytes[]. @@ -429,7 +429,7 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes } CollationSettings *settings = SharedObject::copyOnWrite(tailoring.settings); - if(settings == NULL) { + if(settings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -468,7 +468,7 @@ CollationDataReader::isAcceptable(void *context, pInfo->formatVersion[0] == 5 ) { UVersionInfo *version = static_cast(context); - if(version != NULL) { + if(version != nullptr) { uprv_memcpy(version, pInfo->dataVersion, 4); } return true; diff --git a/icu4c/source/i18n/collationdatawriter.cpp b/icu4c/source/i18n/collationdatawriter.cpp index b4be7df8878..dff34f533c2 100644 --- a/icu4c/source/i18n/collationdatawriter.cpp +++ b/icu4c/source/i18n/collationdatawriter.cpp @@ -33,22 +33,22 @@ U_NAMESPACE_BEGIN uint8_t * RuleBasedCollator::cloneRuleData(int32_t &length, UErrorCode &errorCode) const { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } LocalMemory buffer((uint8_t *)uprv_malloc(20000)); if(buffer.isNull()) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } length = cloneBinary(buffer.getAlias(), 20000, errorCode); if(errorCode == U_BUFFER_OVERFLOW_ERROR) { - if(buffer.allocateInsteadAndCopy(length, 0) == NULL) { + if(buffer.allocateInsteadAndCopy(length, 0) == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } errorCode = U_ZERO_ERROR; length = cloneBinary(buffer.getAlias(), length, errorCode); } - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } return buffer.orphan(); } @@ -79,7 +79,7 @@ CollationDataWriter::writeBase(const CollationData &data, const CollationSetting const void *rootElements, int32_t rootElementsLength, int32_t indexes[], uint8_t *dest, int32_t capacity, UErrorCode &errorCode) { - return write(true, NULL, + return write(true, nullptr, data, settings, rootElements, rootElementsLength, indexes, dest, capacity, errorCode); @@ -91,7 +91,7 @@ CollationDataWriter::writeTailoring(const CollationTailoring &t, const Collation UErrorCode &errorCode) { return write(false, t.version, *t.data, settings, - NULL, 0, + nullptr, 0, indexes, dest, capacity, errorCode); } @@ -102,7 +102,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, int32_t indexes[], uint8_t *dest, int32_t capacity, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return 0; } - if(capacity < 0 || (capacity > 0 && dest == NULL)) { + if(capacity < 0 || (capacity > 0 && dest == nullptr)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -117,7 +117,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, const CollationData *baseData = data.base; int32_t fastLatinVersion; - if(data.fastLatinTable != NULL) { + if(data.fastLatinTable != nullptr) { fastLatinVersion = (int32_t)CollationFastLatin::VERSION << 16; } else { fastLatinVersion = 0; @@ -132,7 +132,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, hasMappings = true; unsafeBackwardSet = *data.unsafeBackwardSet; fastLatinTableLength = data.fastLatinTableLength; - } else if(baseData == NULL) { + } else if(baseData == nullptr) { hasMappings = false; if(settings.reorderCodesLength == 0) { // only options @@ -207,7 +207,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, dest += headerSize; capacity -= headerSize; } else { - dest = NULL; + dest = nullptr; capacity = 0; } } @@ -233,7 +233,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, totalSize += reorderCodesLength * 4; indexes[CollationDataReader::IX_REORDER_TABLE_OFFSET] = totalSize; - if(settings.reorderTable != NULL) { + if(settings.reorderTable != nullptr) { totalSize += 256; } @@ -245,7 +245,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, length = utrie2_serialize(data.trie, dest + totalSize, capacity - totalSize, &errorCode2); } else { - length = utrie2_serialize(data.trie, NULL, 0, &errorCode2); + length = utrie2_serialize(data.trie, nullptr, 0, &errorCode2); } if(U_FAILURE(errorCode2) && errorCode2 != U_BUFFER_OVERFLOW_ERROR) { errorCode = errorCode2; @@ -287,7 +287,7 @@ CollationDataWriter::write(UBool isBase, const UVersionInfo dataVersion, length = unsafeBackwardSet.serialize( p, (capacity - totalSize) / 2, errorCode2); } else { - length = unsafeBackwardSet.serialize(NULL, 0, errorCode2); + length = unsafeBackwardSet.serialize(nullptr, 0, errorCode2); } if(U_FAILURE(errorCode2) && errorCode2 != U_BUFFER_OVERFLOW_ERROR) { errorCode = errorCode2; diff --git a/icu4c/source/i18n/collationfastlatin.cpp b/icu4c/source/i18n/collationfastlatin.cpp index 35cf60e8151..1fbd27fc8ee 100644 --- a/icu4c/source/i18n/collationfastlatin.cpp +++ b/icu4c/source/i18n/collationfastlatin.cpp @@ -27,7 +27,7 @@ int32_t CollationFastLatin::getOptions(const CollationData *data, const CollationSettings &settings, uint16_t *primaries, int32_t capacity) { const uint16_t *table = data->fastLatinTable; - if(table == NULL) { return -1; } + if(table == nullptr) { return -1; } U_ASSERT(capacity == LATIN_LIMIT); if(capacity != LATIN_LIMIT) { return -1; } @@ -154,7 +154,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie leftPair &= LONG_PRIMARY_MASK; break; } else { - leftPair = nextPair(table, c, leftPair, left, NULL, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, left, nullptr, leftIndex, leftLength); if(leftPair == BAIL_OUT) { return BAIL_OUT_RESULT; } leftPair = getPrimaries(variableTop, leftPair); } @@ -185,7 +185,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie rightPair &= LONG_PRIMARY_MASK; break; } else { - rightPair = nextPair(table, c, rightPair, right, NULL, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, right, nullptr, rightIndex, rightLength); if(rightPair == BAIL_OUT) { return BAIL_OUT_RESULT; } rightPair = getPrimaries(variableTop, rightPair); } @@ -236,7 +236,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie leftPair = COMMON_SEC_PLUS_OFFSET; break; } else { - leftPair = nextPair(table, c, leftPair, left, NULL, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, left, nullptr, leftIndex, leftLength); leftPair = getSecondaries(variableTop, leftPair); } } @@ -261,7 +261,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie rightPair = COMMON_SEC_PLUS_OFFSET; break; } else { - rightPair = nextPair(table, c, rightPair, right, NULL, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, right, nullptr, rightIndex, rightLength); rightPair = getSecondaries(variableTop, rightPair); } } @@ -300,7 +300,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = left[leftIndex++]; leftPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, left, NULL, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, left, nullptr, leftIndex, leftLength); } leftPair = getCases(variableTop, strengthIsPrimary, leftPair); } @@ -313,7 +313,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = right[rightIndex++]; rightPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, right, NULL, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, right, nullptr, rightIndex, rightLength); } rightPair = getCases(variableTop, strengthIsPrimary, rightPair); } @@ -353,7 +353,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = left[leftIndex++]; leftPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, left, NULL, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, left, nullptr, leftIndex, leftLength); } leftPair = getTertiaries(variableTop, withCaseBits, leftPair); } @@ -366,7 +366,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = right[rightIndex++]; rightPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, right, NULL, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, right, nullptr, rightIndex, rightLength); } rightPair = getTertiaries(variableTop, withCaseBits, rightPair); } @@ -409,7 +409,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = left[leftIndex++]; leftPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, left, NULL, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, left, nullptr, leftIndex, leftLength); } leftPair = getQuaternaries(variableTop, leftPair); } @@ -422,7 +422,7 @@ CollationFastLatin::compareUTF16(const uint16_t *table, const uint16_t *primarie UChar32 c = right[rightIndex++]; rightPair = (c <= LATIN_MAX) ? table[c] : lookup(table, c); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, right, NULL, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, right, nullptr, rightIndex, rightLength); } rightPair = getQuaternaries(variableTop, rightPair); } @@ -499,7 +499,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries leftPair &= LONG_PRIMARY_MASK; break; } else { - leftPair = nextPair(table, c, leftPair, NULL, left, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, nullptr, left, leftIndex, leftLength); if(leftPair == BAIL_OUT) { return BAIL_OUT_RESULT; } leftPair = getPrimaries(variableTop, leftPair); } @@ -536,7 +536,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries rightPair &= LONG_PRIMARY_MASK; break; } else { - rightPair = nextPair(table, c, rightPair, NULL, right, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, nullptr, right, rightIndex, rightLength); if(rightPair == BAIL_OUT) { return BAIL_OUT_RESULT; } rightPair = getPrimaries(variableTop, rightPair); } @@ -587,7 +587,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries leftPair = COMMON_SEC_PLUS_OFFSET; break; } else { - leftPair = nextPair(table, c, leftPair, NULL, left, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, nullptr, left, leftIndex, leftLength); leftPair = getSecondaries(variableTop, leftPair); } } @@ -612,7 +612,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries rightPair = COMMON_SEC_PLUS_OFFSET; break; } else { - rightPair = nextPair(table, c, rightPair, NULL, right, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, nullptr, right, rightIndex, rightLength); rightPair = getSecondaries(variableTop, rightPair); } } @@ -651,7 +651,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = left[leftIndex++]; leftPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, left, leftIndex); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, NULL, left, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, nullptr, left, leftIndex, leftLength); } leftPair = getCases(variableTop, strengthIsPrimary, leftPair); } @@ -664,7 +664,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = right[rightIndex++]; rightPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, right, rightIndex); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, NULL, right, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, nullptr, right, rightIndex, rightLength); } rightPair = getCases(variableTop, strengthIsPrimary, rightPair); } @@ -704,7 +704,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = left[leftIndex++]; leftPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, left, leftIndex); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, NULL, left, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, nullptr, left, leftIndex, leftLength); } leftPair = getTertiaries(variableTop, withCaseBits, leftPair); } @@ -717,7 +717,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = right[rightIndex++]; rightPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, right, rightIndex); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, NULL, right, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, nullptr, right, rightIndex, rightLength); } rightPair = getTertiaries(variableTop, withCaseBits, rightPair); } @@ -760,7 +760,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = left[leftIndex++]; leftPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, left, leftIndex); if(leftPair < MIN_LONG) { - leftPair = nextPair(table, c, leftPair, NULL, left, leftIndex, leftLength); + leftPair = nextPair(table, c, leftPair, nullptr, left, leftIndex, leftLength); } leftPair = getQuaternaries(variableTop, leftPair); } @@ -773,7 +773,7 @@ CollationFastLatin::compareUTF8(const uint16_t *table, const uint16_t *primaries UChar32 c = right[rightIndex++]; rightPair = (c <= 0x7f) ? table[c] : lookupUTF8Unsafe(table, c, right, rightIndex); if(rightPair < MIN_LONG) { - rightPair = nextPair(table, c, rightPair, NULL, right, rightIndex, rightLength); + rightPair = nextPair(table, c, rightPair, nullptr, right, rightIndex, rightLength); } rightPair = getQuaternaries(variableTop, rightPair); } @@ -872,7 +872,7 @@ CollationFastLatin::nextPair(const uint16_t *table, UChar32 c, uint32_t ce, // Read the next character. int32_t c2; int32_t nextIndex = sIndex; - if(s16 != NULL) { + if(s16 != nullptr) { c2 = s16[nextIndex++]; if(c2 > LATIN_MAX) { if(PUNCT_START <= c2 && c2 < PUNCT_LIMIT) { diff --git a/icu4c/source/i18n/collationfastlatinbuilder.cpp b/icu4c/source/i18n/collationfastlatinbuilder.cpp index fc50e9df8ed..c481445ca00 100644 --- a/icu4c/source/i18n/collationfastlatinbuilder.cpp +++ b/icu4c/source/i18n/collationfastlatinbuilder.cpp @@ -89,7 +89,7 @@ binarySearch(const int64_t list[], int32_t limit, int64_t ce) { CollationFastLatinBuilder::CollationFastLatinBuilder(UErrorCode &errorCode) : ce0(0), ce1(0), contractionCEs(errorCode), uniqueCEs(errorCode), - miniCEs(NULL), + miniCEs(nullptr), firstDigitPrimary(0), firstLatinPrimary(0), lastLatinPrimary(0), firstShortPrimary(0), shortPrimaryOverflow(false), headerLength(0) { @@ -431,7 +431,7 @@ CollationFastLatinBuilder::encodeUniqueCEs(UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return false; } uprv_free(miniCEs); miniCEs = (uint16_t *)uprv_malloc(uniqueCEs.size() * 2); - if(miniCEs == NULL) { + if(miniCEs == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return false; } diff --git a/icu4c/source/i18n/collationiterator.cpp b/icu4c/source/i18n/collationiterator.cpp index a47b3d86bea..3a6671d5288 100644 --- a/icu4c/source/i18n/collationiterator.cpp +++ b/icu4c/source/i18n/collationiterator.cpp @@ -46,7 +46,7 @@ CollationIterator::CEBuffer::ensureAppendCapacity(int32_t appCap, UErrorCode &er } } while(capacity < (length + appCap)); int64_t *p = buffer.resize(capacity, length); - if(p == NULL) { + if(p == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return false; } @@ -149,7 +149,7 @@ CollationIterator::CollationIterator(const CollationIterator &other) trie(other.trie), data(other.data), cesIndex(other.cesIndex), - skipped(NULL), + skipped(nullptr), numCpFwd(other.numCpFwd), isNumeric(other.isNumeric) { UErrorCode errorCode = U_ZERO_ERROR; @@ -191,7 +191,7 @@ CollationIterator::operator==(const CollationIterator &other) const { void CollationIterator::reset() { cesIndex = ceBuffer.length = 0; - if(skipped != NULL) { skipped->clear(); } + if(skipped != nullptr) { skipped->clear(); } } int32_t @@ -312,7 +312,7 @@ CollationIterator::appendCEsFromCE32(const CollationData *d, UChar32 c, uint32_t break; } UChar32 nextCp; - if(skipped == NULL && numCpFwd < 0) { + if(skipped == nullptr && numCpFwd < 0) { // Some portion of nextCE32FromContraction() pulled out here as an ASCII fast path, // avoiding the function call and the nextSkippedCodePoint() overhead. nextCp = nextCodePoint(errorCode); @@ -469,17 +469,17 @@ CollationIterator::getCE32FromPrefix(const CollationData *d, uint32_t ce32, UChar32 CollationIterator::nextSkippedCodePoint(UErrorCode &errorCode) { - if(skipped != NULL && skipped->hasNext()) { return skipped->next(); } + if(skipped != nullptr && skipped->hasNext()) { return skipped->next(); } if(numCpFwd == 0) { return U_SENTINEL; } UChar32 c = nextCodePoint(errorCode); - if(skipped != NULL && !skipped->isEmpty() && c >= 0) { skipped->incBeyond(); } + if(skipped != nullptr && !skipped->isEmpty() && c >= 0) { skipped->incBeyond(); } if(numCpFwd > 0 && c >= 0) { --numCpFwd; } return c; } void CollationIterator::backwardNumSkipped(int32_t n, UErrorCode &errorCode) { - if(skipped != NULL && !skipped->isEmpty()) { + if(skipped != nullptr && !skipped->isEmpty()) { n = skipped->backwardNumCodePoints(n); } backwardNumCodePoints(n, errorCode); @@ -501,7 +501,7 @@ CollationIterator::nextCE32FromContraction(const CollationData *d, uint32_t cont // and therefore need not remember the suffixes state from before a mismatch for retrying. // If we are already processing skipped combining marks, then we do track the state. UCharsTrie suffixes(p); - if(skipped != NULL && !skipped->isEmpty()) { skipped->saveTrieState(suffixes); } + if(skipped != nullptr && !skipped->isEmpty()) { skipped->saveTrieState(suffixes); } UStringTrieResult match = suffixes.firstForCodePoint(c); for(;;) { UChar32 nextCp; @@ -510,7 +510,7 @@ CollationIterator::nextCE32FromContraction(const CollationData *d, uint32_t cont if(!USTRINGTRIE_HAS_NEXT(match) || (c = nextSkippedCodePoint(errorCode)) < 0) { return ce32; } - if(skipped != NULL && !skipped->isEmpty()) { skipped->saveTrieState(suffixes); } + if(skipped != nullptr && !skipped->isEmpty()) { skipped->saveTrieState(suffixes); } sinceMatch = 1; } else if(match == USTRINGTRIE_NO_MATCH || (nextCp = nextSkippedCodePoint(errorCode)) < 0) { // No match for c, or partial match (USTRINGTRIE_NO_VALUE) and no further text. @@ -597,10 +597,10 @@ CollationIterator::nextCE32FromDiscontiguousContraction( // We have read and matched (lookAhead-2) code points, // read non-matching c and peeked ahead at nextCp. // Return to the state before the mismatch and continue matching with nextCp. - if(skipped == NULL || skipped->isEmpty()) { - if(skipped == NULL) { + if(skipped == nullptr || skipped->isEmpty()) { + if(skipped == nullptr) { skipped = new SkippedState(); - if(skipped == NULL) { + if(skipped == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return 0; } diff --git a/icu4c/source/i18n/collationiterator.h b/icu4c/source/i18n/collationiterator.h index 93c119c6b85..52650932898 100644 --- a/icu4c/source/i18n/collationiterator.h +++ b/icu4c/source/i18n/collationiterator.h @@ -103,7 +103,7 @@ public: : trie(d->trie), data(d), cesIndex(0), - skipped(NULL), + skipped(nullptr), numCpFwd(-1), isNumeric(numeric) {} diff --git a/icu4c/source/i18n/collationkeys.cpp b/icu4c/source/i18n/collationkeys.cpp index c7e0de618de..c429ac3f8f7 100644 --- a/icu4c/source/i18n/collationkeys.cpp +++ b/icu4c/source/i18n/collationkeys.cpp @@ -28,7 +28,7 @@ SortKeyByteSink::~SortKeyByteSink() {} void SortKeyByteSink::Append(const char *bytes, int32_t n) { - if (n <= 0 || bytes == NULL) { + if (n <= 0 || bytes == nullptr) { return; } if (ignore_ > 0) { @@ -63,7 +63,7 @@ SortKeyByteSink::GetAppendBuffer(int32_t min_capacity, int32_t *result_capacity) { if (min_capacity < 1 || scratch_capacity < min_capacity) { *result_capacity = 0; - return NULL; + return nullptr; } if (ignore_ > 0) { // Do not write ignored bytes right at the end of the buffer. @@ -192,7 +192,7 @@ UBool SortKeyLevel::ensureCapacity(int32_t appendCapacity) { if (newCapacity < 200) { newCapacity = 200; } - if(buffer.resize(newCapacity, len)==NULL) { + if(buffer.resize(newCapacity, len)==nullptr) { return ok = false; } return true; diff --git a/icu4c/source/i18n/collationkeys.h b/icu4c/source/i18n/collationkeys.h index 8dad286dc64..d1331566128 100644 --- a/icu4c/source/i18n/collationkeys.h +++ b/icu4c/source/i18n/collationkeys.h @@ -66,14 +66,14 @@ public: UBool Overflowed() const { return appended_ > capacity_; } /** @return false if memory allocation failed */ - UBool IsOk() const { return buffer_ != NULL; } + UBool IsOk() const { return buffer_ != nullptr; } protected: virtual void AppendBeyondCapacity(const char *bytes, int32_t n, int32_t length) = 0; virtual UBool Resize(int32_t appendCapacity, int32_t length) = 0; void SetNotOk() { - buffer_ = NULL; + buffer_ = nullptr; capacity_ = 0; } diff --git a/icu4c/source/i18n/collationroot.cpp b/icu4c/source/i18n/collationroot.cpp index dc88c35a680..99686345f9b 100644 --- a/icu4c/source/i18n/collationroot.cpp +++ b/icu4c/source/i18n/collationroot.cpp @@ -33,7 +33,7 @@ U_NAMESPACE_BEGIN namespace { -static const CollationCacheEntry *rootSingleton = NULL; +static const CollationCacheEntry *rootSingleton = nullptr; static UInitOnce initOnce {}; } // namespace @@ -51,17 +51,17 @@ U_CDECL_END UDataMemory* CollationRoot::loadFromFile(const char* ucadataPath, UErrorCode &errorCode) { UDataMemory dataMemory; - UDataMemory *rDataMem = NULL; + UDataMemory *rDataMem = nullptr; if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } if (uprv_mapFile(&dataMemory, ucadataPath, &errorCode)) { if (dataMemory.pHeader->dataHeader.magic1 == 0xda && dataMemory.pHeader->dataHeader.magic2 == 0x27 && - CollationDataReader::isAcceptable(NULL, "icu", "ucadata", &dataMemory.pHeader->info)) { + CollationDataReader::isAcceptable(nullptr, "icu", "ucadata", &dataMemory.pHeader->info)) { rDataMem = UDataMemory_createNewInstance(&errorCode); if (U_FAILURE(errorCode)) { - return NULL; + return nullptr; } rDataMem->pHeader = dataMemory.pHeader; rDataMem->mapAddr = dataMemory.mapAddr; @@ -69,16 +69,16 @@ CollationRoot::loadFromFile(const char* ucadataPath, UErrorCode &errorCode) { return rDataMem; } errorCode = U_INVALID_FORMAT_ERROR; - return NULL; + return nullptr; } errorCode = U_MISSING_RESOURCE_ERROR; - return NULL; + return nullptr; } void U_CALLCONV CollationRoot::load(const char* ucadataPath, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - LocalPointer t(new CollationTailoring(NULL)); + LocalPointer t(new CollationTailoring(nullptr)); if(t.isNull() || t->isBogus()) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; @@ -90,11 +90,11 @@ CollationRoot::load(const char* ucadataPath, UErrorCode &errorCode) { t->version, &errorCode); if(U_FAILURE(errorCode)) { return; } const uint8_t *inBytes = static_cast(udata_getMemory(t->memory)); - CollationDataReader::read(NULL, inBytes, udata_getLength(t->memory), *t, errorCode); + CollationDataReader::read(nullptr, inBytes, udata_getLength(t->memory), *t, errorCode); if(U_FAILURE(errorCode)) { return; } ucln_i18n_registerCleanup(UCLN_I18N_COLLATION_ROOT, uprv_collation_root_cleanup); CollationCacheEntry *entry = new CollationCacheEntry(Locale::getRoot(), t.getAlias()); - if(entry != NULL) { + if(entry != nullptr) { t.orphan(); // The rootSingleton took ownership of the tailoring. entry->addRef(); rootSingleton = entry; @@ -103,29 +103,29 @@ CollationRoot::load(const char* ucadataPath, UErrorCode &errorCode) { const CollationCacheEntry * CollationRoot::getRootCacheEntry(UErrorCode &errorCode) { - umtx_initOnce(initOnce, CollationRoot::load, static_cast(NULL), errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + umtx_initOnce(initOnce, CollationRoot::load, static_cast(nullptr), errorCode); + if(U_FAILURE(errorCode)) { return nullptr; } return rootSingleton; } const CollationTailoring * CollationRoot::getRoot(UErrorCode &errorCode) { - umtx_initOnce(initOnce, CollationRoot::load, static_cast(NULL), errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + umtx_initOnce(initOnce, CollationRoot::load, static_cast(nullptr), errorCode); + if(U_FAILURE(errorCode)) { return nullptr; } return rootSingleton->tailoring; } const CollationData * CollationRoot::getData(UErrorCode &errorCode) { const CollationTailoring *root = getRoot(errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } return root->data; } const CollationSettings * CollationRoot::getSettings(UErrorCode &errorCode) { const CollationTailoring *root = getRoot(errorCode); - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } return root->settings; } diff --git a/icu4c/source/i18n/collationruleparser.cpp b/icu4c/source/i18n/collationruleparser.cpp index 7fb95c0b2b5..2e08cd7fd6f 100644 --- a/icu4c/source/i18n/collationruleparser.cpp +++ b/icu4c/source/i18n/collationruleparser.cpp @@ -58,9 +58,9 @@ CollationRuleParser::Importer::~Importer() {} CollationRuleParser::CollationRuleParser(const CollationData *base, UErrorCode &errorCode) : nfd(*Normalizer2::getNFDInstance(errorCode)), nfc(*Normalizer2::getNFCInstance(errorCode)), - rules(NULL), baseData(base), settings(NULL), - parseError(NULL), errorReason(NULL), - sink(NULL), importer(NULL), + rules(nullptr), baseData(base), settings(nullptr), + parseError(nullptr), errorReason(nullptr), + sink(nullptr), importer(nullptr), ruleIndex(0) { } @@ -75,13 +75,13 @@ CollationRuleParser::parse(const UnicodeString &ruleString, if(U_FAILURE(errorCode)) { return; } settings = &outSettings; parseError = outParseError; - if(parseError != NULL) { + if(parseError != nullptr) { parseError->line = 0; parseError->offset = -1; parseError->preContext[0] = 0; parseError->postContext[0] = 0; } - errorReason = NULL; + errorReason = nullptr; parse(ruleString, errorCode); } @@ -638,14 +638,14 @@ CollationRuleParser::parseSetting(UErrorCode &errorCode) { setParseError("expected language tag in [import langTag]", errorCode); return; } - if(importer == NULL) { + if(importer == nullptr) { setParseError("[import langTag] is not supported", errorCode); } else { UnicodeString importedRules; importer->getRules(baseID, length > 0 ? collationType : "standard", importedRules, errorReason, errorCode); if(U_FAILURE(errorCode)) { - if(errorReason == NULL) { + if(errorReason == nullptr) { errorReason = "[import langTag] failed"; } setErrorContext(); @@ -655,7 +655,7 @@ CollationRuleParser::parseSetting(UErrorCode &errorCode) { int32_t outerRuleIndex = ruleIndex; parse(importedRules, errorCode); if(U_FAILURE(errorCode)) { - if(parseError != NULL) { + if(parseError != nullptr) { parseError->offset = outerRuleIndex; } } @@ -825,12 +825,12 @@ CollationRuleParser::setParseError(const char *reason, UErrorCode &errorCode) { // rather than U_PARSE_ERROR; errorCode = U_INVALID_FORMAT_ERROR; errorReason = reason; - if(parseError != NULL) { setErrorContext(); } + if(parseError != nullptr) { setErrorContext(); } } void CollationRuleParser::setErrorContext() { - if(parseError == NULL) { return; } + if(parseError == nullptr) { return; } // Note: This relies on the calling code maintaining the ruleIndex // at a position that is useful for debugging. diff --git a/icu4c/source/i18n/collationsets.cpp b/icu4c/source/i18n/collationsets.cpp index b23c5e318d7..d707e7978ae 100644 --- a/icu4c/source/i18n/collationsets.cpp +++ b/icu4c/source/i18n/collationsets.cpp @@ -48,8 +48,8 @@ TailoredSet::forData(const CollationData *d, UErrorCode &ec) { errorCode = ec; // Preserve info & warning codes. data = d; baseData = d->base; - U_ASSERT(baseData != NULL); - utrie2_enum(data->trie, NULL, enumTailoredRange, this); + U_ASSERT(baseData != nullptr); + utrie2_enum(data->trie, nullptr, enumTailoredRange, this); ec = errorCode; } @@ -218,20 +218,20 @@ TailoredSet::comparePrefixes(UChar32 c, const UChar *p, const UChar *q) { // Parallel iteration over prefixes of both tables. UCharsTrie::Iterator prefixes(p, 0, errorCode); UCharsTrie::Iterator basePrefixes(q, 0, errorCode); - const UnicodeString *tp = NULL; // Tailoring prefix. - const UnicodeString *bp = NULL; // Base prefix. + const UnicodeString *tp = nullptr; // Tailoring prefix. + const UnicodeString *bp = nullptr; // Base prefix. // Use a string with a U+FFFF as the limit sentinel. // U+FFFF is untailorable and will not occur in prefixes. UnicodeString none((UChar)0xffff); for(;;) { - if(tp == NULL) { + if(tp == nullptr) { if(prefixes.next(errorCode)) { tp = &prefixes.getString(); } else { tp = &none; } } - if(bp == NULL) { + if(bp == nullptr) { if(basePrefixes.next(errorCode)) { bp = &basePrefixes.getString(); } else { @@ -243,17 +243,17 @@ TailoredSet::comparePrefixes(UChar32 c, const UChar *p, const UChar *q) { if(cmp < 0) { // tp occurs in the tailoring but not in the base. addPrefix(data, *tp, c, (uint32_t)prefixes.getValue()); - tp = NULL; + tp = nullptr; } else if(cmp > 0) { // bp occurs in the base but not in the tailoring. addPrefix(baseData, *bp, c, (uint32_t)basePrefixes.getValue()); - bp = NULL; + bp = nullptr; } else { setPrefix(*tp); compare(c, (uint32_t)prefixes.getValue(), (uint32_t)basePrefixes.getValue()); resetPrefix(); - tp = NULL; - bp = NULL; + tp = nullptr; + bp = nullptr; } } } @@ -263,22 +263,22 @@ TailoredSet::compareContractions(UChar32 c, const UChar *p, const UChar *q) { // Parallel iteration over suffixes of both tables. UCharsTrie::Iterator suffixes(p, 0, errorCode); UCharsTrie::Iterator baseSuffixes(q, 0, errorCode); - const UnicodeString *ts = NULL; // Tailoring suffix. - const UnicodeString *bs = NULL; // Base suffix. + const UnicodeString *ts = nullptr; // Tailoring suffix. + const UnicodeString *bs = nullptr; // Base suffix. // Use a string with two U+FFFF as the limit sentinel. // U+FFFF is untailorable and will not occur in contractions except maybe // as a single suffix character for a root-collator boundary contraction. UnicodeString none((UChar)0xffff); none.append((UChar)0xffff); for(;;) { - if(ts == NULL) { + if(ts == nullptr) { if(suffixes.next(errorCode)) { ts = &suffixes.getString(); } else { ts = &none; } } - if(bs == NULL) { + if(bs == nullptr) { if(baseSuffixes.next(errorCode)) { bs = &baseSuffixes.getString(); } else { @@ -290,17 +290,17 @@ TailoredSet::compareContractions(UChar32 c, const UChar *p, const UChar *q) { if(cmp < 0) { // ts occurs in the tailoring but not in the base. addSuffix(c, *ts); - ts = NULL; + ts = nullptr; } else if(cmp > 0) { // bs occurs in the base but not in the tailoring. addSuffix(c, *bs); - bs = NULL; + bs = nullptr; } else { suffix = ts; compare(c, (uint32_t)suffixes.getValue(), (uint32_t)baseSuffixes.getValue()); - suffix = NULL; - ts = NULL; - bs = NULL; + suffix = nullptr; + ts = nullptr; + bs = nullptr; } } } @@ -340,12 +340,12 @@ TailoredSet::addSuffix(UChar32 c, const UnicodeString &sfx) { void TailoredSet::add(UChar32 c) { - if(unreversedPrefix.isEmpty() && suffix == NULL) { + if(unreversedPrefix.isEmpty() && suffix == nullptr) { tailored->add(c); } else { UnicodeString s(unreversedPrefix); s.append(c); - if(suffix != NULL) { + if(suffix != nullptr) { s.append(*suffix); } tailored->add(s); @@ -393,12 +393,12 @@ ContractionsAndExpansions::forData(const CollationData *d, UErrorCode &ec) { if(U_FAILURE(ec)) { return; } errorCode = ec; // Preserve info & warning codes. // Add all from the data, can be tailoring or base. - if(d->base != NULL) { + if(d->base != nullptr) { checkTailored = -1; } data = d; - utrie2_enum(data->trie, NULL, enumCnERange, this); - if(d->base == NULL || U_FAILURE(errorCode)) { + utrie2_enum(data->trie, nullptr, enumCnERange, this); + if(d->base == nullptr || U_FAILURE(errorCode)) { ec = errorCode; return; } @@ -406,7 +406,7 @@ ContractionsAndExpansions::forData(const CollationData *d, UErrorCode &ec) { tailored.freeze(); checkTailored = 1; data = d->base; - utrie2_enum(data->trie, NULL, enumCnERange, this); + utrie2_enum(data->trie, nullptr, enumCnERange, this); ec = errorCode; } @@ -429,7 +429,7 @@ ContractionsAndExpansions::handleCE32(UChar32 start, UChar32 end, uint32_t ce32) for(;;) { if((ce32 & 0xff) < Collation::SPECIAL_CE32_LOW_BYTE) { // !isSpecialCE32() - if(sink != NULL) { + if(sink != nullptr) { sink->handleCE(Collation::ceFromSimpleCE32(ce32)); } return; @@ -443,17 +443,17 @@ ContractionsAndExpansions::handleCE32(UChar32 start, UChar32 end, uint32_t ce32) if(U_SUCCESS(errorCode)) { errorCode = U_INTERNAL_PROGRAM_ERROR; } return; case Collation::LONG_PRIMARY_TAG: - if(sink != NULL) { + if(sink != nullptr) { sink->handleCE(Collation::ceFromLongPrimaryCE32(ce32)); } return; case Collation::LONG_SECONDARY_TAG: - if(sink != NULL) { + if(sink != nullptr) { sink->handleCE(Collation::ceFromLongSecondaryCE32(ce32)); } return; case Collation::LATIN_EXPANSION_TAG: - if(sink != NULL) { + if(sink != nullptr) { ces[0] = Collation::latinCE0FromCE32(ce32); ces[1] = Collation::latinCE1FromCE32(ce32); sink->handleExpansion(ces, 2); @@ -465,7 +465,7 @@ ContractionsAndExpansions::handleCE32(UChar32 start, UChar32 end, uint32_t ce32) } return; case Collation::EXPANSION32_TAG: - if(sink != NULL) { + if(sink != nullptr) { const uint32_t *ce32s = data->ce32s + Collation::indexFromCE32(ce32); int32_t length = Collation::lengthFromCE32(ce32); for(int32_t i = 0; i < length; ++i) { @@ -480,7 +480,7 @@ ContractionsAndExpansions::handleCE32(UChar32 start, UChar32 end, uint32_t ce32) } return; case Collation::EXPANSION_TAG: - if(sink != NULL) { + if(sink != nullptr) { int32_t length = Collation::lengthFromCE32(ce32); sink->handleExpansion(data->ces + Collation::indexFromCE32(ce32), length); } @@ -506,10 +506,10 @@ ContractionsAndExpansions::handleCE32(UChar32 start, UChar32 end, uint32_t ce32) ce32 = data->ce32s[0]; break; case Collation::HANGUL_TAG: - if(sink != NULL) { + if(sink != nullptr) { // TODO: This should be optimized, // especially if [start..end] is the complete Hangul range. (assert that) - UTF16CollationIterator iter(data, false, NULL, NULL, NULL); + UTF16CollationIterator iter(data, false, nullptr, nullptr, nullptr); UChar hangul[1] = { 0 }; for(UChar32 c = start; c <= end; ++c) { hangul[0] = (UChar)c; @@ -579,13 +579,13 @@ ContractionsAndExpansions::handleContractions( } handleCE32(start, end, (uint32_t)suffixes.getValue()); } - suffix = NULL; + suffix = nullptr; } void ContractionsAndExpansions::addExpansions(UChar32 start, UChar32 end) { - if(unreversedPrefix.isEmpty() && suffix == NULL) { - if(expansions != NULL) { + if(unreversedPrefix.isEmpty() && suffix == nullptr) { + if(expansions != nullptr) { expansions->add(start, end); } } else { @@ -595,11 +595,11 @@ ContractionsAndExpansions::addExpansions(UChar32 start, UChar32 end) { void ContractionsAndExpansions::addStrings(UChar32 start, UChar32 end, UnicodeSet *set) { - if(set == NULL) { return; } + if(set == nullptr) { return; } UnicodeString s(unreversedPrefix); do { s.append(start); - if(suffix != NULL) { + if(suffix != nullptr) { s.append(*suffix); } set->add(s); diff --git a/icu4c/source/i18n/collationsets.h b/icu4c/source/i18n/collationsets.h index aed41f7ac8d..f69debc5d9f 100644 --- a/icu4c/source/i18n/collationsets.h +++ b/icu4c/source/i18n/collationsets.h @@ -43,9 +43,9 @@ struct CollationData; class TailoredSet : public UMemory { public: TailoredSet(UnicodeSet *t) - : data(NULL), baseData(NULL), + : data(nullptr), baseData(nullptr), tailored(t), - suffix(NULL), + suffix(nullptr), errorCode(U_ZERO_ERROR) {} void forData(const CollationData *d, UErrorCode &errorCode); @@ -94,12 +94,12 @@ public: }; ContractionsAndExpansions(UnicodeSet *con, UnicodeSet *exp, CESink *s, UBool prefixes) - : data(NULL), + : data(nullptr), contractions(con), expansions(exp), sink(s), addPrefixes(prefixes), checkTailored(0), - suffix(NULL), + suffix(nullptr), errorCode(U_ZERO_ERROR) {} void forData(const CollationData *d, UErrorCode &errorCode); diff --git a/icu4c/source/i18n/collationsettings.cpp b/icu4c/source/i18n/collationsettings.cpp index fe051880b81..1533daf38c7 100644 --- a/icu4c/source/i18n/collationsettings.cpp +++ b/icu4c/source/i18n/collationsettings.cpp @@ -30,10 +30,10 @@ U_NAMESPACE_BEGIN CollationSettings::CollationSettings(const CollationSettings &other) : SharedObject(other), options(other.options), variableTop(other.variableTop), - reorderTable(NULL), + reorderTable(nullptr), minHighNoReorder(other.minHighNoReorder), - reorderRanges(NULL), reorderRangesLength(0), - reorderCodes(NULL), reorderCodesLength(0), reorderCodesCapacity(0), + reorderRanges(nullptr), reorderRangesLength(0), + reorderCodes(nullptr), reorderCodesLength(0), reorderCodesCapacity(0), fastLatinOptions(other.fastLatinOptions) { UErrorCode errorCode = U_ZERO_ERROR; copyReorderingFrom(other, errorCode); @@ -72,10 +72,10 @@ CollationSettings::hashCode() const { void CollationSettings::resetReordering() { - // When we turn off reordering, we want to set a NULL permutation + // When we turn off reordering, we want to set a nullptr permutation // rather than a no-op permutation. // Keep the memory via reorderCodes and its capacity. - reorderTable = NULL; + reorderTable = nullptr; minHighNoReorder = 0; reorderRangesLength = 0; reorderCodesLength = 0; @@ -86,7 +86,7 @@ CollationSettings::aliasReordering(const CollationData &data, const int32_t *cod const uint32_t *ranges, int32_t rangesLength, const uint8_t *table, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(table != NULL && + if(table != nullptr && (rangesLength == 0 ? !reorderTableHasSplitBytes(table) : rangesLength >= 2 && @@ -111,7 +111,7 @@ CollationSettings::aliasReordering(const CollationData &data, const int32_t *cod if(firstSplitByteRangeIndex == rangesLength) { U_ASSERT(!reorderTableHasSplitBytes(table)); minHighNoReorder = 0; - reorderRanges = NULL; + reorderRanges = nullptr; reorderRangesLength = 0; } else { U_ASSERT(table[ranges[firstSplitByteRangeIndex] >> 24] == 0); @@ -201,7 +201,7 @@ CollationSettings::setReorderArrays(const int32_t *codes, int32_t codesLength, // Allocate one memory block for the codes, the ranges, and the 16-aligned table. int32_t capacity = (totalLength + 3) & ~3; // round up to a multiple of 4 ints ownedCodes = (int32_t *)uprv_malloc(capacity * 4 + 256); - if(ownedCodes == NULL) { + if(ownedCodes == nullptr) { resetReordering(); errorCode = U_MEMORY_ALLOCATION_ERROR; return; diff --git a/icu4c/source/i18n/collationsettings.h b/icu4c/source/i18n/collationsettings.h index 3da8f6214f6..43a181211c0 100644 --- a/icu4c/source/i18n/collationsettings.h +++ b/icu4c/source/i18n/collationsettings.h @@ -106,10 +106,10 @@ struct U_I18N_API CollationSettings : public SharedObject { : options((UCOL_DEFAULT_STRENGTH << STRENGTH_SHIFT) | (MAX_VAR_PUNCT << MAX_VARIABLE_SHIFT)), variableTop(0), - reorderTable(NULL), + reorderTable(nullptr), minHighNoReorder(0), - reorderRanges(NULL), reorderRangesLength(0), - reorderCodes(NULL), reorderCodesLength(0), reorderCodesCapacity(0), + reorderRanges(nullptr), reorderRangesLength(0), + reorderCodes(nullptr), reorderCodesLength(0), reorderCodesCapacity(0), fastLatinOptions(-1) {} CollationSettings(const CollationSettings &other); @@ -131,7 +131,7 @@ struct U_I18N_API CollationSettings : public SharedObject { UErrorCode &errorCode); void copyReorderingFrom(const CollationSettings &other, UErrorCode &errorCode); - inline UBool hasReordering() const { return reorderTable != NULL; } + inline UBool hasReordering() const { return reorderTable != nullptr; } static UBool reorderTableHasSplitBytes(const uint8_t table[256]); inline uint32_t reorder(uint32_t p) const { uint8_t b = reorderTable[p >> 24]; @@ -216,7 +216,7 @@ struct U_I18N_API CollationSettings : public SharedObject { /** Variable-top primary weight. */ uint32_t variableTop; /** - * 256-byte table for reordering permutation of primary lead bytes; NULL if no reordering. + * 256-byte table for reordering permutation of primary lead bytes; nullptr if no reordering. * A 0 entry at a non-zero index means that the primary lead byte is "split" * (there are different offsets for primaries that share that lead byte) * and the reordering offset must be determined via the reorderRanges. diff --git a/icu4c/source/i18n/collationtailoring.cpp b/icu4c/source/i18n/collationtailoring.cpp index 440414c4336..8d22cf25166 100644 --- a/icu4c/source/i18n/collationtailoring.cpp +++ b/icu4c/source/i18n/collationtailoring.cpp @@ -33,20 +33,20 @@ U_NAMESPACE_BEGIN CollationTailoring::CollationTailoring(const CollationSettings *baseSettings) - : data(NULL), settings(baseSettings), + : data(nullptr), settings(baseSettings), actualLocale(""), - ownedData(NULL), - builder(NULL), memory(NULL), bundle(NULL), - trie(NULL), unsafeBackwardSet(NULL), - maxExpansions(NULL) { - if(baseSettings != NULL) { + ownedData(nullptr), + builder(nullptr), memory(nullptr), bundle(nullptr), + trie(nullptr), unsafeBackwardSet(nullptr), + maxExpansions(nullptr) { + if(baseSettings != nullptr) { U_ASSERT(baseSettings->reorderCodesLength == 0); - U_ASSERT(baseSettings->reorderTable == NULL); + U_ASSERT(baseSettings->reorderTable == nullptr); U_ASSERT(baseSettings->minHighNoReorder == 0); } else { settings = new CollationSettings(); } - if(settings != NULL) { + if(settings != nullptr) { settings->addRef(); } rules.getTerminatedBuffer(); // ensure NUL-termination @@ -69,11 +69,11 @@ CollationTailoring::~CollationTailoring() { UBool CollationTailoring::ensureOwnedData(UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return false; } - if(ownedData == NULL) { + if(ownedData == nullptr) { const Normalizer2Impl *nfcImpl = Normalizer2Factory::getNFCImpl(errorCode); if(U_FAILURE(errorCode)) { return false; } ownedData = new CollationData(*nfcImpl); - if(ownedData == NULL) { + if(ownedData == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return false; } diff --git a/icu4c/source/i18n/collationtailoring.h b/icu4c/source/i18n/collationtailoring.h index a6143c1c269..ed7e46e3b9c 100644 --- a/icu4c/source/i18n/collationtailoring.h +++ b/icu4c/source/i18n/collationtailoring.h @@ -54,7 +54,7 @@ struct U_I18N_API CollationTailoring : public SharedObject { /** * Returns true if the constructor could not initialize properly. */ - UBool isBogus() { return settings == NULL; } + UBool isBogus() { return settings == nullptr; } UBool ensureOwnedData(UErrorCode &errorCode); @@ -97,7 +97,7 @@ private: struct U_I18N_API CollationCacheEntry : public SharedObject { CollationCacheEntry(const Locale &loc, const CollationTailoring *t) : validLocale(loc), tailoring(t) { - if(t != NULL) { + if(t != nullptr) { t->addRef(); } } diff --git a/icu4c/source/i18n/collationweights.cpp b/icu4c/source/i18n/collationweights.cpp index 02d0268f53b..2351484590c 100644 --- a/icu4c/source/i18n/collationweights.cpp +++ b/icu4c/source/i18n/collationweights.cpp @@ -409,7 +409,7 @@ CollationWeights::allocWeightsInShortRanges(int32_t n, int32_t minLength) { /* sort the ranges by weight values */ UErrorCode errorCode=U_ZERO_ERROR; uprv_sortArray(ranges, rangeCount, sizeof(WeightRange), - compareRanges, NULL, false, &errorCode); + compareRanges, nullptr, false, &errorCode); /* ignore error code: we know that the internal sort function will not fail here */ } return true; diff --git a/icu4c/source/i18n/cpdtrans.cpp b/icu4c/source/i18n/cpdtrans.cpp index f2b1c36a338..8236d4fae57 100644 --- a/icu4c/source/i18n/cpdtrans.cpp +++ b/icu4c/source/i18n/cpdtrans.cpp @@ -110,7 +110,7 @@ CompoundTransliterator::CompoundTransliterator(const UnicodeString& newID, CompoundTransliterator::CompoundTransliterator(UVector& list, UParseError& /*parseError*/, UErrorCode& status) : - Transliterator(UnicodeString(), NULL), + Transliterator(UnicodeString(), nullptr), trans(0), numAnonymousRBTs(0) { // TODO add code for parseError...currently unused, but @@ -123,7 +123,7 @@ CompoundTransliterator::CompoundTransliterator(UVector& list, int32_t anonymousRBTs, UParseError& /*parseError*/, UErrorCode& status) : - Transliterator(UnicodeString(), NULL), + Transliterator(UnicodeString(), nullptr), trans(0), numAnonymousRBTs(anonymousRBTs) { init(list, UTRANS_FORWARD, false, status); @@ -131,7 +131,7 @@ CompoundTransliterator::CompoundTransliterator(UVector& list, /** * Finish constructing a transliterator: only to be called by - * constructors. Before calling init(), set trans and filter to NULL. + * constructors. Before calling init(), set trans and filter to nullptr. * @param id the id containing ';'-separated entries * @param direction either FORWARD or REVERSE * @param idSplitPoint the index into id at which the @@ -139,7 +139,7 @@ CompoundTransliterator::CompoundTransliterator(UVector& list, * -1 if there is none. * @param adoptedSplitTransliterator a transliterator to be inserted * before the entry at offset idSplitPoint in the id string. May be - * NULL to insert no entry. + * nullptr to insert no entry. * @param fixReverseID if true, then reconstruct the ID of reverse * entries by calling getID() of component entries. Some constructors * do not require this because they apply a facade ID anyway. @@ -156,7 +156,7 @@ void CompoundTransliterator::init(const UnicodeString& id, } UVector list(status); - UnicodeSet* compoundFilter = NULL; + UnicodeSet* compoundFilter = nullptr; UnicodeString regenID; if (!TransliteratorIDParser::parseCompoundID(id, direction, regenID, list, compoundFilter)) { @@ -169,14 +169,14 @@ void CompoundTransliterator::init(const UnicodeString& id, init(list, direction, fixReverseID, status); - if (compoundFilter != NULL) { + if (compoundFilter != nullptr) { adoptFilter(compoundFilter); } } /** * Finish constructing a transliterator: only to be called by - * constructors. Before calling init(), set trans and filter to NULL. + * constructors. Before calling init(), set trans and filter to nullptr. * @param list a vector of transliterator objects to be adopted. It * should NOT be empty. The list should be in declared order. That * is, it should be in the FORWARD order; if direction is REVERSE then @@ -197,7 +197,7 @@ void CompoundTransliterator::init(UVector& list, if (U_SUCCESS(status)) { count = list.size(); trans = (Transliterator **)uprv_malloc(count * sizeof(Transliterator *)); - /* test for NULL */ + /* test for nullptr */ if (trans == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -286,23 +286,23 @@ CompoundTransliterator& CompoundTransliterator::operator=( Transliterator::operator=(t); int32_t i = 0; UBool failed = false; - if (trans != NULL) { + if (trans != nullptr) { for (i=0; i count) { - if (trans != NULL) { + if (trans != nullptr) { uprv_free(trans); } trans = (Transliterator **)uprv_malloc(t.count * sizeof(Transliterator *)); } count = t.count; - if (trans != NULL) { + if (trans != nullptr) { for (i=0; iclone(); - if (trans[i] == NULL) { + if (trans[i] == nullptr) { failed = true; break; } @@ -314,7 +314,7 @@ CompoundTransliterator& CompoundTransliterator::operator=( int32_t n; for (n = i-1; n >= 0; n--) { uprv_free(trans[n]); - trans[n] = NULL; + trans[n] = nullptr; } } numAnonymousRBTs = t.numAnonymousRBTs; @@ -348,14 +348,14 @@ const Transliterator& CompoundTransliterator::getTransliterator(int32_t index) c void CompoundTransliterator::setTransliterators(Transliterator* const transliterators[], int32_t transCount) { Transliterator** a = (Transliterator **)uprv_malloc(transCount * sizeof(Transliterator *)); - if (a == NULL) { + if (a == nullptr) { return; } int32_t i = 0; UBool failed = false; for (i=0; iclone(); - if (a[i] == NULL) { + if (a[i] == nullptr) { failed = true; break; } @@ -364,7 +364,7 @@ void CompoundTransliterator::setTransliterators(Transliterator* const transliter int32_t n; for (n = i-1; n >= 0; n--) { uprv_free(a[n]); - a[n] = NULL; + a[n] = nullptr; } return; } @@ -401,7 +401,7 @@ UnicodeString& CompoundTransliterator::toRules(UnicodeString& rulesSource, // compoundRBTIndex >= 0. For the transliterator at compoundRBTIndex, // we do call toRules() recursively. rulesSource.truncate(0); - if (numAnonymousRBTs >= 1 && getFilter() != NULL) { + if (numAnonymousRBTs >= 1 && getFilter() != nullptr) { // If we are a compound RBT and if we have a global // filter, then emit it at the top. UnicodeString pat; diff --git a/icu4c/source/i18n/cpdtrans.h b/icu4c/source/i18n/cpdtrans.h index af60cb827e3..2b8af08ea98 100644 --- a/icu4c/source/i18n/cpdtrans.h +++ b/icu4c/source/i18n/cpdtrans.h @@ -70,7 +70,7 @@ public: * @param id compound ID * @param dir either UTRANS_FORWARD or UTRANS_REVERSE * @param adoptedFilter a global filter for this compound transliterator - * or NULL + * or nullptr */ CompoundTransliterator(const UnicodeString& id, UTransDirection dir, @@ -80,7 +80,7 @@ public: /** * Constructs a new compound transliterator in the FORWARD - * direction with a NULL filter. + * direction with a nullptr filter. */ CompoundTransliterator(const UnicodeString& id, UParseError& parseError, diff --git a/icu4c/source/i18n/csdetect.cpp b/icu4c/source/i18n/csdetect.cpp index 0b22d4dc2ae..87b31a7958d 100644 --- a/icu4c/source/i18n/csdetect.cpp +++ b/icu4c/source/i18n/csdetect.cpp @@ -46,7 +46,7 @@ struct CSRecognizerInfo : public UMemory { U_NAMESPACE_END -static icu::CSRecognizerInfo **fCSRecognizers = NULL; +static icu::CSRecognizerInfo **fCSRecognizers = nullptr; static icu::UInitOnce gCSRecognizersInitOnce {}; static int32_t fCSRecognizers_size = 0; @@ -54,14 +54,14 @@ U_CDECL_BEGIN static UBool U_CALLCONV csdet_cleanup(void) { U_NAMESPACE_USE - if (fCSRecognizers != NULL) { + if (fCSRecognizers != nullptr) { for(int32_t r = 0; r < fCSRecognizers_size; r += 1) { delete fCSRecognizers[r]; - fCSRecognizers[r] = NULL; + fCSRecognizers[r] = nullptr; } DELETE_ARRAY(fCSRecognizers); - fCSRecognizers = NULL; + fCSRecognizers = nullptr; fCSRecognizers_size = 0; } gCSRecognizersInitOnce.reset(); @@ -124,14 +124,14 @@ static void U_CALLCONV initRecognizers(UErrorCode &status) { fCSRecognizers = NEW_ARRAY(CSRecognizerInfo *, rCount); - if (fCSRecognizers == NULL) { + if (fCSRecognizers == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } else { fCSRecognizers_size = rCount; for (int32_t r = 0; r < rCount; r += 1) { fCSRecognizers[r] = tempArray[r]; - if (fCSRecognizers[r] == NULL) { + if (fCSRecognizers[r] == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } } @@ -148,9 +148,9 @@ void CharsetDetector::setRecognizers(UErrorCode &status) } CharsetDetector::CharsetDetector(UErrorCode &status) - : textIn(new InputText(status)), resultArray(NULL), + : textIn(new InputText(status)), resultArray(nullptr), resultCount(0), fStripTags(false), fFreshTextSet(false), - fEnabledRecognizers(NULL) + fEnabledRecognizers(nullptr) { if (U_FAILURE(status)) { return; @@ -164,7 +164,7 @@ CharsetDetector::CharsetDetector(UErrorCode &status) resultArray = (CharsetMatch **)uprv_malloc(sizeof(CharsetMatch *)*fCSRecognizers_size); - if (resultArray == NULL) { + if (resultArray == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -172,7 +172,7 @@ CharsetDetector::CharsetDetector(UErrorCode &status) for(int32_t i = 0; i < fCSRecognizers_size; i += 1) { resultArray[i] = new CharsetMatch(); - if (resultArray[i] == NULL) { + if (resultArray[i] == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -236,7 +236,7 @@ const CharsetMatch *CharsetDetector::detect(UErrorCode &status) if(maxMatchesFound > 0) { return resultArray[0]; } else { - return NULL; + return nullptr; } } @@ -245,7 +245,7 @@ const CharsetMatch * const *CharsetDetector::detectAll(int32_t &maxMatchesFound, if(!textIn->isSet()) { status = U_MISSING_RESOURCE_ERROR;// TODO: Need to set proper status code for input text not set - return NULL; + return nullptr; } else if (fFreshTextSet) { CharsetRecognizer *csr; int32_t i; @@ -263,7 +263,7 @@ const CharsetMatch * const *CharsetDetector::detectAll(int32_t &maxMatchesFound, } if (resultCount > 1) { - uprv_sortArray(resultArray, resultCount, sizeof resultArray[0], charsetMatchComparator, NULL, true, &status); + uprv_sortArray(resultArray, resultCount, sizeof resultArray[0], charsetMatchComparator, nullptr, true, &status); } fFreshTextSet = false; } @@ -272,7 +272,7 @@ const CharsetMatch * const *CharsetDetector::detectAll(int32_t &maxMatchesFound, if (maxMatchesFound == 0) { status = U_INVALID_CHAR_FOUND; - return NULL; + return nullptr; } return resultArray; @@ -300,10 +300,10 @@ void CharsetDetector::setDetectableCharset(const char *encoding, UBool enabled, return; } - if (fEnabledRecognizers == NULL && !isDefaultVal) { + if (fEnabledRecognizers == nullptr && !isDefaultVal) { // Create an array storing the non default setting fEnabledRecognizers = NEW_ARRAY(UBool, fCSRecognizers_size); - if (fEnabledRecognizers == NULL) { + if (fEnabledRecognizers == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -313,7 +313,7 @@ void CharsetDetector::setDetectableCharset(const char *encoding, UBool enabled, } } - if (fEnabledRecognizers != NULL) { + if (fEnabledRecognizers != nullptr) { fEnabledRecognizers[modIdx] = enabled; } } @@ -342,7 +342,7 @@ typedef struct { static void U_CALLCONV enumClose(UEnumeration *en) { - if(en->context != NULL) { + if(en->context != nullptr) { DELETE_ARRAY(en->context); } @@ -359,7 +359,7 @@ enumCount(UEnumeration *en, UErrorCode *) { // Otherwise, ucsdet_getDetectableCharsets - only enabled ones int32_t count = 0; UBool *enabledArray = ((Context *)en->context)->enabledRecognizers; - if (enabledArray != NULL) { + if (enabledArray != nullptr) { // custom set for (int32_t i = 0; i < fCSRecognizers_size; i++) { if (enabledArray[i]) { @@ -379,7 +379,7 @@ enumCount(UEnumeration *en, UErrorCode *) { static const char* U_CALLCONV enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode * /*status*/) { - const char *currName = NULL; + const char *currName = nullptr; if (((Context *)en->context)->currIndex < fCSRecognizers_size) { if (((Context *)en->context)->all) { @@ -389,9 +389,9 @@ enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode * /*status*/) { } else { // ucsdet_getDetectableCharsets UBool *enabledArray = ((Context *)en->context)->enabledRecognizers; - if (enabledArray != NULL) { + if (enabledArray != nullptr) { // custom set - while (currName == NULL && ((Context *)en->context)->currIndex < fCSRecognizers_size) { + while (currName == nullptr && ((Context *)en->context)->currIndex < fCSRecognizers_size) { if (enabledArray[((Context *)en->context)->currIndex]) { currName = fCSRecognizers[((Context *)en->context)->currIndex]->recognizer->getName(); } @@ -399,7 +399,7 @@ enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode * /*status*/) { } } else { // default set - while (currName == NULL && ((Context *)en->context)->currIndex < fCSRecognizers_size) { + while (currName == nullptr && ((Context *)en->context)->currIndex < fCSRecognizers_size) { if (fCSRecognizers[((Context *)en->context)->currIndex]->isDefaultEnabled) { currName = fCSRecognizers[((Context *)en->context)->currIndex]->recognizer->getName(); } @@ -409,8 +409,8 @@ enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode * /*status*/) { } } - if(resultLength != NULL) { - *resultLength = currName == NULL ? 0 : (int32_t)uprv_strlen(currName); + if(resultLength != nullptr) { + *resultLength = currName == nullptr ? 0 : (int32_t)uprv_strlen(currName); } return currName; @@ -423,8 +423,8 @@ enumReset(UEnumeration *en, UErrorCode *) { } static const UEnumeration gCSDetEnumeration = { - NULL, - NULL, + nullptr, + nullptr, enumClose, enumCount, uenum_unextDefault, @@ -447,13 +447,13 @@ UEnumeration * CharsetDetector::getAllDetectableCharsets(UErrorCode &status) } UEnumeration *en = NEW_ARRAY(UEnumeration, 1); - if (en == NULL) { + if (en == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } memcpy(en, &gCSDetEnumeration, sizeof(UEnumeration)); en->context = (void*)NEW_ARRAY(Context, 1); - if (en->context == NULL) { + if (en->context == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; DELETE_ARRAY(en); return 0; @@ -470,13 +470,13 @@ UEnumeration * CharsetDetector::getDetectableCharsets(UErrorCode &status) const } UEnumeration *en = NEW_ARRAY(UEnumeration, 1); - if (en == NULL) { + if (en == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } memcpy(en, &gCSDetEnumeration, sizeof(UEnumeration)); en->context = (void*)NEW_ARRAY(Context, 1); - if (en->context == NULL) { + if (en->context == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; DELETE_ARRAY(en); return 0; diff --git a/icu4c/source/i18n/csmatch.cpp b/icu4c/source/i18n/csmatch.cpp index 83bf5316656..81879c5269a 100644 --- a/icu4c/source/i18n/csmatch.cpp +++ b/icu4c/source/i18n/csmatch.cpp @@ -21,7 +21,7 @@ U_NAMESPACE_BEGIN CharsetMatch::CharsetMatch() - : textIn(NULL), confidence(0), fCharsetName(NULL), fLang(NULL) + : textIn(nullptr), confidence(0), fCharsetName(nullptr), fLang(nullptr) { // nothing else to do. } @@ -33,11 +33,11 @@ void CharsetMatch::set(InputText *input, const CharsetRecognizer *cr, int32_t co confidence = conf; fCharsetName = csName; fLang = lang; - if (cr != NULL) { - if (fCharsetName == NULL) { + if (cr != nullptr) { + if (fCharsetName == nullptr) { fCharsetName = cr->getName(); } - if (fLang == NULL) { + if (fLang == nullptr) { fLang = cr->getLanguage(); } } diff --git a/icu4c/source/i18n/csmatch.h b/icu4c/source/i18n/csmatch.h index fe379ceea7e..f475d39f069 100644 --- a/icu4c/source/i18n/csmatch.h +++ b/icu4c/source/i18n/csmatch.h @@ -44,14 +44,14 @@ class CharsetMatch : public UMemory /** * fully set the state of this CharsetMatch. * Called by the CharsetRecognizers to record match results. - * Default (NULL) parameters for names will be filled by calling the + * Default (nullptr) parameters for names will be filled by calling the * corresponding getters on the recognizer. */ void set(InputText *input, const CharsetRecognizer *cr, int32_t conf, - const char *csName=NULL, - const char *lang=NULL); + const char *csName=nullptr, + const char *lang=nullptr); /** * Return the name of the charset for this Match diff --git a/icu4c/source/i18n/currfmt.cpp b/icu4c/source/i18n/currfmt.cpp index 0ad0492ee7a..b7dfc09c545 100644 --- a/icu4c/source/i18n/currfmt.cpp +++ b/icu4c/source/i18n/currfmt.cpp @@ -50,7 +50,7 @@ void CurrencyFormat::parseObject(const UnicodeString& source, ParsePosition& pos) const { CurrencyAmount* currAmt = getCurrencyFormatInternal().parseCurrency(source, pos); - if (currAmt != NULL) { + if (currAmt != nullptr) { result.adoptObject(currAmt); } } diff --git a/icu4c/source/i18n/dangical.cpp b/icu4c/source/i18n/dangical.cpp index dad7bb97e2c..1aac6edb901 100644 --- a/icu4c/source/i18n/dangical.cpp +++ b/icu4c/source/i18n/dangical.cpp @@ -23,7 +23,7 @@ #include "unicode/tzrule.h" // --- The cache -- -static icu::TimeZone *gDangiCalendarZoneAstroCalc = NULL; +static icu::TimeZone *gDangiCalendarZoneAstroCalc = nullptr; static icu::UInitOnce gDangiCalendarInitOnce {}; /** @@ -36,7 +36,7 @@ U_CDECL_BEGIN static UBool calendar_dangi_cleanup(void) { if (gDangiCalendarZoneAstroCalc) { delete gDangiCalendarZoneAstroCalc; - gDangiCalendarZoneAstroCalc = NULL; + gDangiCalendarZoneAstroCalc = nullptr; } gDangiCalendarInitOnce.reset(); return true; diff --git a/icu4c/source/i18n/datefmt.cpp b/icu4c/source/i18n/datefmt.cpp index 2638cbf14de..0062b2f2931 100644 --- a/icu4c/source/i18n/datefmt.cpp +++ b/icu4c/source/i18n/datefmt.cpp @@ -62,7 +62,7 @@ template<> const DateFmtBestPattern *LocaleCacheKey::createObject( const void * /*creationContext*/, UErrorCode &status) const { status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } class DateFmtBestPatternKey : public LocaleCacheKey { @@ -101,7 +101,7 @@ public: LocalPointer dtpg( DateTimePatternGenerator::createInstance(fLoc, status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } LocalPointer pattern( @@ -109,7 +109,7 @@ public: dtpg->getBestPattern(fSkeleton, status)), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } DateFmtBestPattern *result = pattern.orphan(); result->addRef(); @@ -149,12 +149,12 @@ DateFormat& DateFormat::operator=(const DateFormat& other) if(other.fCalendar) { fCalendar = other.fCalendar->clone(); } else { - fCalendar = NULL; + fCalendar = nullptr; } if(other.fNumberFormat) { fNumberFormat = other.fNumberFormat->clone(); } else { - fNumberFormat = NULL; + fNumberFormat = nullptr; } fBoolFlags = other.fBoolFlags; fCapitalizationContext = other.fCapitalizationContext; @@ -277,10 +277,10 @@ DateFormat::format(Calendar& /* unused cal */, UnicodeString& DateFormat::format(UDate date, UnicodeString& appendTo, FieldPosition& fieldPosition) const { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { // Use a clone of our calendar instance Calendar* calClone = fCalendar->clone(); - if (calClone != NULL) { + if (calClone != nullptr) { UErrorCode ec = U_ZERO_ERROR; calClone->setTime(date, ec); if (U_SUCCESS(ec)) { @@ -297,9 +297,9 @@ DateFormat::format(UDate date, UnicodeString& appendTo, FieldPosition& fieldPosi UnicodeString& DateFormat::format(UDate date, UnicodeString& appendTo, FieldPositionIterator* posIter, UErrorCode& status) const { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { Calendar* calClone = fCalendar->clone(); - if (calClone != NULL) { + if (calClone != nullptr) { calClone->setTime(date, status); if (U_SUCCESS(status)) { format(*calClone, appendTo, posIter, status); @@ -328,9 +328,9 @@ DateFormat::parse(const UnicodeString& text, ParsePosition& pos) const { UDate d = 0; // Error return UDate is 0 (the epoch) - if (fCalendar != NULL) { + if (fCalendar != nullptr) { Calendar* calClone = fCalendar->clone(); - if (calClone != NULL) { + if (calClone != nullptr) { int32_t start = pos.getIndex(); calClone->clear(); parse(text, *calClone, pos); @@ -434,7 +434,7 @@ DateFormat::getBestPattern( return UnicodeString(); } DateFmtBestPatternKey key(locale, skeleton, status); - const DateFmtBestPattern *patternPtr = NULL; + const DateFmtBestPattern *patternPtr = nullptr; cache->get(key, patternPtr, status); if (U_FAILURE(status)) { return UnicodeString(); @@ -452,20 +452,20 @@ DateFormat::createInstanceForSkeleton( UErrorCode &status) { LocalPointer calendar(calendarToAdopt); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (calendar.isNull()) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } Locale localeWithCalendar = locale; localeWithCalendar.setKeywordValue("calendar", calendar->getType(), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } DateFormat *result = createInstanceForSkeleton(skeleton, localeWithCalendar, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } result->adoptCalendar(calendar.orphan()); return result; @@ -477,14 +477,14 @@ DateFormat::createInstanceForSkeleton( const Locale &locale, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } LocalPointer df( new SimpleDateFormat( getBestPattern(locale, skeleton, status), locale, status), status); - return U_SUCCESS(status) ? df.orphan() : NULL; + return U_SUCCESS(status) ? df.orphan() : nullptr; } DateFormat* U_EXPORT2 @@ -568,7 +568,7 @@ void DateFormat::setCalendar(const Calendar& newCalendar) { Calendar* newCalClone = newCalendar.clone(); - if (newCalClone != NULL) { + if (newCalClone != nullptr) { adoptCalendar(newCalClone); } } @@ -597,7 +597,7 @@ void DateFormat::setNumberFormat(const NumberFormat& newNumberFormat) { NumberFormat* newNumFmtClone = newNumberFormat.clone(); - if (newNumFmtClone != NULL) { + if (newNumFmtClone != nullptr) { adoptNumberFormat(newNumFmtClone); } } @@ -615,7 +615,7 @@ DateFormat::getNumberFormat() const void DateFormat::adoptTimeZone(TimeZone* zone) { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { fCalendar->adoptTimeZone(zone); } } @@ -624,7 +624,7 @@ DateFormat::adoptTimeZone(TimeZone* zone) void DateFormat::setTimeZone(const TimeZone& zone) { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { fCalendar->setTimeZone(zone); } } @@ -634,7 +634,7 @@ DateFormat::setTimeZone(const TimeZone& zone) const TimeZone& DateFormat::getTimeZone() const { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { return fCalendar->getTimeZone(); } // If calendar doesn't exists, create default timezone. @@ -647,7 +647,7 @@ DateFormat::getTimeZone() const void DateFormat::setLenient(UBool lenient) { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { fCalendar->setLenient(lenient); } UErrorCode status = U_ZERO_ERROR; @@ -661,7 +661,7 @@ UBool DateFormat::isLenient() const { UBool lenient = true; - if (fCalendar != NULL) { + if (fCalendar != nullptr) { lenient = fCalendar->isLenient(); } UErrorCode status = U_ZERO_ERROR; @@ -673,7 +673,7 @@ DateFormat::isLenient() const void DateFormat::setCalendarLenient(UBool lenient) { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { fCalendar->setLenient(lenient); } } @@ -683,7 +683,7 @@ DateFormat::setCalendarLenient(UBool lenient) UBool DateFormat::isCalendarLenient() const { - if (fCalendar != NULL) { + if (fCalendar != nullptr) { return fCalendar->isLenient(); } // fCalendar is rarely null diff --git a/icu4c/source/i18n/dayperiodrules.cpp b/icu4c/source/i18n/dayperiodrules.cpp index 3ef822842de..3d9ab5bfac5 100644 --- a/icu4c/source/i18n/dayperiodrules.cpp +++ b/icu4c/source/i18n/dayperiodrules.cpp @@ -27,12 +27,12 @@ U_NAMESPACE_BEGIN namespace { struct DayPeriodRulesData : public UMemory { - DayPeriodRulesData() : localeToRuleSetNumMap(NULL), rules(NULL), maxRuleSetNum(0) {} + DayPeriodRulesData() : localeToRuleSetNumMap(nullptr), rules(nullptr), maxRuleSetNum(0) {} UHashtable *localeToRuleSetNumMap; DayPeriodRules *rules; int32_t maxRuleSetNum; -} *data = NULL; +} *data = nullptr; enum CutoffType { CUTOFF_TYPE_UNKNOWN = -1, @@ -67,7 +67,7 @@ struct DayPeriodRulesDataSink : public ResourceSink { } else if (uprv_strcmp(key, "rules") == 0) { // Allocate one more than needed to skip [0]. See comment in parseSetNum(). data->rules = new DayPeriodRules[data->maxRuleSetNum + 1]; - if (data->rules == NULL) { + if (data->rules == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -307,7 +307,7 @@ U_CFUNC UBool U_CALLCONV dayPeriodRulesCleanup() { delete[] data->rules; uhash_close(data->localeToRuleSetNumMap); delete data; - data = NULL; + data = nullptr; return true; } @@ -319,8 +319,8 @@ void U_CALLCONV DayPeriodRules::load(UErrorCode &errorCode) { } data = new DayPeriodRulesData(); - data->localeToRuleSetNumMap = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &errorCode); - LocalUResourceBundlePointer rb_dayPeriods(ures_openDirect(NULL, "dayPeriods", &errorCode)); + data->localeToRuleSetNumMap = uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &errorCode); + LocalUResourceBundlePointer rb_dayPeriods(ures_openDirect(nullptr, "dayPeriods", &errorCode)); // Get the largest rule set number (so we allocate enough objects). DayPeriodRulesCountSink countSink; @@ -337,8 +337,8 @@ const DayPeriodRules *DayPeriodRules::getInstance(const Locale &locale, UErrorCo umtx_initOnce(initOnce, DayPeriodRules::load, errorCode); // If the entire day period rules data doesn't conform to spec (even if the part we want - // does), return NULL. - if(U_FAILURE(errorCode)) { return NULL; } + // does), return nullptr. + if(U_FAILURE(errorCode)) { return nullptr; } const char *localeCode = locale.getBaseName(); char name[ULOC_FULLNAME_CAPACITY]; @@ -353,7 +353,7 @@ const DayPeriodRules *DayPeriodRules::getInstance(const Locale &locale, UErrorCo } } else { errorCode = U_BUFFER_OVERFLOW_ERROR; - return NULL; + return nullptr; } int32_t ruleSetNum = 0; // NB there is no rule set 0 and 0 is returned upon lookup failure. @@ -375,7 +375,7 @@ const DayPeriodRules *DayPeriodRules::getInstance(const Locale &locale, UErrorCo if (ruleSetNum <= 0 || data->rules[ruleSetNum].getDayPeriodForHour(0) == DAYPERIOD_UNKNOWN) { // If day period for hour 0 is UNKNOWN then day period for all hours are UNKNOWN. // Data doesn't exist even with fallback. - return NULL; + return nullptr; } else { return &data->rules[ruleSetNum]; } diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp index 3b2650c1e37..87ab385d30d 100644 --- a/icu4c/source/i18n/dcfmtsym.cpp +++ b/icu4c/source/i18n/dcfmtsym.cpp @@ -66,31 +66,31 @@ static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0}; static const char *gNumberElementKeys[DecimalFormatSymbols::kFormatSymbolCount] = { "decimal", "group", - NULL, /* #11897: the symbol is NOT the pattern separator symbol */ + nullptr, /* #11897: the symbol is NOT the pattern separator symbol */ "percentSign", - NULL, /* Native zero digit is deprecated from CLDR - get it from the numbering system */ - NULL, /* Pattern digit character is deprecated from CLDR - use # by default always */ + nullptr, /* Native zero digit is deprecated from CLDR - get it from the numbering system */ + nullptr, /* Pattern digit character is deprecated from CLDR - use # by default always */ "minusSign", "plusSign", - NULL, /* currency symbol - Wait until we know the currency before loading from CLDR */ - NULL, /* intl currency symbol - Wait until we know the currency before loading from CLDR */ + nullptr, /* currency symbol - Wait until we know the currency before loading from CLDR */ + nullptr, /* intl currency symbol - Wait until we know the currency before loading from CLDR */ "currencyDecimal", "exponential", "perMille", - NULL, /* Escape padding character - not in CLDR */ + nullptr, /* Escape padding character - not in CLDR */ "infinity", "nan", - NULL, /* Significant digit symbol - not in CLDR */ + nullptr, /* Significant digit symbol - not in CLDR */ "currencyGroup", - NULL, /* one digit - get it from the numbering system */ - NULL, /* two digit - get it from the numbering system */ - NULL, /* three digit - get it from the numbering system */ - NULL, /* four digit - get it from the numbering system */ - NULL, /* five digit - get it from the numbering system */ - NULL, /* six digit - get it from the numbering system */ - NULL, /* seven digit - get it from the numbering system */ - NULL, /* eight digit - get it from the numbering system */ - NULL, /* nine digit - get it from the numbering system */ + nullptr, /* one digit - get it from the numbering system */ + nullptr, /* two digit - get it from the numbering system */ + nullptr, /* three digit - get it from the numbering system */ + nullptr, /* four digit - get it from the numbering system */ + nullptr, /* five digit - get it from the numbering system */ + nullptr, /* six digit - get it from the numbering system */ + nullptr, /* seven digit - get it from the numbering system */ + nullptr, /* eight digit - get it from the numbering system */ + nullptr, /* nine digit - get it from the numbering system */ "superscriptingExponent", /* Multiplication (x) symbol for exponents */ "approximatelySign" /* Approximately sign symbol */ }; @@ -124,9 +124,9 @@ DecimalFormatSymbols::DecimalFormatSymbols() DecimalFormatSymbols* DecimalFormatSymbols::createWithLastResortData(UErrorCode& status) { - if (U_FAILURE(status)) { return NULL; } + if (U_FAILURE(status)) { return nullptr; } DecimalFormatSymbols* sym = new DecimalFormatSymbols(); - if (sym == NULL) { + if (sym == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } return sym; @@ -238,7 +238,7 @@ struct DecFmtSymDataSink : public ResourceSink { if (U_FAILURE(errorCode)) { return; } for (int32_t j = 0; symbolsTable.getKeyAndValue(j, key, value); ++j) { for (int32_t i=0; i2) { // the length is 3 if more data is present ures_getByIndex(rb.getAlias(), 2, rb.getAlias(), &localStatus); diff --git a/icu4c/source/i18n/decContext.cpp b/icu4c/source/i18n/decContext.cpp index 421d65b43f9..bdc5f22fe5f 100644 --- a/icu4c/source/i18n/decContext.cpp +++ b/icu4c/source/i18n/decContext.cpp @@ -219,7 +219,7 @@ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatus(decContext *context, uIn /* is raised if appropriate. */ /* */ /* returns the context structure, unless the string is equal to */ -/* DEC_Condition_MU or is not recognized. In these cases NULL is */ +/* DEC_Condition_MU or is not recognized. In these cases nullptr is */ /* returned. */ /* ------------------------------------------------------------------ */ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatusFromString(decContext *context, @@ -256,7 +256,7 @@ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatusFromString(decContext *co return uprv_decContextSetStatus(context, DEC_Underflow); if (strcmp(string, DEC_Condition_ZE)==0) return context; - return NULL; /* Multiple status, or unknown */ + return nullptr; /* Multiple status, or unknown */ } /* decContextSetStatusFromString */ /* ------------------------------------------------------------------ */ @@ -270,7 +270,7 @@ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatusFromString(decContext *co /* raised. */ /* */ /* returns the context structure, unless the string is equal to */ -/* DEC_Condition_MU or is not recognized. In these cases NULL is */ +/* DEC_Condition_MU or is not recognized. In these cases nullptr is */ /* returned. */ /* ------------------------------------------------------------------ */ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatusFromStringQuiet(decContext *context, @@ -307,7 +307,7 @@ U_CAPI decContext * U_EXPORT2 uprv_decContextSetStatusFromStringQuiet(decContex return uprv_decContextSetStatusQuiet(context, DEC_Underflow); if (strcmp(string, DEC_Condition_ZE)==0) return context; - return NULL; /* Multiple status, or unknown */ + return nullptr; /* Multiple status, or unknown */ } /* decContextSetStatusFromStringQuiet */ /* ------------------------------------------------------------------ */ diff --git a/icu4c/source/i18n/decNumber.cpp b/icu4c/source/i18n/decNumber.cpp index 71477d8202c..2ad9f526e3f 100644 --- a/icu4c/source/i18n/decNumber.cpp +++ b/icu4c/source/i18n/decNumber.cpp @@ -95,11 +95,11 @@ /* conversions are available in separate modules. */ /* */ /* 7. Normally, input operands are assumed to be valid. Set DECCHECK */ -/* to 1 for extended operand checking (including NULL operands). */ -/* Results are undefined if a badly-formed structure (or a NULL */ +/* to 1 for extended operand checking (including nullptr operands). */ +/* Results are undefined if a badly-formed structure (or a nullptr */ /* pointer to a structure) is provided, though with DECCHECK */ /* enabled the operator routines are protected against exceptions. */ -/* (Except if the result pointer is NULL, which is unrecoverable.) */ +/* (Except if the result pointer is nullptr, which is unrecoverable.) */ /* */ /* However, the routines will never cause exceptions if they are */ /* given well-formed operands, even if the value of the operands */ @@ -516,11 +516,11 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char Unit *res; /* where result will be built */ Unit resbuff[SD2U(DECBUFFER+9)];/* local buffer in case need temporary */ /* [+9 allows for ln() constants] */ - Unit *allocres=NULL; /* -> allocated result, iff allocated */ + Unit *allocres=nullptr; /* -> allocated result, iff allocated */ Int d=0; /* count of digits found in decimal part */ - const char *dotchar=NULL; /* where dot was found */ + const char *dotchar=nullptr; /* where dot was found */ const char *cfirst=chars; /* -> first character of decimal part */ - const char *last=NULL; /* -> last digit of decimal part */ + const char *last=nullptr; /* -> last digit of decimal part */ const char *c; /* work */ Unit *up; /* .. */ #if DECDPUN>1 @@ -541,7 +541,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char d++; /* count of real digits */ continue; /* still in decimal part */ } - if (*c=='.' && dotchar==NULL) { /* first '.' */ + if (*c=='.' && dotchar==nullptr) { /* first '.' */ dotchar=c; /* record offset into decimal part */ if (c==cfirst) cfirst++; /* first digit must follow */ continue;} @@ -558,7 +558,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char break; } /* c */ - if (last==NULL) { /* no digits yet */ + if (last==nullptr) { /* no digits yet */ status=DEC_Conversion_syntax;/* assume the worst */ if (*c=='\0') break; /* and no more to come... */ #if DECSUBSET @@ -566,7 +566,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char if (!set->extended) break; /* hopeless */ #endif /* Infinities and NaNs are possible, here */ - if (dotchar!=NULL) break; /* .. unless had a dot */ + if (dotchar!=nullptr) break; /* .. unless had a dot */ uprv_decNumberZero(dn); /* be optimistic */ if (decBiStr(c, "infinity", "INFINITY") || decBiStr(c, "inf", "INF")) { @@ -609,7 +609,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char /* good; drop through to convert the integer to coefficient */ status=0; /* syntax is OK */ bits=dn->bits; /* for copy-back */ - } /* last==NULL */ + } /* last==nullptr */ else if (*c!='\0') { /* more to process... */ /* had some digits; exponent is only valid sequence now */ @@ -667,7 +667,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char } /* at least one leading 0 */ /* Handle decimal point... */ - if (dotchar!=NULL && dotchar(last-dotchar); /* adjust exponent */ /* [we can now ignore the .] */ @@ -679,7 +679,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char res=resbuff; /* assume use local buffer */ if (needbytes>(Int)sizeof(resbuff)) { /* too big for local */ allocres=(Unit *)malloc(needbytes); - if (allocres==NULL) {status|=DEC_Insufficient_storage; break;} + if (allocres==nullptr) {status|=DEC_Insufficient_storage; break;} res=allocres; } } @@ -736,7 +736,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFromString(decNumber *dn, const char /* decNumberShow(dn); */ } while(0); /* [for break] */ - if (allocres!=NULL) free(allocres); /* drop any storage used */ + if (allocres!=nullptr) free(allocres); /* drop any storage used */ if (status!=0) decStatus(dn, status, set); return dn; } /* decNumberFromString */ @@ -953,9 +953,9 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberCompareTotalMag(decNumber *res, const uInt status=0; /* accumulator */ uInt needbytes; /* for space calculations */ decNumber bufa[D2N(DECBUFFER+1)];/* +1 in case DECBUFFER=0 */ - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ decNumber bufb[D2N(DECBUFFER+1)]; - decNumber *allocbufb=NULL; /* -> allocated bufb, iff allocated */ + decNumber *allocbufb=nullptr; /* -> allocated bufb, iff allocated */ decNumber *a, *b; /* temporary pointers */ #if DECCHECK @@ -969,7 +969,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberCompareTotalMag(decNumber *res, const needbytes=sizeof(decNumber)+(D2U(lhs->digits)-1)*sizeof(Unit); if (needbytes>sizeof(bufa)) { /* need malloc space */ allocbufa=(decNumber *)malloc(needbytes); - if (allocbufa==NULL) { /* hopeless -- abandon */ + if (allocbufa==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} a=allocbufa; /* use the allocated space */ @@ -983,7 +983,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberCompareTotalMag(decNumber *res, const needbytes=sizeof(decNumber)+(D2U(rhs->digits)-1)*sizeof(Unit); if (needbytes>sizeof(bufb)) { /* need malloc space */ allocbufb=(decNumber *)malloc(needbytes); - if (allocbufb==NULL) { /* hopeless -- abandon */ + if (allocbufb==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} b=allocbufb; /* use the allocated space */ @@ -995,8 +995,8 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberCompareTotalMag(decNumber *res, const decCompareOp(res, lhs, rhs, set, COMPTOTAL, &status); } while(0); /* end protected */ - if (allocbufa!=NULL) free(allocbufa); /* drop any storage used */ - if (allocbufb!=NULL) free(allocbufb); /* .. */ + if (allocbufa!=nullptr) free(allocbufa); /* drop any storage used */ + if (allocbufb!=nullptr) free(allocbufb); /* .. */ if (status!=0) decStatus(res, status, set); return res; } /* decNumberCompareTotalMag */ @@ -1073,7 +1073,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberExp(decNumber *res, const decNumber * decContext *set) { uInt status=0; /* accumulator */ #if DECSUBSET - decNumber *allocrhs=NULL; /* non-NULL if rounded rhs allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rounded rhs allocated */ #endif #if DECCHECK @@ -1090,7 +1090,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberExp(decNumber *res, const decNumber * /* reduce operand and set lostDigits status, as needed */ if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -1099,7 +1099,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberExp(decNumber *res, const decNumber * } while(0); /* end protected */ #if DECSUBSET - if (allocrhs !=NULL) free(allocrhs); /* drop any storage used */ + if (allocrhs !=nullptr) free(allocrhs); /* drop any storage used */ #endif /* apply significant status */ if (status!=0) decStatus(res, status, set); @@ -1132,7 +1132,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFMA(decNumber *res, const decNumber * decContext dcmul; /* context for the multiplication */ uInt needbytes; /* for space calculations */ decNumber bufa[D2N(DECBUFFER*2+1)]; - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ decNumber *acc; /* accumulator pointer */ decNumber dzero; /* work */ @@ -1162,7 +1162,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFMA(decNumber *res, const decNumber * needbytes=sizeof(decNumber)+(D2U(dcmul.digits)-1)*sizeof(Unit); if (needbytes>sizeof(bufa)) { /* need malloc space */ allocbufa=(decNumber *)malloc(needbytes); - if (allocbufa==NULL) { /* hopeless -- abandon */ + if (allocbufa==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} acc=allocbufa; /* use the allocated space */ @@ -1194,7 +1194,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberFMA(decNumber *res, const decNumber * decAddOp(res, acc, fhs, set, 0, &status); } while(0); /* end protected */ - if (allocbufa!=NULL) free(allocbufa); /* drop any storage used */ + if (allocbufa!=nullptr) free(allocbufa); /* drop any storage used */ if (status!=0) decStatus(res, status, set); #if DECCHECK decCheckInexact(res, set); @@ -1293,7 +1293,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLn(decNumber *res, const decNumber *r decContext *set) { uInt status=0; /* accumulator */ #if DECSUBSET - decNumber *allocrhs=NULL; /* non-NULL if rounded rhs allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rounded rhs allocated */ #endif #if DECCHECK @@ -1308,7 +1308,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLn(decNumber *res, const decNumber *r /* reduce operand and set lostDigits status, as needed */ if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } /* special check in subset for rhs=0 */ @@ -1321,7 +1321,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLn(decNumber *res, const decNumber *r } while(0); /* end protected */ #if DECSUBSET - if (allocrhs !=NULL) free(allocrhs); /* drop any storage used */ + if (allocrhs !=nullptr) free(allocrhs); /* drop any storage used */ #endif /* apply significant status */ if (status!=0) decStatus(res, status, set); @@ -1364,7 +1364,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLogB(decNumber *res, const decNumber #endif /* NaNs as usual; Infinities return +Infinity; 0->oops */ - if (decNumberIsNaN(rhs)) decNaNs(res, rhs, NULL, set, &status); + if (decNumberIsNaN(rhs)) decNaNs(res, rhs, nullptr, set, &status); else if (decNumberIsInfinite(rhs)) uprv_decNumberCopyAbs(res, rhs); else if (decNumberIsZero(rhs)) { uprv_decNumberZero(res); /* prepare for Infinity */ @@ -1425,15 +1425,15 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLog10(decNumber *res, const decNumber /* buffers for a and b working decimals */ /* (adjustment calculator, same size) */ decNumber bufa[D2N(DECBUFFER+2)]; - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ decNumber *a=bufa; /* temporary a */ decNumber bufb[D2N(DECBUFFER+2)]; - decNumber *allocbufb=NULL; /* -> allocated bufb, iff allocated */ + decNumber *allocbufb=nullptr; /* -> allocated bufb, iff allocated */ decNumber *b=bufb; /* temporary b */ decNumber bufw[D2N(10)]; /* working 2-10 digit number */ decNumber *w=bufw; /* .. */ #if DECSUBSET - decNumber *allocrhs=NULL; /* non-NULL if rounded rhs allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rounded rhs allocated */ #endif decContext aset; /* working context */ @@ -1450,7 +1450,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLog10(decNumber *res, const decNumber /* reduce operand and set lostDigits status, as needed */ if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } /* special check in subset for rhs=0 */ @@ -1495,7 +1495,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLog10(decNumber *res, const decNumber needbytes=sizeof(decNumber)+(D2U(p)-1)*sizeof(Unit); if (needbytes>sizeof(bufa)) { /* need malloc space */ allocbufa=(decNumber *)malloc(needbytes); - if (allocbufa==NULL) { /* hopeless -- abandon */ + if (allocbufa==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} a=allocbufa; /* use the allocated space */ @@ -1518,7 +1518,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLog10(decNumber *res, const decNumber needbytes=sizeof(decNumber)+(D2U(p)-1)*sizeof(Unit); if (needbytes>sizeof(bufb)) { /* need malloc space */ allocbufb=(decNumber *)malloc(needbytes); - if (allocbufb==NULL) { /* hopeless -- abandon */ + if (allocbufb==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} b=allocbufb; /* use the allocated space */ @@ -1538,10 +1538,10 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberLog10(decNumber *res, const decNumber decDivideOp(res, a, b, &aset, DIVIDE, &status); /* into result */ } while(0); /* [for break] */ - if (allocbufa!=NULL) free(allocbufa); /* drop any storage used */ - if (allocbufb!=NULL) free(allocbufb); /* .. */ + if (allocbufa!=nullptr) free(allocbufa); /* drop any storage used */ + if (allocbufb!=nullptr) free(allocbufb); /* .. */ #if DECSUBSET - if (allocrhs !=NULL) free(allocrhs); /* .. */ + if (allocrhs !=nullptr) free(allocrhs); /* .. */ #endif /* apply significant status */ if (status!=0) decStatus(res, status, set); @@ -1974,11 +1974,11 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberMultiply(decNumber *res, const decNum U_CAPI decNumber * U_EXPORT2 uprv_decNumberPower(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set) { #if DECSUBSET - decNumber *alloclhs=NULL; /* non-NULL if rounded lhs allocated */ - decNumber *allocrhs=NULL; /* .., rhs */ + decNumber *alloclhs=nullptr; /* non-nullptr if rounded lhs allocated */ + decNumber *allocrhs=nullptr; /* .., rhs */ #endif - decNumber *allocdac=NULL; /* -> allocated acc buffer, iff used */ - decNumber *allocinv=NULL; /* -> allocated 1/x buffer, iff used */ + decNumber *allocdac=nullptr; /* -> allocated acc buffer, iff used */ + decNumber *allocinv=nullptr; /* -> allocated 1/x buffer, iff used */ Int reqdigits=set->digits; /* requested DIGITS */ Int n; /* rhs in binary */ Flag rhsint=0; /* 1 if rhs is an integer */ @@ -2010,12 +2010,12 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberPower(decNumber *res, const decNumber if (!set->extended) { /* reduce operands and set status, as needed */ if (lhs->digits>reqdigits) { alloclhs=decRoundOperand(lhs, set, &status); - if (alloclhs==NULL) break; + if (alloclhs==nullptr) break; lhs=alloclhs; } if (rhs->digits>reqdigits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -2166,7 +2166,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberPower(decNumber *res, const decNumber /* [needbytes also used below if 1/lhs needed] */ if (needbytes>sizeof(dacbuff)) { allocdac=(decNumber *)malloc(needbytes); - if (allocdac==NULL) { /* hopeless -- abandon */ + if (allocdac==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} dac=allocdac; /* use the allocated space */ @@ -2213,7 +2213,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberPower(decNumber *res, const decNumber /* now locate or allocate space for the inverted lhs */ if (needbytes>sizeof(invbuff)) { allocinv=(decNumber *)malloc(needbytes); - if (allocinv==NULL) { /* hopeless -- abandon */ + if (allocinv==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} inv=allocinv; /* use the allocated space */ @@ -2285,11 +2285,11 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberPower(decNumber *res, const decNumber #endif } while(0); /* end protected */ - if (allocdac!=NULL) free(allocdac); /* drop any storage used */ - if (allocinv!=NULL) free(allocinv); /* .. */ + if (allocdac!=nullptr) free(allocdac); /* drop any storage used */ + if (allocinv!=nullptr) free(allocinv); /* .. */ #if DECSUBSET - if (alloclhs!=NULL) free(alloclhs); /* .. */ - if (allocrhs!=NULL) free(allocrhs); /* .. */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* .. */ #endif if (status!=0) decStatus(res, status, set); #if DECCHECK @@ -2344,7 +2344,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberNormalize(decNumber *res, const decNu U_CAPI decNumber * U_EXPORT2 uprv_decNumberReduce(decNumber *res, const decNumber *rhs, decContext *set) { #if DECSUBSET - decNumber *allocrhs=NULL; /* non-NULL if rounded rhs allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rounded rhs allocated */ #endif uInt status=0; /* as usual */ Int residue=0; /* as usual */ @@ -2360,7 +2360,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberReduce(decNumber *res, const decNumbe /* reduce operand and set lostDigits status, as needed */ if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -2369,7 +2369,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberReduce(decNumber *res, const decNumbe /* Infinities copy through; NaNs need usual treatment */ if (decNumberIsNaN(rhs)) { - decNaNs(res, rhs, NULL, set, &status); + decNaNs(res, rhs, nullptr, set, &status); break; } @@ -2381,7 +2381,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberReduce(decNumber *res, const decNumbe } while(0); /* end protected */ #if DECSUBSET - if (allocrhs !=NULL) free(allocrhs); /* .. */ + if (allocrhs !=nullptr) free(allocrhs); /* .. */ #endif if (status!=0) decStatus(res, status, set);/* then report status */ return res; @@ -2845,7 +2845,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN Int dropped; /* .. */ #if DECSUBSET - decNumber *allocrhs=NULL; /* non-NULL if rounded rhs allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rounded rhs allocated */ #endif /* buffer for f [needs +1 in case DECBUFFER 0] */ decNumber buff[D2N(DECBUFFER+1)]; @@ -2853,9 +2853,9 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN decNumber bufa[D2N(DECBUFFER+2)]; /* buffer for temporary, b [must be same size as a] */ decNumber bufb[D2N(DECBUFFER+2)]; - decNumber *allocbuff=NULL; /* -> allocated buff, iff allocated */ - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ - decNumber *allocbufb=NULL; /* -> allocated bufb, iff allocated */ + decNumber *allocbuff=nullptr; /* -> allocated buff, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ + decNumber *allocbufb=nullptr; /* -> allocated bufb, iff allocated */ decNumber *f=buff; /* reduced fraction */ decNumber *a=bufa; /* approximation to result */ decNumber *b=bufb; /* intermediate result */ @@ -2873,7 +2873,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN /* reduce operand and set lostDigits status, as needed */ if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, &status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; /* [Note: 'f' allocation below could reuse this buffer if */ /* used, but as this is rare they are kept separate for clarity.] */ rhs=allocrhs; @@ -2888,7 +2888,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN if (decNumberIsNegative(rhs)) status|=DEC_Invalid_operation; else uprv_decNumberCopy(res, rhs); /* +Infinity */ } - else decNaNs(res, rhs, NULL, set, &status); /* a NaN */ + else decNaNs(res, rhs, nullptr, set, &status); /* a NaN */ break; } @@ -2926,7 +2926,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN needbytes=sizeof(decNumber)+(D2U(rhs->digits)-1)*sizeof(Unit); if (needbytes>(Int)sizeof(buff)) { allocbuff=(decNumber *)malloc(needbytes); - if (allocbuff==NULL) { /* hopeless -- abandon */ + if (allocbuff==nullptr) { /* hopeless -- abandon */ status|=DEC_Insufficient_storage; break;} f=allocbuff; /* use the allocated space */ @@ -2936,7 +2936,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN if (needbytes>(Int)sizeof(bufa)) { /* [same applies to b] */ allocbufa=(decNumber *)malloc(needbytes); allocbufb=(decNumber *)malloc(needbytes); - if (allocbufa==NULL || allocbufb==NULL) { /* hopeless */ + if (allocbufa==nullptr || allocbufb==nullptr) { /* hopeless */ status|=DEC_Insufficient_storage; break;} a=allocbufa; /* use the allocated spaces */ @@ -3147,11 +3147,11 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberSquareRoot(decNumber *res, const decN uprv_decNumberCopy(res, a); /* a is now the result */ } while(0); /* end protected */ - if (allocbuff!=NULL) free(allocbuff); /* drop any storage used */ - if (allocbufa!=NULL) free(allocbufa); /* .. */ - if (allocbufb!=NULL) free(allocbufb); /* .. */ + if (allocbuff!=nullptr) free(allocbuff); /* drop any storage used */ + if (allocbufa!=nullptr) free(allocbufa); /* .. */ + if (allocbufb!=nullptr) free(allocbufb); /* .. */ #if DECSUBSET - if (allocrhs !=NULL) free(allocrhs); /* .. */ + if (allocrhs !=nullptr) free(allocrhs); /* .. */ #endif if (status!=0) decStatus(res, status, set);/* then report status */ #if DECCHECK @@ -3221,7 +3221,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberToIntegralExact(decNumber *res, const /* handle infinities and NaNs */ if (SPECIALARG) { if (decNumberIsInfinite(rhs)) uprv_decNumberCopy(res, rhs); /* an Infinity */ - else decNaNs(res, rhs, NULL, set, &status); /* a NaN */ + else decNaNs(res, rhs, nullptr, set, &status); /* a NaN */ } else { /* finite */ /* have a finite number; no error possible (res must be big enough) */ @@ -3385,7 +3385,7 @@ const char *uprv_decNumberClassToString(enum decClass eclass) { U_CAPI decNumber * U_EXPORT2 uprv_decNumberCopy(decNumber *dest, const decNumber *src) { #if DECCHECK - if (src==NULL) return uprv_decNumberZero(dest); + if (src==nullptr) return uprv_decNumberZero(dest); #endif if (dest==src) return dest; /* no copy required */ @@ -3837,8 +3837,8 @@ static decNumber * decAddOp(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set, uByte negate, uInt *status) { #if DECSUBSET - decNumber *alloclhs=NULL; /* non-NULL if rounded lhs allocated */ - decNumber *allocrhs=NULL; /* .., rhs */ + decNumber *alloclhs=nullptr; /* non-nullptr if rounded lhs allocated */ + decNumber *allocrhs=nullptr; /* .., rhs */ #endif Int rhsshift; /* working shift (in Units) */ Int maxdigits; /* longest logical length */ @@ -3850,7 +3850,7 @@ static decNumber * decAddOp(decNumber *res, const decNumber *lhs, Unit accbuff[SD2U(DECBUFFER*2+20)]; /* local buffer [*2+20 reduces many */ /* allocations when called from */ /* other operations, notable exp] */ - Unit *allocacc=NULL; /* -> allocated acc buffer, iff allocated */ + Unit *allocacc=nullptr; /* -> allocated acc buffer, iff allocated */ Int reqdigits=set->digits; /* local copy; requested DIGITS */ Int padding; /* work */ @@ -3864,12 +3864,12 @@ static decNumber * decAddOp(decNumber *res, const decNumber *lhs, /* reduce operands and set lostDigits status, as needed */ if (lhs->digits>reqdigits) { alloclhs=decRoundOperand(lhs, set, status); - if (alloclhs==NULL) break; + if (alloclhs==nullptr) break; lhs=alloclhs; } if (rhs->digits>reqdigits) { allocrhs=decRoundOperand(rhs, set, status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -4075,7 +4075,7 @@ static decNumber * decAddOp(decNumber *res, const decNumber *lhs, if (need*sizeof(Unit)>sizeof(accbuff)) { /* printf("malloc add %ld %ld\n", need, sizeof(accbuff)); */ allocacc=(Unit *)malloc(need*sizeof(Unit)); - if (allocacc==NULL) { /* hopeless -- abandon */ + if (allocacc==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} acc=allocacc; @@ -4171,10 +4171,10 @@ static decNumber * decAddOp(decNumber *res, const decNumber *lhs, } } while(0); /* end protected */ - if (allocacc!=NULL) free(allocacc); /* drop any storage used */ + if (allocacc!=nullptr) free(allocacc); /* drop any storage used */ #if DECSUBSET - if (allocrhs!=NULL) free(allocrhs); /* .. */ - if (alloclhs!=NULL) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* .. */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ #endif return res; } /* decAddOp */ @@ -4253,12 +4253,12 @@ static decNumber * decDivideOp(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set, Flag op, uInt *status) { #if DECSUBSET - decNumber *alloclhs=NULL; /* non-NULL if rounded lhs allocated */ - decNumber *allocrhs=NULL; /* .., rhs */ + decNumber *alloclhs=nullptr; /* non-nullptr if rounded lhs allocated */ + decNumber *allocrhs=nullptr; /* .., rhs */ #endif Unit accbuff[SD2U(DECBUFFER+DECDPUN+10)]; /* local buffer */ Unit *acc=accbuff; /* -> accumulator array for result */ - Unit *allocacc=NULL; /* -> allocated buffer, iff allocated */ + Unit *allocacc=nullptr; /* -> allocated buffer, iff allocated */ Unit *accnext; /* -> where next digit will go */ Int acclength; /* length of acc needed [Units] */ Int accunits; /* count of units accumulated */ @@ -4266,7 +4266,7 @@ static decNumber * decDivideOp(decNumber *res, Unit varbuff[SD2U(DECBUFFER*2+DECDPUN)]; /* buffer for var1 */ Unit *var1=varbuff; /* -> var1 array for long subtraction */ - Unit *varalloc=NULL; /* -> allocated buffer, iff used */ + Unit *varalloc=nullptr; /* -> allocated buffer, iff used */ Unit *msu1; /* -> msu of var1 */ const Unit *var2; /* -> var2 array */ @@ -4303,12 +4303,12 @@ static decNumber * decDivideOp(decNumber *res, /* reduce operands and set lostDigits status, as needed */ if (lhs->digits>reqdigits) { alloclhs=decRoundOperand(lhs, set, status); - if (alloclhs==NULL) break; + if (alloclhs==nullptr) break; lhs=alloclhs; } if (rhs->digits>reqdigits) { allocrhs=decRoundOperand(rhs, set, status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -4440,7 +4440,7 @@ static decNumber * decDivideOp(decNumber *res, if (acclength*sizeof(Unit)>sizeof(accbuff)) { /* printf("malloc dvacc %ld units\n", acclength); */ allocacc=(Unit *)malloc(acclength*sizeof(Unit)); - if (allocacc==NULL) { /* hopeless -- abandon */ + if (allocacc==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} acc=allocacc; /* use the allocated space */ @@ -4465,7 +4465,7 @@ static decNumber * decDivideOp(decNumber *res, if ((var1units+1)*sizeof(Unit)>sizeof(varbuff)) { /* printf("malloc dvvar %ld units\n", var1units+1); */ varalloc=(Unit *)malloc((var1units+1)*sizeof(Unit)); - if (varalloc==NULL) { /* hopeless -- abandon */ + if (varalloc==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} var1=varalloc; /* use the allocated space */ @@ -4823,11 +4823,11 @@ static decNumber * decDivideOp(decNumber *res, #endif } while(0); /* end protected */ - if (varalloc!=NULL) free(varalloc); /* drop any storage used */ - if (allocacc!=NULL) free(allocacc); /* .. */ + if (varalloc!=nullptr) free(varalloc); /* drop any storage used */ + if (allocacc!=nullptr) free(allocacc); /* .. */ #if DECSUBSET - if (allocrhs!=NULL) free(allocrhs); /* .. */ - if (alloclhs!=NULL) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* .. */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ #endif return res; } /* decDivideOp */ @@ -4878,7 +4878,7 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, uByte bits; /* result sign */ Unit *acc; /* -> accumulator Unit array */ Int needbytes; /* size calculator */ - void *allocacc=NULL; /* -> allocated accumulator, iff allocated */ + void *allocacc=nullptr; /* -> allocated accumulator, iff allocated */ Unit accbuff[SD2U(DECBUFFER*4+1)]; /* buffer (+1 for DECBUFFER==0, */ /* *4 for calls from other operations) */ const Unit *mer, *mermsup; /* work */ @@ -4902,10 +4902,10 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, /* lazy carry evaluation */ uInt zlhibuff[(DECBUFFER*2+1)/8+1]; /* buffer (+1 for DECBUFFER==0) */ uInt *zlhi=zlhibuff; /* -> lhs array */ - uInt *alloclhi=NULL; /* -> allocated buffer, iff allocated */ + uInt *alloclhi=nullptr; /* -> allocated buffer, iff allocated */ uInt zrhibuff[(DECBUFFER*2+1)/8+1]; /* buffer (+1 for DECBUFFER==0) */ uInt *zrhi=zrhibuff; /* -> rhs array */ - uInt *allocrhi=NULL; /* -> allocated buffer, iff allocated */ + uInt *allocrhi=nullptr; /* -> allocated buffer, iff allocated */ uLong zaccbuff[(DECBUFFER*2+1)/4+2]; /* buffer (+1 for DECBUFFER==0) */ /* [allocacc is shared for both paths, as only one will run] */ uLong *zacc=zaccbuff; /* -> accumulator array for exact result */ @@ -4926,8 +4926,8 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, #endif #if DECSUBSET - decNumber *alloclhs=NULL; /* -> allocated buffer, iff allocated */ - decNumber *allocrhs=NULL; /* -> allocated buffer, iff allocated */ + decNumber *alloclhs=nullptr; /* -> allocated buffer, iff allocated */ + decNumber *allocrhs=nullptr; /* -> allocated buffer, iff allocated */ #endif #if DECCHECK @@ -4967,12 +4967,12 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, /* reduce operands and set lostDigits status, as needed */ if (lhs->digits>set->digits) { alloclhs=decRoundOperand(lhs, set, status); - if (alloclhs==NULL) break; + if (alloclhs==nullptr) break; lhs=alloclhs; } if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -5018,7 +5018,7 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, if (needbytes>(Int)sizeof(zaccbuff)) { allocacc=(uLong *)malloc(needbytes); zacc=(uLong *)allocacc;} - if (zlhi==NULL||zrhi==NULL||zacc==NULL) { + if (zlhi==nullptr||zrhi==nullptr||zacc==nullptr) { *status|=DEC_Insufficient_storage; break;} @@ -5113,7 +5113,7 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, needbytes=(D2U(lhs->digits)+D2U(rhs->digits))*sizeof(Unit); if (needbytes>(Int)sizeof(accbuff)) { allocacc=(Unit *)malloc(needbytes); - if (allocacc==NULL) {*status|=DEC_Insufficient_storage; break;} + if (allocacc==nullptr) {*status|=DEC_Insufficient_storage; break;} acc=(Unit *)allocacc; /* use the allocated space */ } @@ -5172,14 +5172,14 @@ static decNumber * decMultiplyOp(decNumber *res, const decNumber *lhs, decFinish(res, set, &residue, status); /* final cleanup */ } while(0); /* end protected */ - if (allocacc!=NULL) free(allocacc); /* drop any storage used */ + if (allocacc!=nullptr) free(allocacc); /* drop any storage used */ #if DECSUBSET - if (allocrhs!=NULL) free(allocrhs); /* .. */ - if (alloclhs!=NULL) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* .. */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ #endif #if FASTMUL - if (allocrhi!=NULL) free(allocrhi); /* .. */ - if (alloclhi!=NULL) free(alloclhi); /* .. */ + if (allocrhi!=nullptr) free(allocrhi); /* .. */ + if (alloclhi!=nullptr) free(alloclhi); /* .. */ #endif return res; } /* decMultiplyOp */ @@ -5278,7 +5278,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, /* is treated like other buffers, using DECBUFFER, +1 in case */ /* DECBUFFER is 0 */ decNumber bufr[D2N(DECBUFFER*2+1)]; - decNumber *allocrhs=NULL; /* non-NULL if rhs buffer allocated */ + decNumber *allocrhs=nullptr; /* non-nullptr if rhs buffer allocated */ /* the working precision will be no more than set->digits+8+1 */ /* so for on-stack buffers DECBUFFER+9 is used, +1 in case DECBUFFER */ @@ -5286,11 +5286,11 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, /* buffer for t, term (working precision plus) */ decNumber buft[D2N(DECBUFFER*2+9+1)]; - decNumber *allocbuft=NULL; /* -> allocated buft, iff allocated */ + decNumber *allocbuft=nullptr; /* -> allocated buft, iff allocated */ decNumber *t=buft; /* term */ /* buffer for a, accumulator (working precision * 2), at least 9 */ decNumber bufa[D2N(DECBUFFER*4+18+1)]; - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ decNumber *a=bufa; /* accumulator */ /* decNumber for the divisor term; this needs at most 9 digits */ /* and so can be fixed size [16 so can use standard context] */ @@ -5310,7 +5310,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, uprv_decNumberZero(res); else uprv_decNumberCopy(res, rhs); /* +Infinity -> self */ } - else decNaNs(res, rhs, NULL, set, status); /* a NaN */ + else decNaNs(res, rhs, nullptr, set, status); /* a NaN */ break;} if (ISZERO(rhs)) { /* zeros -> exact 1 */ @@ -5400,7 +5400,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, needbytes=sizeof(decNumber)+(D2U(rhs->digits)-1)*sizeof(Unit); if (needbytes>sizeof(bufr)) { /* need malloc space */ allocrhs=(decNumber *)malloc(needbytes); - if (allocrhs==NULL) { /* hopeless -- abandon */ + if (allocrhs==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} newrhs=allocrhs; /* use the allocated space */ @@ -5432,7 +5432,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, needbytes=sizeof(decNumber)+(D2U(p*2)-1)*sizeof(Unit); if (needbytes>sizeof(bufa)) { /* need malloc space */ allocbufa=(decNumber *)malloc(needbytes); - if (allocbufa==NULL) { /* hopeless -- abandon */ + if (allocbufa==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} a=allocbufa; /* use the allocated space */ @@ -5444,7 +5444,7 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, needbytes=sizeof(decNumber)+(D2U(p+2)-1)*sizeof(Unit); if (needbytes>sizeof(buft)) { /* need malloc space */ allocbuft=(decNumber *)malloc(needbytes); - if (allocbuft==NULL) { /* hopeless -- abandon */ + if (allocbuft==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} t=allocbuft; /* use the allocated space */ @@ -5528,9 +5528,9 @@ decNumber * decExpOp(decNumber *res, const decNumber *rhs, decFinish(res, set, &residue, status); /* cleanup/set flags */ } while(0); /* end protected */ - if (allocrhs !=NULL) free(allocrhs); /* drop any storage used */ - if (allocbufa!=NULL) free(allocbufa); /* .. */ - if (allocbuft!=NULL) free(allocbuft); /* .. */ + if (allocrhs !=nullptr) free(allocrhs); /* drop any storage used */ + if (allocbufa!=nullptr) free(allocbufa); /* .. */ + if (allocbuft!=nullptr) free(allocbuft); /* .. */ /* [status is handled by caller] */ return res; } /* decExpOp */ @@ -5640,10 +5640,10 @@ decNumber * decLnOp(decNumber *res, const decNumber *rhs, /* buffers for a (accumulator, typically precision+2) and b */ /* (adjustment calculator, same size) */ decNumber bufa[D2N(DECBUFFER+12)]; - decNumber *allocbufa=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufa=nullptr; /* -> allocated bufa, iff allocated */ decNumber *a=bufa; /* accumulator/work */ decNumber bufb[D2N(DECBUFFER*2+2)]; - decNumber *allocbufb=NULL; /* -> allocated bufa, iff allocated */ + decNumber *allocbufb=nullptr; /* -> allocated bufa, iff allocated */ decNumber *b=bufb; /* adjustment/work */ decNumber numone; /* constant 1 */ @@ -5662,7 +5662,7 @@ decNumber * decLnOp(decNumber *res, const decNumber *rhs, *status|=DEC_Invalid_operation; else uprv_decNumberCopy(res, rhs); /* +Infinity -> self */ } - else decNaNs(res, rhs, NULL, set, status); /* a NaN */ + else decNaNs(res, rhs, nullptr, set, status); /* a NaN */ break;} if (ISZERO(rhs)) { /* +/- zeros -> -Infinity */ @@ -5713,7 +5713,7 @@ decNumber * decLnOp(decNumber *res, const decNumber *rhs, needbytes=sizeof(decNumber)+(D2U(MAXI(p,16))-1)*sizeof(Unit); if (needbytes>sizeof(bufa)) { /* need malloc space */ allocbufa=(decNumber *)malloc(needbytes); - if (allocbufa==NULL) { /* hopeless -- abandon */ + if (allocbufa==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} a=allocbufa; /* use the allocated space */ @@ -5722,7 +5722,7 @@ decNumber * decLnOp(decNumber *res, const decNumber *rhs, needbytes=sizeof(decNumber)+(D2U(MAXI(pp,16))-1)*sizeof(Unit); if (needbytes>sizeof(bufb)) { /* need malloc space */ allocbufb=(decNumber *)malloc(needbytes); - if (allocbufb==NULL) { /* hopeless -- abandon */ + if (allocbufb==nullptr) { /* hopeless -- abandon */ *status|=DEC_Insufficient_storage; break;} b=allocbufb; /* use the allocated space */ @@ -5843,8 +5843,8 @@ decNumber * decLnOp(decNumber *res, const decNumber *rhs, decFinish(res, set, &residue, status); /* cleanup/set flags */ } while(0); /* end protected */ - if (allocbufa!=NULL) free(allocbufa); /* drop any storage used */ - if (allocbufb!=NULL) free(allocbufb); /* .. */ + if (allocbufa!=nullptr) free(allocbufa); /* drop any storage used */ + if (allocbufb!=nullptr) free(allocbufb); /* .. */ /* [status is handled by caller] */ return res; } /* decLnOp */ @@ -5878,8 +5878,8 @@ static decNumber * decQuantizeOp(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set, Flag quant, uInt *status) { #if DECSUBSET - decNumber *alloclhs=NULL; /* non-NULL if rounded lhs allocated */ - decNumber *allocrhs=NULL; /* .., rhs */ + decNumber *alloclhs=nullptr; /* non-nullptr if rounded lhs allocated */ + decNumber *allocrhs=nullptr; /* .., rhs */ #endif const decNumber *inrhs=rhs; /* save original rhs */ Int reqdigits=set->digits; /* requested DIGITS */ @@ -5897,12 +5897,12 @@ static decNumber * decQuantizeOp(decNumber *res, const decNumber *lhs, /* reduce operands and set lostDigits status, as needed */ if (lhs->digits>reqdigits) { alloclhs=decRoundOperand(lhs, set, status); - if (alloclhs==NULL) break; + if (alloclhs==nullptr) break; lhs=alloclhs; } if (rhs->digits>reqdigits) { /* [this only checks lostDigits] */ allocrhs=decRoundOperand(rhs, set, status); - if (allocrhs==NULL) break; + if (allocrhs==nullptr) break; rhs=allocrhs; } } @@ -6011,8 +6011,8 @@ static decNumber * decQuantizeOp(decNumber *res, const decNumber *lhs, } while(0); /* end protected */ #if DECSUBSET - if (allocrhs!=NULL) free(allocrhs); /* drop any storage used */ - if (alloclhs!=NULL) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* drop any storage used */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ #endif return res; } /* decQuantizeOp */ @@ -6051,8 +6051,8 @@ static decNumber * decCompareOp(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set, Flag op, uInt *status) { #if DECSUBSET - decNumber *alloclhs=NULL; /* non-NULL if rounded lhs allocated */ - decNumber *allocrhs=NULL; /* .., rhs */ + decNumber *alloclhs=nullptr; /* non-nullptr if rounded lhs allocated */ + decNumber *allocrhs=nullptr; /* .., rhs */ #endif Int result=0; /* default result value */ uByte merged; /* work */ @@ -6067,12 +6067,12 @@ static decNumber * decCompareOp(decNumber *res, const decNumber *lhs, /* reduce operands and set lostDigits status, as needed */ if (lhs->digits>set->digits) { alloclhs=decRoundOperand(lhs, set, status); - if (alloclhs==NULL) {result=BADINT; break;} + if (alloclhs==nullptr) {result=BADINT; break;} lhs=alloclhs; } if (rhs->digits>set->digits) { allocrhs=decRoundOperand(rhs, set, status); - if (allocrhs==NULL) {result=BADINT; break;} + if (allocrhs==nullptr) {result=BADINT; break;} rhs=allocrhs; } } @@ -6194,8 +6194,8 @@ static decNumber * decCompareOp(decNumber *res, const decNumber *lhs, } } #if DECSUBSET - if (allocrhs!=NULL) free(allocrhs); /* free any storage used */ - if (alloclhs!=NULL) free(alloclhs); /* .. */ + if (allocrhs!=nullptr) free(allocrhs); /* free any storage used */ + if (alloclhs!=nullptr) free(alloclhs); /* .. */ #endif return res; } /* decCompareOp */ @@ -6280,7 +6280,7 @@ static Int decUnitCompare(const Unit *a, Int alength, const Unit *b, Int blength, Int exp) { Unit *acc; /* accumulator for result */ Unit accbuff[SD2U(DECBUFFER*2+1)]; /* local buffer */ - Unit *allocacc=NULL; /* -> allocated acc buffer, iff allocated */ + Unit *allocacc=nullptr; /* -> allocated acc buffer, iff allocated */ Int accunits, need; /* units in use or needed for acc */ const Unit *l, *r, *u; /* work */ Int expunits, exprem, result; /* .. */ @@ -6312,7 +6312,7 @@ static Int decUnitCompare(const Unit *a, Int alength, acc=accbuff; /* assume use local buffer */ if (need*sizeof(Unit)>sizeof(accbuff)) { allocacc=(Unit *)malloc(need*sizeof(Unit)); - if (allocacc==NULL) return BADINT; /* hopeless -- abandon */ + if (allocacc==nullptr) return BADINT; /* hopeless -- abandon */ acc=allocacc; } /* Calculate units and remainder from exponent. */ @@ -6329,7 +6329,7 @@ static Int decUnitCompare(const Unit *a, Int alength, result=(*u==0 ? 0 : +1); } /* clean up and return the result */ - if (allocacc!=NULL) free(allocacc); /* drop any storage used */ + if (allocacc!=nullptr) free(allocacc); /* drop any storage used */ return result; } /* decUnitCompare */ @@ -6847,7 +6847,7 @@ static Int decShiftToLeast(Unit *uar, Int units, Int shift) { /* Instead, return an allocated decNumber, rounded as required. */ /* It is the caller's responsibility to free the allocated storage. */ /* */ -/* If no storage is available then the result cannot be used, so NULL */ +/* If no storage is available then the result cannot be used, so nullptr */ /* is returned. */ /* ------------------------------------------------------------------ */ static decNumber *decRoundOperand(const decNumber *dn, decContext *set, @@ -6860,9 +6860,9 @@ static decNumber *decRoundOperand(const decNumber *dn, decContext *set, /* length specified by the context */ res=(decNumber *)malloc(sizeof(decNumber) +(D2U(set->digits)-1)*sizeof(Unit)); - if (res==NULL) { + if (res==nullptr) { *status|=DEC_Insufficient_storage; - return NULL; + return nullptr; } decCopyFit(res, dn, set, &residue, &newstatus); decApplyRound(res, set, residue, &newstatus); @@ -7725,7 +7725,7 @@ static Flag decBiStr(const char *targ, const char *str1, const char *str2) { /* */ /* res is the result number */ /* lhs is the first operand */ -/* rhs is the second operand, or NULL if none */ +/* rhs is the second operand, or nullptr if none */ /* context is used to limit payload length */ /* status contains the current status */ /* returns res in case convenient */ @@ -7741,7 +7741,7 @@ static decNumber * decNaNs(decNumber *res, const decNumber *lhs, /* and status updated if need be */ if (lhs->bits & DECSNAN) *status|=DEC_Invalid_operation | DEC_sNaN; - else if (rhs==NULL); + else if (rhs==nullptr); else if (rhs->bits & DECSNAN) { lhs=rhs; *status|=DEC_Invalid_operation | DEC_sNaN; @@ -7862,8 +7862,8 @@ void uprv_decNumberShow(const decNumber *dn) { uInt u, d; /* .. */ Int cut; /* .. */ char isign='+'; /* main sign */ - if (dn==NULL) { - printf("NULL\n"); + if (dn==nullptr) { + printf("nullptr\n"); return;} if (decNumberIsNegative(dn)) isign='-'; printf(" >> %c ", isign); @@ -7944,22 +7944,22 @@ static void decDumpAr(char name, const Unit *ar, Int len) { /* ------------------------------------------------------------------ */ /* decCheckOperands -- check operand(s) to a routine */ /* res is the result structure (not checked; it will be set to */ -/* quiet NaN if error found (and it is not NULL)) */ +/* quiet NaN if error found (and it is not nullptr)) */ /* lhs is the first operand (may be DECUNRESU) */ /* rhs is the second (may be DECUNUSED) */ /* set is the context (may be DECUNCONT) */ /* returns 0 if both operands, and the context are clean, or 1 */ /* otherwise (in which case the context will show an error, */ -/* unless NULL). Note that res is not cleaned; caller should */ -/* handle this so res=NULL case is safe. */ +/* unless nullptr). Note that res is not cleaned; caller should */ +/* handle this so res=nullptr case is safe. */ /* The caller is expected to abandon immediately if 1 is returned. */ /* ------------------------------------------------------------------ */ static Flag decCheckOperands(decNumber *res, const decNumber *lhs, const decNumber *rhs, decContext *set) { Flag bad=0; - if (set==NULL) { /* oops; hopeless */ + if (set==nullptr) { /* oops; hopeless */ #if DECTRACE || DECVERB - printf("Reference to context is NULL.\n"); + printf("Reference to context is nullptr.\n"); #endif bad=1; return 1;} @@ -7972,11 +7972,11 @@ static Flag decCheckOperands(decNumber *res, const decNumber *lhs, #endif } else { - if (res==NULL) { + if (res==nullptr) { bad=1; #if DECTRACE - /* this one not DECVERB as standard tests include NULL */ - printf("Reference to result is NULL.\n"); + /* this one not DECVERB as standard tests include nullptr */ + printf("Reference to result is nullptr.\n"); #endif } if (!bad && lhs!=DECUNUSED) bad=(decCheckNumber(lhs)); @@ -7984,7 +7984,7 @@ static Flag decCheckOperands(decNumber *res, const decNumber *lhs, } if (bad) { if (set!=DECUNCONT) uprv_decContextSetStatus(set, DEC_Invalid_operation); - if (res!=DECUNRESU && res!=NULL) { + if (res!=DECUNRESU && res!=nullptr) { uprv_decNumberZero(res); res->bits=DECNAN; /* qNaN */ } @@ -8006,10 +8006,10 @@ static Flag decCheckNumber(const decNumber *dn) { Int ae, d, digits; /* .. */ Int emin, emax; /* .. */ - if (dn==NULL) { /* hopeless */ + if (dn==nullptr) { /* hopeless */ #if DECTRACE - /* this one not DECVERB as standard tests include NULL */ - printf("Reference to decNumber is NULL.\n"); + /* this one not DECVERB as standard tests include nullptr */ + printf("Reference to decNumber is nullptr.\n"); #endif return 1;} @@ -8114,7 +8114,7 @@ static void decCheckInexact(const decNumber *dn, decContext *set) { } #else /* next is a noop for quiet compiler */ - if (dn!=NULL && dn->digits==0) set->status|=DEC_Invalid_operation; + if (dn!=nullptr && dn->digits==0) set->status|=DEC_Invalid_operation; #endif return; } /* decCheckInexact */ @@ -8144,7 +8144,7 @@ static void *decMalloc(size_t n) { uInt uiwork; /* for macros */ alloc=malloc(size); /* -> allocated storage */ - if (alloc==NULL) return NULL; /* out of strorage */ + if (alloc==nullptr) return nullptr; /* out of strorage */ b0=(uByte *)alloc; /* as bytes */ decAllocBytes+=n; /* account for storage */ UBFROMUI(alloc, n); /* save n */ @@ -8171,7 +8171,7 @@ static void decFree(void *alloc) { uByte *b, *b0; /* work */ uInt uiwork; /* for macros */ - if (alloc==NULL) return; /* allowed; it's a nop */ + if (alloc==nullptr) return; /* allowed; it's a nop */ b0=(uByte *)alloc; /* as bytes */ b0-=8; /* -> true start of storage */ n=UBTOUI(b0); /* lift length */ diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp index bca33366792..80fc248f13f 100644 --- a/icu4c/source/i18n/decimfmt.cpp +++ b/icu4c/source/i18n/decimfmt.cpp @@ -803,7 +803,7 @@ const DecimalFormatSymbols* DecimalFormat::getDecimalFormatSymbols(void) const { void DecimalFormat::adoptDecimalFormatSymbols(DecimalFormatSymbols* symbolsToAdopt) { if (symbolsToAdopt == nullptr) { - return; // do not allow caller to set fields->symbols to NULL + return; // do not allow caller to set fields->symbols to nullptr } // we must take ownership of symbolsToAdopt, even in a failure case. LocalPointer dfs(symbolsToAdopt); diff --git a/icu4c/source/i18n/double-conversion-double-to-string.h b/icu4c/source/i18n/double-conversion-double-to-string.h index 1fae2e87715..9940052c64b 100644 --- a/icu4c/source/i18n/double-conversion-double-to-string.h +++ b/icu4c/source/i18n/double-conversion-double-to-string.h @@ -114,7 +114,7 @@ class DoubleToStringConverter { // preserved. // // Infinity symbol and nan_symbol provide the string representation for these - // special values. If the string is NULL and the special value is encountered + // special values. If the string is nullptr and the special value is encountered // then the conversion functions return false. // // The exponent_character is used in exponential representations. It is @@ -429,7 +429,7 @@ class DoubleToStringConverter { // If the value is a special value (NaN or Infinity) constructs the // corresponding string using the configured infinity/nan-symbol. - // If either of them is NULL or the value is not special then the + // If either of them is nullptr or the value is not special then the // function returns false. bool HandleSpecialValues(double value, StringBuilder* result_builder) const; // Constructs an exponential representation (i.e. 1.234e56). diff --git a/icu4c/source/i18n/double-conversion-string-to-double.h b/icu4c/source/i18n/double-conversion-string-to-double.h index 9f6f5307111..1d4e3dddde9 100644 --- a/icu4c/source/i18n/double-conversion-string-to-double.h +++ b/icu4c/source/i18n/double-conversion-string-to-double.h @@ -158,8 +158,8 @@ class StringToDoubleConverter { // flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES, // empty_string_value = 0.0, // junk_string_value = NaN, - // infinity_symbol = NULL, - // nan_symbol = NULL: + // infinity_symbol = nullptr, + // nan_symbol = nullptr: // StringToDouble("0x1234") -> NaN // junk_string_value. // StringToDouble("01234") -> 668.0. // StringToDouble("") -> 0.0 // empty_string_value. diff --git a/icu4c/source/i18n/dtfmtsym.cpp b/icu4c/source/i18n/dtfmtsym.cpp index ea3ab496700..f7928853064 100644 --- a/icu4c/source/i18n/dtfmtsym.cpp +++ b/icu4c/source/i18n/dtfmtsym.cpp @@ -179,17 +179,17 @@ const SharedDateFormatSymbols * char type[256]; Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } SharedDateFormatSymbols *shared = new SharedDateFormatSymbols(fLoc, type, status); - if (shared == NULL) { + if (shared == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } if (U_FAILURE(status)) { delete shared; - return NULL; + return nullptr; } shared->addRef(); return shared; @@ -248,16 +248,16 @@ static inline UnicodeString* newUnicodeStringArray(size_t count) { DateFormatSymbols * U_EXPORT2 DateFormatSymbols::createForLocale( const Locale& locale, UErrorCode &status) { - const SharedDateFormatSymbols *shared = NULL; + const SharedDateFormatSymbols *shared = nullptr; UnifiedCache::getByLocale(locale, shared, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } DateFormatSymbols *result = new DateFormatSymbols(shared->get()); shared->removeRef(); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } return result; } @@ -266,13 +266,13 @@ DateFormatSymbols::DateFormatSymbols(const Locale& locale, UErrorCode& status) : UObject() { - initializeData(locale, NULL, status); + initializeData(locale, nullptr, status); } DateFormatSymbols::DateFormatSymbols(UErrorCode& status) : UObject() { - initializeData(Locale::getDefault(), NULL, status, true); + initializeData(Locale::getDefault(), nullptr, status, true); } @@ -316,7 +316,7 @@ DateFormatSymbols::assignArray(UnicodeString*& dstArray, // a subclass from creating these strings in an "unsafe" way (with respect to fastCopyFrom()). dstCount = srcCount; dstArray = newUnicodeStringArray(srcCount); - if(dstArray != NULL) { + if(dstArray != nullptr) { int32_t i; for(i=0; iinitZoneStringsArray(); } result = (const UnicodeString**)fLocaleZoneStrings; @@ -1275,15 +1275,15 @@ DateFormatSymbols::getZoneStrings(int32_t& rowCount, int32_t& columnCount) const // This code must be called within a synchronized block void DateFormatSymbols::initZoneStringsArray(void) { - if (fZoneStrings != NULL || fLocaleZoneStrings != NULL) { + if (fZoneStrings != nullptr || fLocaleZoneStrings != nullptr) { return; } UErrorCode status = U_ZERO_ERROR; - StringEnumeration *tzids = NULL; - UnicodeString ** zarray = NULL; - TimeZoneNames *tzNames = NULL; + StringEnumeration *tzids = nullptr; + UnicodeString ** zarray = nullptr; + TimeZoneNames *tzNames = nullptr; int32_t rows = 0; static const UTimeZoneNameType TYPES[] = { @@ -1294,7 +1294,7 @@ DateFormatSymbols::initZoneStringsArray(void) { do { // dummy do-while - tzids = TimeZone::createTimeZoneIDEnumeration(ZONE_SET, NULL, NULL, status); + tzids = TimeZone::createTimeZoneIDEnumeration(ZONE_SET, nullptr, nullptr, status); rows = tzids->count(status); if (U_FAILURE(status)) { break; @@ -1303,7 +1303,7 @@ DateFormatSymbols::initZoneStringsArray(void) { // Allocate array int32_t size = rows * sizeof(UnicodeString*); zarray = (UnicodeString**)uprv_malloc(size); - if (zarray == NULL) { + if (zarray == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1324,7 +1324,7 @@ DateFormatSymbols::initZoneStringsArray(void) { } zarray[i] = new UnicodeString[5]; - if (zarray[i] == NULL) { + if (zarray[i] == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -1344,7 +1344,7 @@ DateFormatSymbols::initZoneStringsArray(void) { } } uprv_free(zarray); - zarray = NULL; + zarray = nullptr; } } @@ -1384,7 +1384,7 @@ DateFormatSymbols::getPatternUChars(void) UDateFormatField U_EXPORT2 DateFormatSymbols::getPatternCharIndex(UChar c) { const UChar *p = u_strchr(gPatternChars, c); - if (p == NULL) { + if (p == nullptr) { return UDAT_FIELD_COUNT; } else { return static_cast(p - gPatternChars); @@ -1528,14 +1528,14 @@ struct CalendarDataSink : public ResourceSink { mapRefs(), aliasPathPairs(uprv_deleteUObject, uhash_compareUnicodeString, status), currentCalendarType(), nextCalendarType(), - resourcesToVisit(NULL), aliasRelativePath() { + resourcesToVisit(nullptr), aliasRelativePath() { if (U_FAILURE(status)) { return; } } virtual ~CalendarDataSink(); // Configure the CalendarSink to visit all the resources void visitAllResources() { - resourcesToVisit.adoptInstead(NULL); + resourcesToVisit.adoptInstead(nullptr); } // Actions to be done before enumerating @@ -1550,7 +1550,7 @@ struct CalendarDataSink : public ResourceSink { U_ASSERT(!currentCalendarType.isEmpty()); // Stores the resources to visit on the next calendar. - LocalPointer resourcesToVisitNext(NULL); + LocalPointer resourcesToVisitNext(nullptr); ResourceTable calendarData = value.getTable(errorCode); if (U_FAILURE(errorCode)) { return; } @@ -1581,7 +1581,7 @@ struct CalendarDataSink : public ResourceSink { } else if (aliasType == SAME_CALENDAR) { // Register same-calendar alias - if (arrays.get(aliasRelativePath) == NULL && maps.get(aliasRelativePath) == NULL) { + if (arrays.get(aliasRelativePath) == nullptr && maps.get(aliasRelativePath) == nullptr) { LocalPointer aliasRelativePathCopy(aliasRelativePath.clone(), errorCode); aliasPathPairs.adoptElement(aliasRelativePathCopy.orphan(), errorCode); if (U_FAILURE(errorCode)) { return; } @@ -1601,7 +1601,7 @@ struct CalendarDataSink : public ResourceSink { if (uprv_strcmp(key, gAmPmMarkersTag) == 0 || uprv_strcmp(key, gAmPmMarkersAbbrTag) == 0 || uprv_strcmp(key, gAmPmMarkersNarrowTag) == 0) { - if (arrays.get(keyUString) == NULL) { + if (arrays.get(keyUString) == nullptr) { ResourceArray resourceArray = value.getArray(errorCode); int32_t arraySize = resourceArray.getSize(); LocalArray stringArray(new UnicodeString[arraySize], errorCode); @@ -1630,9 +1630,9 @@ struct CalendarDataSink : public ResourceSink { UnicodeString *alias = (UnicodeString*)aliasPathPairs[i]; UnicodeString *aliasArray; Hashtable *aliasMap; - if ((aliasArray = (UnicodeString*)arrays.get(*alias)) != NULL) { + if ((aliasArray = (UnicodeString*)arrays.get(*alias)) != nullptr) { UnicodeString *path = (UnicodeString*)aliasPathPairs[i + 1]; - if (arrays.get(*path) == NULL) { + if (arrays.get(*path) == nullptr) { // Clone the array int32_t aliasArraySize = arraySizes.geti(*alias); LocalArray aliasArrayCopy(new UnicodeString[aliasArraySize], errorCode); @@ -1644,9 +1644,9 @@ struct CalendarDataSink : public ResourceSink { } if (U_FAILURE(errorCode)) { return; } mod = true; - } else if ((aliasMap = (Hashtable*)maps.get(*alias)) != NULL) { + } else if ((aliasMap = (Hashtable*)maps.get(*alias)) != nullptr) { UnicodeString *path = (UnicodeString*)aliasPathPairs[i + 1]; - if (maps.get(*path) == NULL) { + if (maps.get(*path) == nullptr) { maps.put(*path, aliasMap, errorCode); } if (U_FAILURE(errorCode)) { return; } @@ -1674,7 +1674,7 @@ struct CalendarDataSink : public ResourceSink { ResourceTable table = value.getTable(errorCode); if (U_FAILURE(errorCode)) return; - Hashtable* stringMap = NULL; + Hashtable* stringMap = nullptr; // Iterate over all the elements of the table and add them to the map for (int i = 0; table.getKeyAndValue(i, key, value); i++) { @@ -1691,7 +1691,7 @@ struct CalendarDataSink : public ResourceSink { if (i == 0) { // mapRefs will keep ownership of 'stringMap': stringMap = mapRefs.create(false, errorCode); - if (stringMap == NULL) { + if (stringMap == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1699,7 +1699,7 @@ struct CalendarDataSink : public ResourceSink { if (U_FAILURE(errorCode)) { return; } stringMap->setValueDeleter(uprv_deleteUObject); } - U_ASSERT(stringMap != NULL); + U_ASSERT(stringMap != nullptr); int32_t valueStringSize; const UChar *valueString = value.getString(valueStringSize, errorCode); if (U_FAILURE(errorCode)) { return; } @@ -1708,7 +1708,7 @@ struct CalendarDataSink : public ResourceSink { if (U_FAILURE(errorCode)) { return; } continue; } - U_ASSERT(stringMap == NULL); + U_ASSERT(stringMap == nullptr); // Store the current path's length and append the current key to the path. int32_t pathLength = path.length(); @@ -1744,7 +1744,7 @@ struct CalendarDataSink : public ResourceSink { } // == Handle aliases == - if (arrays.get(path) != NULL || maps.get(path) != NULL) { + if (arrays.get(path) != nullptr || maps.get(path) != nullptr) { // Drop the latest key on the path and continue path.retainBetween(0, pathLength); continue; @@ -1870,7 +1870,7 @@ initField(UnicodeString **field, int32_t& length, CalendarDataSink &sink, CharSt UnicodeString keyUString(key.data(), -1, US_INV); UnicodeString* array = static_cast(sink.arrays.get(keyUString)); - if (array != NULL) { + if (array != nullptr) { length = sink.arraySizes.geti(keyUString); *field = array; // DateFormatSymbols takes ownership of the array: @@ -1888,11 +1888,11 @@ initField(UnicodeString **field, int32_t& length, CalendarDataSink &sink, CharSt UnicodeString keyUString(key.data(), -1, US_INV); UnicodeString* array = static_cast(sink.arrays.get(keyUString)); - if (array != NULL) { + if (array != nullptr) { int32_t arrayLength = sink.arraySizes.geti(keyUString); length = arrayLength + arrayOffset; *field = new UnicodeString[length]; - if (*field == NULL) { + if (*field == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1910,10 +1910,10 @@ initLeapMonthPattern(UnicodeString *field, int32_t index, CalendarDataSink &sink if (U_SUCCESS(status)) { UnicodeString pathUString(path.data(), -1, US_INV); Hashtable *leapMonthTable = static_cast(sink.maps.get(pathUString)); - if (leapMonthTable != NULL) { + if (leapMonthTable != nullptr) { UnicodeString leapLabel(false, kLeapTagUChar, UPRV_LENGTHOF(kLeapTagUChar)); UnicodeString *leapMonthPattern = static_cast(leapMonthTable->get(leapLabel)); - if (leapMonthPattern != NULL) { + if (leapMonthPattern != nullptr) { field[index].fastCopyFrom(*leapMonthPattern); } else { field[index].setToBogus(); @@ -1956,7 +1956,7 @@ typedef struct { } ContextUsageTypeNameToEnumValue; static const ContextUsageTypeNameToEnumValue contextUsageTypeMap[] = { - // Entries must be sorted by usageTypeName; entry with NULL name terminates list. + // Entries must be sorted by usageTypeName; entry with nullptr name terminates list. { "day-format-except-narrow", DateFormatSymbols::kCapContextUsageDayFormat }, { "day-narrow", DateFormatSymbols::kCapContextUsageDayNarrow }, { "day-standalone-except-narrow", DateFormatSymbols::kCapContextUsageDayStandalone }, @@ -1970,7 +1970,7 @@ static const ContextUsageTypeNameToEnumValue contextUsageTypeMap[] = { { "month-standalone-except-narrow", DateFormatSymbols::kCapContextUsageMonthStandalone }, { "zone-long", DateFormatSymbols::kCapContextUsageZoneLong }, { "zone-short", DateFormatSymbols::kCapContextUsageZoneShort }, - { NULL, (DateFormatSymbols::ECapitalizationContextUsageType)0 }, + { nullptr, (DateFormatSymbols::ECapitalizationContextUsageType)0 }, }; // Resource keys to look up localized strings for day periods. @@ -1982,23 +1982,23 @@ static const char *dayPeriodKeys[] = {"midnight", "noon", UnicodeString* loadDayPeriodStrings(CalendarDataSink &sink, CharString &path, int32_t &stringCount, UErrorCode &status) { - if (U_FAILURE(status)) { return NULL; } + if (U_FAILURE(status)) { return nullptr; } UnicodeString pathUString(path.data(), -1, US_INV); Hashtable* map = static_cast(sink.maps.get(pathUString)); stringCount = UPRV_LENGTHOF(dayPeriodKeys); UnicodeString *strings = new UnicodeString[stringCount]; - if (strings == NULL) { + if (strings == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - if (map != NULL) { + if (map != nullptr) { for (int32_t i = 0; i < stringCount; ++i) { UnicodeString dayPeriodKey(dayPeriodKeys[i], -1, US_INV); UnicodeString *dayPeriod = static_cast(map->get(dayPeriodKey)); - if (dayPeriod != NULL) { + if (dayPeriod != nullptr) { strings[i].fastCopyFrom(*dayPeriod); } else { strings[i].setToBogus(); @@ -2017,79 +2017,79 @@ void DateFormatSymbols::initializeData(const Locale& locale, const char *type, UErrorCode& status, UBool useLastResortData) { int32_t len = 0; - /* In case something goes wrong, initialize all of the data to NULL. */ - fEras = NULL; + /* In case something goes wrong, initialize all of the data to nullptr. */ + fEras = nullptr; fErasCount = 0; - fEraNames = NULL; + fEraNames = nullptr; fEraNamesCount = 0; - fNarrowEras = NULL; + fNarrowEras = nullptr; fNarrowErasCount = 0; - fMonths = NULL; + fMonths = nullptr; fMonthsCount=0; - fShortMonths = NULL; + fShortMonths = nullptr; fShortMonthsCount=0; - fNarrowMonths = NULL; + fNarrowMonths = nullptr; fNarrowMonthsCount=0; - fStandaloneMonths = NULL; + fStandaloneMonths = nullptr; fStandaloneMonthsCount=0; - fStandaloneShortMonths = NULL; + fStandaloneShortMonths = nullptr; fStandaloneShortMonthsCount=0; - fStandaloneNarrowMonths = NULL; + fStandaloneNarrowMonths = nullptr; fStandaloneNarrowMonthsCount=0; - fWeekdays = NULL; + fWeekdays = nullptr; fWeekdaysCount=0; - fShortWeekdays = NULL; + fShortWeekdays = nullptr; fShortWeekdaysCount=0; - fShorterWeekdays = NULL; + fShorterWeekdays = nullptr; fShorterWeekdaysCount=0; - fNarrowWeekdays = NULL; + fNarrowWeekdays = nullptr; fNarrowWeekdaysCount=0; - fStandaloneWeekdays = NULL; + fStandaloneWeekdays = nullptr; fStandaloneWeekdaysCount=0; - fStandaloneShortWeekdays = NULL; + fStandaloneShortWeekdays = nullptr; fStandaloneShortWeekdaysCount=0; - fStandaloneShorterWeekdays = NULL; + fStandaloneShorterWeekdays = nullptr; fStandaloneShorterWeekdaysCount=0; - fStandaloneNarrowWeekdays = NULL; + fStandaloneNarrowWeekdays = nullptr; fStandaloneNarrowWeekdaysCount=0; - fAmPms = NULL; + fAmPms = nullptr; fAmPmsCount=0; - fNarrowAmPms = NULL; + fNarrowAmPms = nullptr; fNarrowAmPmsCount=0; fTimeSeparator.setToBogus(); - fQuarters = NULL; + fQuarters = nullptr; fQuartersCount = 0; - fShortQuarters = NULL; + fShortQuarters = nullptr; fShortQuartersCount = 0; - fNarrowQuarters = NULL; + fNarrowQuarters = nullptr; fNarrowQuartersCount = 0; - fStandaloneQuarters = NULL; + fStandaloneQuarters = nullptr; fStandaloneQuartersCount = 0; - fStandaloneShortQuarters = NULL; + fStandaloneShortQuarters = nullptr; fStandaloneShortQuartersCount = 0; - fStandaloneNarrowQuarters = NULL; + fStandaloneNarrowQuarters = nullptr; fStandaloneNarrowQuartersCount = 0; - fLeapMonthPatterns = NULL; + fLeapMonthPatterns = nullptr; fLeapMonthPatternsCount = 0; - fShortYearNames = NULL; + fShortYearNames = nullptr; fShortYearNamesCount = 0; - fShortZodiacNames = NULL; + fShortZodiacNames = nullptr; fShortZodiacNamesCount = 0; fZoneStringsRowCount = 0; fZoneStringsColCount = 0; - fZoneStrings = NULL; - fLocaleZoneStrings = NULL; - fAbbreviatedDayPeriods = NULL; + fZoneStrings = nullptr; + fLocaleZoneStrings = nullptr; + fAbbreviatedDayPeriods = nullptr; fAbbreviatedDayPeriodsCount = 0; - fWideDayPeriods = NULL; + fWideDayPeriods = nullptr; fWideDayPeriodsCount = 0; - fNarrowDayPeriods = NULL; + fNarrowDayPeriods = nullptr; fNarrowDayPeriodsCount = 0; - fStandaloneAbbreviatedDayPeriods = NULL; + fStandaloneAbbreviatedDayPeriods = nullptr; fStandaloneAbbreviatedDayPeriodsCount = 0; - fStandaloneWideDayPeriods = NULL; + fStandaloneWideDayPeriods = nullptr; fStandaloneWideDayPeriodsCount = 0; - fStandaloneNarrowDayPeriods = NULL; + fStandaloneNarrowDayPeriods = nullptr; fStandaloneNarrowDayPeriodsCount = 0; uprv_memset(fCapitalization, 0, sizeof(fCapitalization)); @@ -2103,13 +2103,13 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError // Create a CalendarDataSink to process this data and the resource bundles CalendarDataSink calendarSink(status); - UResourceBundle *rb = ures_open(NULL, locale.getBaseName(), &status); - UResourceBundle *cb = ures_getByKey(rb, gCalendarTag, NULL, &status); + UResourceBundle *rb = ures_open(nullptr, locale.getBaseName(), &status); + UResourceBundle *cb = ures_getByKey(rb, gCalendarTag, nullptr, &status); if (U_FAILURE(status)) return; // Iterate over the resource bundle data following the fallbacks through different calendar types - UnicodeString calendarType((type != NULL && *type != '\0')? type : gGregorianTag, -1, US_INV); + UnicodeString calendarType((type != nullptr && *type != '\0')? type : gGregorianTag, -1, US_INV); while (!calendarType.isBogus()) { CharString calendarTypeBuffer; calendarTypeBuffer.appendInvariantChars(calendarType, status); @@ -2118,7 +2118,7 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError // Enumerate this calendar type. If the calendar is not found fallback to gregorian UErrorCode oldStatus = status; - UResourceBundle *ctb = ures_getByKeyWithFallback(cb, calendarTypeCArray, NULL, &status); + UResourceBundle *ctb = ures_getByKeyWithFallback(cb, calendarTypeCArray, nullptr, &status); if (status == U_MISSING_RESOURCE_ERROR) { ures_close(ctb); if (uprv_strcmp(calendarTypeCArray, gGregorianTag) != 0) { @@ -2190,7 +2190,7 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError fLeapMonthPatternsCount = kMonthPatternsCount; } else { delete[] fLeapMonthPatterns; - fLeapMonthPatterns = NULL; + fLeapMonthPatterns = nullptr; } } @@ -2203,23 +2203,23 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError // Load context transforms and capitalization tempStatus = U_ZERO_ERROR; - UResourceBundle *localeBundle = ures_open(NULL, locale.getName(), &tempStatus); + UResourceBundle *localeBundle = ures_open(nullptr, locale.getName(), &tempStatus); if (U_SUCCESS(tempStatus)) { - UResourceBundle *contextTransforms = ures_getByKeyWithFallback(localeBundle, gContextTransformsTag, NULL, &tempStatus); + UResourceBundle *contextTransforms = ures_getByKeyWithFallback(localeBundle, gContextTransformsTag, nullptr, &tempStatus); if (U_SUCCESS(tempStatus)) { UResourceBundle *contextTransformUsage; - while ( (contextTransformUsage = ures_getNextResource(contextTransforms, NULL, &tempStatus)) != NULL ) { + while ( (contextTransformUsage = ures_getNextResource(contextTransforms, nullptr, &tempStatus)) != nullptr ) { const int32_t * intVector = ures_getIntVector(contextTransformUsage, &len, &status); - if (U_SUCCESS(tempStatus) && intVector != NULL && len >= 2) { + if (U_SUCCESS(tempStatus) && intVector != nullptr && len >= 2) { const char* usageType = ures_getKey(contextTransformUsage); - if (usageType != NULL) { + if (usageType != nullptr) { const ContextUsageTypeNameToEnumValue * typeMapPtr = contextUsageTypeMap; int32_t compResult = 0; // linear search; list is short and we cannot be sure that bsearch is available - while ( typeMapPtr->usageTypeName != NULL && (compResult = uprv_strcmp(usageType, typeMapPtr->usageTypeName)) > 0 ) { + while ( typeMapPtr->usageTypeName != nullptr && (compResult = uprv_strcmp(usageType, typeMapPtr->usageTypeName)) > 0 ) { ++typeMapPtr; } - if (typeMapPtr->usageTypeName != NULL && compResult == 0) { + if (typeMapPtr->usageTypeName != nullptr && compResult == 0) { fCapitalization[typeMapPtr->usageTypeEnumValue][0] = static_cast(intVector[0]); fCapitalization[typeMapPtr->usageTypeEnumValue][1] = static_cast(intVector[1]); } @@ -2235,15 +2235,15 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError const LocalPointer numberingSystem( NumberingSystem::createInstance(locale, tempStatus), tempStatus); if (U_SUCCESS(tempStatus)) { - // These functions all fail gracefully if passed NULL pointers and + // These functions all fail gracefully if passed nullptr pointers and // do nothing unless U_SUCCESS(tempStatus), so it's only necessary // to check for errors once after all calls are made. const LocalUResourceBundlePointer numberElementsData(ures_getByKeyWithFallback( - localeBundle, gNumberElementsTag, NULL, &tempStatus)); + localeBundle, gNumberElementsTag, nullptr, &tempStatus)); const LocalUResourceBundlePointer nsNameData(ures_getByKeyWithFallback( - numberElementsData.getAlias(), numberingSystem->getName(), NULL, &tempStatus)); + numberElementsData.getAlias(), numberingSystem->getName(), nullptr, &tempStatus)); const LocalUResourceBundlePointer symbolsData(ures_getByKeyWithFallback( - nsNameData.getAlias(), gSymbolsTag, NULL, &tempStatus)); + nsNameData.getAlias(), gSymbolsTag, nullptr, &tempStatus)); fTimeSeparator = ures_getUnicodeStringByKey( symbolsData.getAlias(), gTimeSeparatorTag, &tempStatus); if (U_FAILURE(tempStatus)) { @@ -2284,19 +2284,19 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError // Fill in for missing/bogus items (dayPeriods are a map so single items might be missing) if (U_SUCCESS(status)) { for (int32_t dpidx = 0; dpidx < fAbbreviatedDayPeriodsCount; ++dpidx) { - if (dpidx < fWideDayPeriodsCount && fWideDayPeriods != NULL && fWideDayPeriods[dpidx].isBogus()) { + if (dpidx < fWideDayPeriodsCount && fWideDayPeriods != nullptr && fWideDayPeriods[dpidx].isBogus()) { fWideDayPeriods[dpidx].fastCopyFrom(fAbbreviatedDayPeriods[dpidx]); } - if (dpidx < fNarrowDayPeriodsCount && fNarrowDayPeriods != NULL && fNarrowDayPeriods[dpidx].isBogus()) { + if (dpidx < fNarrowDayPeriodsCount && fNarrowDayPeriods != nullptr && fNarrowDayPeriods[dpidx].isBogus()) { fNarrowDayPeriods[dpidx].fastCopyFrom(fAbbreviatedDayPeriods[dpidx]); } - if (dpidx < fStandaloneAbbreviatedDayPeriodsCount && fStandaloneAbbreviatedDayPeriods != NULL && fStandaloneAbbreviatedDayPeriods[dpidx].isBogus()) { + if (dpidx < fStandaloneAbbreviatedDayPeriodsCount && fStandaloneAbbreviatedDayPeriods != nullptr && fStandaloneAbbreviatedDayPeriods[dpidx].isBogus()) { fStandaloneAbbreviatedDayPeriods[dpidx].fastCopyFrom(fAbbreviatedDayPeriods[dpidx]); } - if (dpidx < fStandaloneWideDayPeriodsCount && fStandaloneWideDayPeriods != NULL && fStandaloneWideDayPeriods[dpidx].isBogus()) { + if (dpidx < fStandaloneWideDayPeriodsCount && fStandaloneWideDayPeriods != nullptr && fStandaloneWideDayPeriods[dpidx].isBogus()) { fStandaloneWideDayPeriods[dpidx].fastCopyFrom(fStandaloneAbbreviatedDayPeriods[dpidx]); } - if (dpidx < fStandaloneNarrowDayPeriodsCount && fStandaloneNarrowDayPeriods != NULL && fStandaloneNarrowDayPeriods[dpidx].isBogus()) { + if (dpidx < fStandaloneNarrowDayPeriodsCount && fStandaloneNarrowDayPeriods != nullptr && fStandaloneNarrowDayPeriods[dpidx].isBogus()) { fStandaloneNarrowDayPeriods[dpidx].fastCopyFrom(fStandaloneAbbreviatedDayPeriods[dpidx]); } } diff --git a/icu4c/source/i18n/dtptngen.cpp b/icu4c/source/i18n/dtptngen.cpp index f4e28de91bc..f8c051fdeb3 100644 --- a/icu4c/source/i18n/dtptngen.cpp +++ b/icu4c/source/i18n/dtptngen.cpp @@ -2177,10 +2177,10 @@ PatternMap::getPatternFromBasePattern(const UnicodeString& basePattern, UBool& s // Find the pattern from the given skeleton. -// At least when this is called from getBestRaw & addPattern (in which case specifiedSkeletonPtr is non-NULL), +// At least when this is called from getBestRaw & addPattern (in which case specifiedSkeletonPtr is non-nullptr), // the comparison should be based on skeleton.original (which is unique and tied to the distance measurement in bestRaw) // and not skeleton.baseOriginal (which is not unique); otherwise we may pick a different skeleton than the one with the -// optimum distance value in getBestRaw. When this is called from public getRedundants (specifiedSkeletonPtr is NULL), +// optimum distance value in getBestRaw. When this is called from public getRedundants (specifiedSkeletonPtr is nullptr), // for now it will continue to compare based on baseOriginal so as not to change the behavior unnecessarily. const UnicodeString * PatternMap::getPatternFromSkeleton(const PtnSkeleton& skeleton, const PtnSkeleton** specifiedSkeletonPtr) const { // key to search for diff --git a/icu4c/source/i18n/esctrn.cpp b/icu4c/source/i18n/esctrn.cpp index 00c1304d245..c331cda2549 100644 --- a/icu4c/source/i18n/esctrn.cpp +++ b/icu4c/source/i18n/esctrn.cpp @@ -36,28 +36,28 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(EscapeTransliterator) */ static Transliterator* _createEscUnicode(const UnicodeString& ID, Transliterator::Token /*context*/) { // Unicode: "U+10FFFF" hex, min=4, max=6 - return new EscapeTransliterator(ID, UnicodeString(true, UNIPRE, 2), UnicodeString(), 16, 4, true, NULL); + return new EscapeTransliterator(ID, UnicodeString(true, UNIPRE, 2), UnicodeString(), 16, 4, true, nullptr); } static Transliterator* _createEscJava(const UnicodeString& ID, Transliterator::Token /*context*/) { // Java: "\\uFFFF" hex, min=4, max=4 - return new EscapeTransliterator(ID, UnicodeString(true, BS_u, 2), UnicodeString(), 16, 4, false, NULL); + return new EscapeTransliterator(ID, UnicodeString(true, BS_u, 2), UnicodeString(), 16, 4, false, nullptr); } static Transliterator* _createEscC(const UnicodeString& ID, Transliterator::Token /*context*/) { // C: "\\uFFFF" hex, min=4, max=4; \\U0010FFFF hex, min=8, max=8 return new EscapeTransliterator(ID, UnicodeString(true, BS_u, 2), UnicodeString(), 16, 4, true, - new EscapeTransliterator(UnicodeString(), UnicodeString(true, BS_U, 2), UnicodeString(), 16, 8, true, NULL)); + new EscapeTransliterator(UnicodeString(), UnicodeString(true, BS_U, 2), UnicodeString(), 16, 8, true, nullptr)); } static Transliterator* _createEscXML(const UnicodeString& ID, Transliterator::Token /*context*/) { // XML: "􏿿" hex, min=1, max=6 - return new EscapeTransliterator(ID, UnicodeString(true, XMLPRE, 3), UnicodeString(SEMI[0]), 16, 1, true, NULL); + return new EscapeTransliterator(ID, UnicodeString(true, XMLPRE, 3), UnicodeString(SEMI[0]), 16, 1, true, nullptr); } static Transliterator* _createEscXML10(const UnicodeString& ID, Transliterator::Token /*context*/) { // XML10: "&1114111;" dec, min=1, max=7 (not really "Any-Hex") - return new EscapeTransliterator(ID, UnicodeString(true, XML10PRE, 2), UnicodeString(SEMI[0]), 10, 1, true, NULL); + return new EscapeTransliterator(ID, UnicodeString(true, XML10PRE, 2), UnicodeString(SEMI[0]), 10, 1, true, nullptr); } static Transliterator* _createEscPerl(const UnicodeString& ID, Transliterator::Token /*context*/) { // Perl: "\\x{263A}" hex, min=1, max=6 - return new EscapeTransliterator(ID, UnicodeString(true, PERLPRE, 3), UnicodeString(RBRACE[0]), 16, 1, true, NULL); + return new EscapeTransliterator(ID, UnicodeString(true, PERLPRE, 3), UnicodeString(RBRACE[0]), 16, 1, true, nullptr); } /** @@ -91,7 +91,7 @@ EscapeTransliterator::EscapeTransliterator(const UnicodeString& newID, int32_t _radix, int32_t _minDigits, UBool _grokSupplementals, EscapeTransliterator* adoptedSupplementalHandler) : - Transliterator(newID, NULL) + Transliterator(newID, nullptr) { this->prefix = _prefix; this->suffix = _suffix; @@ -112,7 +112,7 @@ EscapeTransliterator::EscapeTransliterator(const EscapeTransliterator& o) : minDigits(o.minDigits), grokSupplementals(o.grokSupplementals) { supplementalHandler = (o.supplementalHandler != 0) ? - new EscapeTransliterator(*o.supplementalHandler) : NULL; + new EscapeTransliterator(*o.supplementalHandler) : nullptr; } EscapeTransliterator::~EscapeTransliterator() { @@ -145,7 +145,7 @@ void EscapeTransliterator::handleTransliterate(Replaceable& text, int32_t c = grokSupplementals ? text.char32At(start) : text.charAt(start); int32_t charLen = grokSupplementals ? U16_LENGTH(c) : 1; - if ((c & 0xFFFF0000) != 0 && supplementalHandler != NULL) { + if ((c & 0xFFFF0000) != 0 && supplementalHandler != nullptr) { buf.truncate(0); buf.append(supplementalHandler->prefix); ICU_Utility::appendNumber(buf, c, supplementalHandler->radix, diff --git a/icu4c/source/i18n/fmtable.cpp b/icu4c/source/i18n/fmtable.cpp index c3ede98328e..25b4ce7aed1 100644 --- a/icu4c/source/i18n/fmtable.cpp +++ b/icu4c/source/i18n/fmtable.cpp @@ -67,7 +67,7 @@ static inline UObject* objectClone(const UObject* a) { // Return true if *a is an instance of Measure. static inline UBool instanceOfMeasure(const UObject* a) { - return dynamic_cast(a) != NULL; + return dynamic_cast(a) != nullptr; } /** @@ -79,7 +79,7 @@ static inline UBool instanceOfMeasure(const UObject* a) { */ static Formattable* createArrayCopy(const Formattable* array, int32_t count) { Formattable *result = new Formattable[count]; - if (result != NULL) { + if (result != nullptr) { for (int32_t i=0; i U_DOUBLE_MAX_EXACT_INT && fDecimalQuantity != NULL) { + } else if (fabs(fValue.fDouble) > U_DOUBLE_MAX_EXACT_INT && fDecimalQuantity != nullptr) { if (fDecimalQuantity->fitsInLong(true)) { return fDecimalQuantity->toLong(); } else { @@ -474,7 +474,7 @@ Formattable::getInt64(UErrorCode& status) const return (int64_t)fValue.fDouble; } case Formattable::kObject: - if (fValue.fObject == NULL) { + if (fValue.fObject == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -504,7 +504,7 @@ Formattable::getDouble(UErrorCode& status) const case Formattable::kDouble: return fValue.fDouble; case Formattable::kObject: - if (fValue.fObject == NULL) { + if (fValue.fObject == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -522,7 +522,7 @@ Formattable::getDouble(UErrorCode& status) const const UObject* Formattable::getObject() const { - return (fType == kObject) ? fValue.fObject : NULL; + return (fType == kObject) ? fValue.fObject : nullptr; } // ------------------------------------- @@ -630,7 +630,7 @@ Formattable::getString(UnicodeString& result, UErrorCode& status) const setError(status, U_INVALID_FORMAT_ERROR); result.setToBogus(); } else { - if (fValue.fString == NULL) { + if (fValue.fString == nullptr) { setError(status, U_MEMORY_ALLOCATION_ERROR); } else { result = *fValue.fString; @@ -647,7 +647,7 @@ Formattable::getString(UErrorCode& status) const setError(status, U_INVALID_FORMAT_ERROR); return *getBogus(); } - if (fValue.fString == NULL) { + if (fValue.fString == nullptr) { setError(status, U_MEMORY_ALLOCATION_ERROR); return *getBogus(); } @@ -662,7 +662,7 @@ Formattable::getString(UErrorCode& status) setError(status, U_INVALID_FORMAT_ERROR); return *getBogus(); } - if (fValue.fString == NULL) { + if (fValue.fString == nullptr) { setError(status, U_MEMORY_ALLOCATION_ERROR); return *getBogus(); } @@ -676,7 +676,7 @@ Formattable::getArray(int32_t& count, UErrorCode& status) const if (fType != kArray) { setError(status, U_INVALID_FORMAT_ERROR); count = 0; - return NULL; + return nullptr; } count = fValue.fArrayAndCount.fCount; return fValue.fArrayAndCount.fArray; @@ -697,12 +697,12 @@ StringPiece Formattable::getDecimalNumber(UErrorCode &status) { if (U_FAILURE(status)) { return ""; } - if (fDecimalStr != NULL) { + if (fDecimalStr != nullptr) { return fDecimalStr->toStringPiece(); } CharString *decimalStr = internalGetCharString(status); - if(decimalStr == NULL) { + if(decimalStr == nullptr) { return ""; // getDecimalNumber returns "" for error cases } else { return decimalStr->toStringPiece(); @@ -710,8 +710,8 @@ StringPiece Formattable::getDecimalNumber(UErrorCode &status) { } CharString *Formattable::internalGetCharString(UErrorCode &status) { - if(fDecimalStr == NULL) { - if (fDecimalQuantity == NULL) { + if(fDecimalStr == nullptr) { + if (fDecimalQuantity == nullptr) { // No decimal number for the formattable yet. Which means the value was // set directly by the user as an int, int64 or double. If the value came // from parsing, or from the user setting a decimal number, fDecimalNum @@ -725,9 +725,9 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { } fDecimalStr = new CharString(); - if (fDecimalStr == NULL) { + if (fDecimalStr == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // Older ICUs called uprv_decNumberToString here, which is not exactly the same as // DecimalQuantity::toScientificString(). The biggest difference is that uprv_decNumberToString does @@ -775,11 +775,11 @@ Formattable::populateDecimalQuantity(number::impl::DecimalQuantity& output, UErr // --------------------------------------- void Formattable::adoptDecimalQuantity(DecimalQuantity *dq) { - if (fDecimalQuantity != NULL) { + if (fDecimalQuantity != nullptr) { delete fDecimalQuantity; } fDecimalQuantity = dq; - if (dq == NULL) { // allow adoptDigitList(NULL) to clear + if (dq == nullptr) { // allow adoptDigitList(nullptr) to clear return; } @@ -898,11 +898,11 @@ U_NAMESPACE_USE U_CAPI UFormattable* U_EXPORT2 ufmt_open(UErrorCode *status) { if( U_FAILURE(*status) ) { - return NULL; + return nullptr; } UFormattable *fmt = (new Formattable())->toUFormattable(); - if( fmt == NULL ) { + if( fmt == nullptr ) { *status = U_MEMORY_ALLOCATION_ERROR; } return fmt; @@ -958,7 +958,7 @@ ufmt_getObject(const UFormattable *fmt, UErrorCode *status) { const Formattable *obj = Formattable::fromUFormattable(fmt); const void *ret = obj->getObject(); - if( ret==NULL && + if( ret==nullptr && (obj->getType() != Formattable::kObject) && U_SUCCESS( *status )) { *status = U_INVALID_FORMAT_ERROR; @@ -975,12 +975,12 @@ ufmt_getUChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { if( U_SUCCESS(*status) ){ *status = U_INVALID_FORMAT_ERROR; } - return NULL; + return nullptr; } // This should return a valid string UnicodeString &str = obj->getString(*status); - if( U_SUCCESS(*status) && len != NULL ) { + if( U_SUCCESS(*status) && len != nullptr ) { *len = str.length(); } return str.getTerminatedBuffer(); @@ -1001,10 +1001,10 @@ ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status) { int32_t count; (void)obj->getArray(count, *status); if(U_FAILURE(*status)) { - return NULL; + return nullptr; } else if(n<0 || n>=count) { setError(*status, U_INDEX_OUTOFBOUNDS_ERROR); - return NULL; + return nullptr; } else { return (*obj)[n].toUFormattable(); // returns non-const Formattable } @@ -1020,11 +1020,11 @@ ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status) { if(U_FAILURE(*status)) { return ""; } - if(charString == NULL) { + if(charString == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; return ""; } else { - if(len!=NULL) { + if(len!=nullptr) { *len = charString->length(); } return charString->data(); diff --git a/icu4c/source/i18n/fphdlimp.cpp b/icu4c/source/i18n/fphdlimp.cpp index 4f6a98c2120..bfa15d8d551 100644 --- a/icu4c/source/i18n/fphdlimp.cpp +++ b/icu4c/source/i18n/fphdlimp.cpp @@ -67,7 +67,7 @@ void FieldPositionOnlyHandler::setAcceptFirstOnly(UBool acceptFirstOnly) { FieldPositionIteratorHandler::FieldPositionIteratorHandler(FieldPositionIterator* posIter, UErrorCode& _status) - : iter(posIter), vec(NULL), status(_status), fCategory(UFIELD_CATEGORY_UNDEFINED) { + : iter(posIter), vec(nullptr), status(_status), fCategory(UFIELD_CATEGORY_UNDEFINED) { if (iter && U_SUCCESS(status)) { vec = new UVector32(status); } @@ -85,7 +85,7 @@ FieldPositionIteratorHandler::~FieldPositionIteratorHandler() { iter->setData(vec, status); } // if iter is null, we never allocated vec, so no need to free it - vec = NULL; + vec = nullptr; } void diff --git a/icu4c/source/i18n/fphdlimp.h b/icu4c/source/i18n/fphdlimp.h index 4fb0c7b6fe6..20eccca5882 100644 --- a/icu4c/source/i18n/fphdlimp.h +++ b/icu4c/source/i18n/fphdlimp.h @@ -65,7 +65,7 @@ class FieldPositionOnlyHandler : public FieldPositionHandler { // exported as U_I18N_API for tests class U_I18N_API FieldPositionIteratorHandler : public FieldPositionHandler { - FieldPositionIterator* iter; // can be NULL + FieldPositionIterator* iter; // can be nullptr UVector32* vec; UErrorCode status; UFieldCategory fCategory; diff --git a/icu4c/source/i18n/fpositer.cpp b/icu4c/source/i18n/fpositer.cpp index 64bec990e3a..68f1edcc174 100644 --- a/icu4c/source/i18n/fpositer.cpp +++ b/icu4c/source/i18n/fpositer.cpp @@ -22,16 +22,16 @@ U_NAMESPACE_BEGIN FieldPositionIterator::~FieldPositionIterator() { delete data; - data = NULL; + data = nullptr; pos = -1; } FieldPositionIterator::FieldPositionIterator() - : data(NULL), pos(-1) { + : data(nullptr), pos(-1) { } FieldPositionIterator::FieldPositionIterator(const FieldPositionIterator &rhs) - : UObject(rhs), data(NULL), pos(rhs.pos) { + : UObject(rhs), data(nullptr), pos(rhs.pos) { if (rhs.data) { UErrorCode status = U_ZERO_ERROR; @@ -39,7 +39,7 @@ FieldPositionIterator::FieldPositionIterator(const FieldPositionIterator &rhs) data->assign(*rhs.data, status); if (status != U_ZERO_ERROR) { delete data; - data = NULL; + data = nullptr; pos = -1; } } @@ -53,7 +53,7 @@ bool FieldPositionIterator::operator==(const FieldPositionIterator &rhs) const { return false; } if (!data) { - return rhs.data == NULL; + return rhs.data == nullptr; } return rhs.data ? data->operator==(*rhs.data) : false; } @@ -64,7 +64,7 @@ void FieldPositionIterator::setData(UVector32 *adopt, UErrorCode& status) { if (adopt) { if (adopt->size() == 0) { delete adopt; - adopt = NULL; + adopt = nullptr; } else if ((adopt->size() % 4) != 0) { status = U_ILLEGAL_ARGUMENT_ERROR; } else { @@ -87,7 +87,7 @@ void FieldPositionIterator::setData(UVector32 *adopt, UErrorCode& status) { delete data; data = adopt; - pos = adopt == NULL ? -1 : 0; + pos = adopt == nullptr ? -1 : 0; } UBool FieldPositionIterator::next(FieldPosition& fp) { diff --git a/icu4c/source/i18n/gender.cpp b/icu4c/source/i18n/gender.cpp index ef64d178467..fada578e07b 100644 --- a/icu4c/source/i18n/gender.cpp +++ b/icu4c/source/i18n/gender.cpp @@ -31,12 +31,12 @@ #include "umutex.h" #include "uhash.h" -static UHashtable* gGenderInfoCache = NULL; +static UHashtable* gGenderInfoCache = nullptr; static const char* gNeutralStr = "neutral"; static const char* gMailTaintsStr = "maleTaints"; static const char* gMixedNeutralStr = "mixedNeutral"; -static icu::GenderInfo* gObjs = NULL; +static icu::GenderInfo* gObjs = nullptr; static icu::UInitOnce gGenderInitOnce {}; enum GenderStyle { @@ -49,9 +49,9 @@ enum GenderStyle { U_CDECL_BEGIN static UBool U_CALLCONV gender_cleanup(void) { - if (gGenderInfoCache != NULL) { + if (gGenderInfoCache != nullptr) { uhash_close(gGenderInfoCache); - gGenderInfoCache = NULL; + gGenderInfoCache = nullptr; delete [] gObjs; } gGenderInitOnce.reset(); @@ -64,19 +64,19 @@ U_NAMESPACE_BEGIN void U_CALLCONV GenderInfo_initCache(UErrorCode &status) { ucln_i18n_registerCleanup(UCLN_I18N_GENDERINFO, gender_cleanup); - U_ASSERT(gGenderInfoCache == NULL); + U_ASSERT(gGenderInfoCache == nullptr); if (U_FAILURE(status)) { return; } gObjs = new GenderInfo[GENDER_STYLE_LENGTH]; - if (gObjs == NULL) { + if (gObjs == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } for (int i = 0; i < GENDER_STYLE_LENGTH; i++) { gObjs[i]._style = i; } - gGenderInfoCache = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &status); + gGenderInfoCache = uhash_open(uhash_hashChars, uhash_compareChars, nullptr, &status); if (U_FAILURE(status)) { delete [] gObjs; return; @@ -95,11 +95,11 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat // Make sure our cache exists. umtx_initOnce(gGenderInitOnce, &GenderInfo_initCache, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } static UMutex gGenderMetaLock; - const GenderInfo* result = NULL; + const GenderInfo* result = nullptr; const char* key = locale.getName(); { Mutex lock(&gGenderMetaLock); @@ -112,7 +112,7 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat // On cache miss, try to create GenderInfo from CLDR data result = loadInstance(locale, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } // Try to put our GenderInfo object in cache. If there is a race condition, @@ -125,7 +125,7 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat } else { uhash_put(gGenderInfoCache, uprv_strdup(key), (void*) result, &status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } } } @@ -134,30 +134,30 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat const GenderInfo* GenderInfo::loadInstance(const Locale& locale, UErrorCode& status) { LocalUResourceBundlePointer rb( - ures_openDirect(NULL, "genderList", &status)); + ures_openDirect(nullptr, "genderList", &status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } - LocalUResourceBundlePointer locRes(ures_getByKey(rb.getAlias(), "genderList", NULL, &status)); + LocalUResourceBundlePointer locRes(ures_getByKey(rb.getAlias(), "genderList", nullptr, &status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } int32_t resLen = 0; const char* curLocaleName = locale.getName(); UErrorCode key_status = U_ZERO_ERROR; const UChar* s = ures_getStringByKey(locRes.getAlias(), curLocaleName, &resLen, &key_status); - if (s == NULL) { + if (s == nullptr) { key_status = U_ZERO_ERROR; char parentLocaleName[ULOC_FULLNAME_CAPACITY]; uprv_strcpy(parentLocaleName, curLocaleName); - while (s == NULL && uloc_getParent(parentLocaleName, parentLocaleName, ULOC_FULLNAME_CAPACITY, &key_status) > 0) { + while (s == nullptr && uloc_getParent(parentLocaleName, parentLocaleName, ULOC_FULLNAME_CAPACITY, &key_status) > 0) { key_status = U_ZERO_ERROR; resLen = 0; s = ures_getStringByKey(locRes.getAlias(), parentLocaleName, &resLen, &key_status); key_status = U_ZERO_ERROR; } } - if (s == NULL) { + if (s == nullptr) { return &gObjs[NEUTRAL]; } char type_str[256] = ""; diff --git a/icu4c/source/i18n/gregocal.cpp b/icu4c/source/i18n/gregocal.cpp index 481f410bad7..d536a856ad5 100644 --- a/icu4c/source/i18n/gregocal.cpp +++ b/icu4c/source/i18n/gregocal.cpp @@ -350,7 +350,7 @@ GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status) // Normalize the year so BC values are represented as 0 and negative // values. GregorianCalendar *cal = new GregorianCalendar(getTimeZone(), status); - /* test for NULL */ + /* test for nullptr */ if (cal == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; diff --git a/icu4c/source/i18n/hebrwcal.cpp b/icu4c/source/i18n/hebrwcal.cpp index a7027e07a41..c8b0476143b 100644 --- a/icu4c/source/i18n/hebrwcal.cpp +++ b/icu4c/source/i18n/hebrwcal.cpp @@ -136,12 +136,12 @@ static const int16_t LEAP_MONTH_START[][3] = { { 383, 384, 385 }, // Elul }; -static icu::CalendarCache *gCache = NULL; +static icu::CalendarCache *gCache = nullptr; U_CDECL_BEGIN static UBool calendar_hebrew_cleanup(void) { delete gCache; - gCache = NULL; + gCache = nullptr; return true; } U_CDECL_END diff --git a/icu4c/source/i18n/inputext.cpp b/icu4c/source/i18n/inputext.cpp index 7c78ad249a4..bce9862c0fe 100644 --- a/icu4c/source/i18n/inputext.cpp +++ b/icu4c/source/i18n/inputext.cpp @@ -34,7 +34,7 @@ InputText::InputText(UErrorCode &status) fRawInput(0), fRawLength(0) { - if (fInputBytes == NULL || fByteStats == NULL) { + if (fInputBytes == nullptr || fByteStats == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } } @@ -70,7 +70,7 @@ void InputText::setDeclaredEncoding(const char* encoding, int32_t len) UBool InputText::isSet() const { - return fRawInput != NULL; + return fRawInput != nullptr; } /** diff --git a/icu4c/source/i18n/islamcal.cpp b/icu4c/source/i18n/islamcal.cpp index 7b4bf96c041..09e26637e08 100644 --- a/icu4c/source/i18n/islamcal.cpp +++ b/icu4c/source/i18n/islamcal.cpp @@ -54,18 +54,18 @@ static void debug_islamcal_msg(const char *pat, ...) // --- The cache -- // cache of months -static icu::CalendarCache *gMonthCache = NULL; -static icu::CalendarAstronomer *gIslamicCalendarAstro = NULL; +static icu::CalendarCache *gMonthCache = nullptr; +static icu::CalendarAstronomer *gIslamicCalendarAstro = nullptr; U_CDECL_BEGIN static UBool calendar_islamic_cleanup(void) { if (gMonthCache) { delete gMonthCache; - gMonthCache = NULL; + gMonthCache = nullptr; } if (gIslamicCalendarAstro) { delete gIslamicCalendarAstro; - gIslamicCalendarAstro = NULL; + gIslamicCalendarAstro = nullptr; } return true; } @@ -405,9 +405,9 @@ double IslamicCalendar::moonAge(UDate time, UErrorCode &status) static UMutex astroLock; // pod bay door lock umtx_lock(&astroLock); - if(gIslamicCalendarAstro == NULL) { + if(gIslamicCalendarAstro == nullptr) { gIslamicCalendarAstro = new CalendarAstronomer(); - if (gIslamicCalendarAstro == NULL) { + if (gIslamicCalendarAstro == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return age; } diff --git a/icu4c/source/i18n/japancal.cpp b/icu4c/source/i18n/japancal.cpp index 0af7e8bb6f4..8ce3172ec4c 100644 --- a/icu4c/source/i18n/japancal.cpp +++ b/icu4c/source/i18n/japancal.cpp @@ -84,7 +84,7 @@ UBool JapaneseCalendar::enableTentativeEra() { } #else char *envVarVal = getenv(TENTATIVE_ERA_VAR_NAME); - if (envVarVal != NULL && uprv_stricmp(envVarVal, "true") == 0) { + if (envVarVal != nullptr && uprv_stricmp(envVarVal, "true") == 0) { includeTentativeEra = true; } #endif diff --git a/icu4c/source/i18n/measfmt.cpp b/icu4c/source/i18n/measfmt.cpp index d2b4e7018dc..98320d3f2b0 100644 --- a/icu4c/source/i18n/measfmt.cpp +++ b/icu4c/source/i18n/measfmt.cpp @@ -204,7 +204,7 @@ static UnicodeString loadNumericDateFormatterPattern( ures_getByKeyWithFallback( resource, chs.data(), - NULL, + nullptr, &status)); if (U_FAILURE(status)) { return result; @@ -226,7 +226,7 @@ static NumericDateFormatters *loadNumericDateFormatters( const UResourceBundle *resource, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } NumericDateFormatters *result = new NumericDateFormatters( loadNumericDateFormatterPattern(resource, "hm", status), @@ -234,7 +234,7 @@ static NumericDateFormatters *loadNumericDateFormatters( loadNumericDateFormatterPattern(resource, "hms", status)); if (U_FAILURE(status)) { delete result; - return NULL; + return nullptr; } return result; } @@ -248,12 +248,12 @@ const MeasureFormatCacheData *LocaleCacheKey::createObje UNUM_CURRENCY_PLURAL, UNUM_CURRENCY_ISO, UNUM_CURRENCY}; LocalPointer result(new MeasureFormatCacheData(), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } result->adoptNumericDateFormatters(loadNumericDateFormatters( unitsBundle.getAlias(), status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } for (int32_t i = 0; i < WIDTH_INDEX_COUNT; ++i) { @@ -266,17 +266,17 @@ const MeasureFormatCacheData *LocaleCacheKey::createObje status = localStatus; } if (U_FAILURE(status)) { - return NULL; + return nullptr; } } NumberFormat *inf = NumberFormat::createInstance( localeId, UNUM_DECIMAL, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } inf->setMaximumFractionDigits(0); DecimalFormat *decfmt = dynamic_cast(inf); - if (decfmt != NULL) { + if (decfmt != nullptr) { decfmt->setRoundingMode(DecimalFormat::kRoundDown); } result->adoptIntegerFormat(inf); @@ -352,12 +352,12 @@ static int32_t toHMS( MeasureFormat::MeasureFormat( const Locale &locale, UMeasureFormatWidth w, UErrorCode &status) - : cache(NULL), - numberFormat(NULL), - pluralRules(NULL), + : cache(nullptr), + numberFormat(nullptr), + pluralRules(nullptr), fWidth(w), - listFormatter(NULL) { - initMeasureFormat(locale, w, NULL, status); + listFormatter(nullptr) { + initMeasureFormat(locale, w, nullptr, status); } MeasureFormat::MeasureFormat( @@ -365,11 +365,11 @@ MeasureFormat::MeasureFormat( UMeasureFormatWidth w, NumberFormat *nfToAdopt, UErrorCode &status) - : cache(NULL), - numberFormat(NULL), - pluralRules(NULL), + : cache(nullptr), + numberFormat(nullptr), + pluralRules(nullptr), fWidth(w), - listFormatter(NULL) { + listFormatter(nullptr) { initMeasureFormat(locale, w, nfToAdopt, status); } @@ -379,11 +379,11 @@ MeasureFormat::MeasureFormat(const MeasureFormat &other) : numberFormat(other.numberFormat), pluralRules(other.pluralRules), fWidth(other.fWidth), - listFormatter(NULL) { + listFormatter(nullptr) { cache->addRef(); numberFormat->addRef(); pluralRules->addRef(); - if (other.listFormatter != NULL) { + if (other.listFormatter != nullptr) { listFormatter = new ListFormatter(*other.listFormatter); } } @@ -398,30 +398,30 @@ MeasureFormat &MeasureFormat::operator=(const MeasureFormat &other) { SharedObject::copyPtr(other.pluralRules, pluralRules); fWidth = other.fWidth; delete listFormatter; - if (other.listFormatter != NULL) { + if (other.listFormatter != nullptr) { listFormatter = new ListFormatter(*other.listFormatter); } else { - listFormatter = NULL; + listFormatter = nullptr; } return *this; } MeasureFormat::MeasureFormat() : - cache(NULL), - numberFormat(NULL), - pluralRules(NULL), + cache(nullptr), + numberFormat(nullptr), + pluralRules(nullptr), fWidth(UMEASFMT_WIDTH_SHORT), - listFormatter(NULL) { + listFormatter(nullptr) { } MeasureFormat::~MeasureFormat() { - if (cache != NULL) { + if (cache != nullptr) { cache->removeRef(); } - if (numberFormat != NULL) { + if (numberFormat != nullptr) { numberFormat->removeRef(); } - if (pluralRules != NULL) { + if (pluralRules != nullptr) { pluralRules->removeRef(); } delete listFormatter; @@ -476,7 +476,7 @@ UnicodeString &MeasureFormat::format( if (obj.getType() == Formattable::kObject) { const UObject* formatObj = obj.getObject(); const Measure* amount = dynamic_cast(formatObj); - if (amount != NULL) { + if (amount != nullptr) { return formatMeasure( *amount, **numberFormat, appendTo, pos, status); } @@ -547,7 +547,7 @@ UnicodeString &MeasureFormat::formatMeasures( measures, measureCount, appendTo, pos, status); } UnicodeString *results = new UnicodeString[measureCount]; - if (results == NULL) { + if (results == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return appendTo; } @@ -635,7 +635,7 @@ void MeasureFormat::adoptNumberFormat( return; } SharedNumberFormat *shared = new SharedNumberFormat(nf.getAlias()); - if (shared == NULL) { + if (shared == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -647,7 +647,7 @@ UBool MeasureFormat::setMeasureFormatLocale(const Locale &locale, UErrorCode &st if (U_FAILURE(status) || locale == getLocale(status)) { return false; } - initMeasureFormat(locale, fWidth, NULL, status); + initMeasureFormat(locale, fWidth, nullptr, status); return U_SUCCESS(status); } diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index f53137c48cd..ed7bf809532 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -2277,13 +2277,13 @@ StringEnumeration* MeasureUnit::getAvailableTypes(UErrorCode &errorCode) { gTypes, UPRV_LENGTHOF(gTypes), &errorCode); if (U_FAILURE(errorCode)) { uenum_close(uenum); - return NULL; + return nullptr; } StringEnumeration *result = new UStringEnumeration(uenum); - if (result == NULL) { + if (result == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; uenum_close(uenum); - return NULL; + return nullptr; } return result; } @@ -2309,10 +2309,10 @@ bool MeasureUnit::findBySubType(StringPiece subType, MeasureUnit* output) { MeasureUnit *MeasureUnit::create(int typeId, int subTypeId, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } MeasureUnit *result = new MeasureUnit(typeId, subTypeId); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } return result; diff --git a/icu4c/source/i18n/measunit_extra.cpp b/icu4c/source/i18n/measunit_extra.cpp index 3d49d1d610a..cfd9c759856 100644 --- a/icu4c/source/i18n/measunit_extra.cpp +++ b/icu4c/source/i18n/measunit_extra.cpp @@ -148,7 +148,7 @@ const struct UnitPrefixStrings { * int32_t *unitCategories[ARR_SIZE]; * SimpleUnitIdentifiersSink identifierSink(gSerializedUnitCategoriesTrie, unitIdentifiers, * unitCategories, ARR_SIZE, b, kTrieValueOffset); - * LocalUResourceBundlePointer unitsBundle(ures_openDirect(NULL, "units", &status)); + * LocalUResourceBundlePointer unitsBundle(ures_openDirect(nullptr, "units", &status)); * ures_getAllItemsWithFallback(unitsBundle.getAlias(), "convertUnits", identifierSink, status); */ class SimpleUnitIdentifiersSink : public icu::ResourceSink { diff --git a/icu4c/source/i18n/measure.cpp b/icu4c/source/i18n/measure.cpp index b9c47fd4015..cdbd995034a 100644 --- a/icu4c/source/i18n/measure.cpp +++ b/icu4c/source/i18n/measure.cpp @@ -69,8 +69,8 @@ bool Measure::operator==(const UObject& other) const { } const Measure &m = static_cast(other); return number == m.number && - ((unit == NULL) == (m.unit == NULL)) && - (unit == NULL || *unit == *m.unit); + ((unit == nullptr) == (m.unit == nullptr)) && + (unit == nullptr || *unit == *m.unit); } U_NAMESPACE_END diff --git a/icu4c/source/i18n/msgfmt.cpp b/icu4c/source/i18n/msgfmt.cpp index 29476f328f8..95395e7dabb 100644 --- a/icu4c/source/i18n/msgfmt.cpp +++ b/icu4c/source/i18n/msgfmt.cpp @@ -90,7 +90,7 @@ static const UChar * const TYPE_IDS[] = { ID_SPELLOUT, ID_ORDINAL, ID_DURATION, - NULL, + nullptr, }; static const UChar ID_EMPTY[] = { @@ -112,7 +112,7 @@ static const UChar * const NUMBER_STYLE_IDS[] = { ID_CURRENCY, ID_PERCENT, ID_INTEGER, - NULL, + nullptr, }; static const UChar ID_SHORT[] = { @@ -135,7 +135,7 @@ static const UChar * const DATE_STYLE_IDS[] = { ID_MEDIUM, ID_LONG, ID_FULL, - NULL, + nullptr, }; static const icu::DateFormat::EStyle DATE_STYLES[] = { @@ -234,16 +234,16 @@ MessageFormat::MessageFormat(const UnicodeString& pattern, UErrorCode& success) : fLocale(Locale::getDefault()), // Uses the default locale msgPattern(success), - formatAliases(NULL), + formatAliases(nullptr), formatAliasesCapacity(0), - argTypes(NULL), + argTypes(nullptr), argTypeCount(0), argTypeCapacity(0), hasArgTypeConflicts(false), - defaultNumberFormat(NULL), - defaultDateFormat(NULL), - cachedFormatters(NULL), - customFormatArgStarts(NULL), + defaultNumberFormat(nullptr), + defaultDateFormat(nullptr), + cachedFormatters(nullptr), + customFormatArgStarts(nullptr), pluralProvider(*this, UPLURAL_TYPE_CARDINAL), ordinalProvider(*this, UPLURAL_TYPE_ORDINAL) { @@ -256,16 +256,16 @@ MessageFormat::MessageFormat(const UnicodeString& pattern, UErrorCode& success) : fLocale(newLocale), msgPattern(success), - formatAliases(NULL), + formatAliases(nullptr), formatAliasesCapacity(0), - argTypes(NULL), + argTypes(nullptr), argTypeCount(0), argTypeCapacity(0), hasArgTypeConflicts(false), - defaultNumberFormat(NULL), - defaultDateFormat(NULL), - cachedFormatters(NULL), - customFormatArgStarts(NULL), + defaultNumberFormat(nullptr), + defaultDateFormat(nullptr), + cachedFormatters(nullptr), + customFormatArgStarts(nullptr), pluralProvider(*this, UPLURAL_TYPE_CARDINAL), ordinalProvider(*this, UPLURAL_TYPE_ORDINAL) { @@ -279,16 +279,16 @@ MessageFormat::MessageFormat(const UnicodeString& pattern, UErrorCode& success) : fLocale(newLocale), msgPattern(success), - formatAliases(NULL), + formatAliases(nullptr), formatAliasesCapacity(0), - argTypes(NULL), + argTypes(nullptr), argTypeCount(0), argTypeCapacity(0), hasArgTypeConflicts(false), - defaultNumberFormat(NULL), - defaultDateFormat(NULL), - cachedFormatters(NULL), - customFormatArgStarts(NULL), + defaultNumberFormat(nullptr), + defaultDateFormat(nullptr), + cachedFormatters(nullptr), + customFormatArgStarts(nullptr), pluralProvider(*this, UPLURAL_TYPE_CARDINAL), ordinalProvider(*this, UPLURAL_TYPE_ORDINAL) { @@ -301,20 +301,20 @@ MessageFormat::MessageFormat(const MessageFormat& that) Format(that), fLocale(that.fLocale), msgPattern(that.msgPattern), - formatAliases(NULL), + formatAliases(nullptr), formatAliasesCapacity(0), - argTypes(NULL), + argTypes(nullptr), argTypeCount(0), argTypeCapacity(0), hasArgTypeConflicts(that.hasArgTypeConflicts), - defaultNumberFormat(NULL), - defaultDateFormat(NULL), - cachedFormatters(NULL), - customFormatArgStarts(NULL), + defaultNumberFormat(nullptr), + defaultDateFormat(nullptr), + cachedFormatters(nullptr), + customFormatArgStarts(nullptr), pluralProvider(*this, UPLURAL_TYPE_CARDINAL), ordinalProvider(*this, UPLURAL_TYPE_ORDINAL) { - // This will take care of creating the hash tables (since they are NULL). + // This will take care of creating the hash tables (since they are nullptr). UErrorCode ec = U_ZERO_ERROR; copyObjects(that, ec); if (U_FAILURE(ec)) { @@ -340,7 +340,7 @@ MessageFormat::~MessageFormat() * Allocate argTypes[] to at least the given capacity and return * true if successful. If not, leave argTypes[] unchanged. * - * If argTypes is NULL, allocate it. If it is not NULL, enlarge it + * If argTypes is nullptr, allocate it. If it is not nullptr, enlarge it * if necessary to be at least as large as specified. */ UBool MessageFormat::allocateArgTypes(int32_t capacity, UErrorCode& status) { @@ -357,7 +357,7 @@ UBool MessageFormat::allocateArgTypes(int32_t capacity, UErrorCode& status) { } Formattable::Type* a = (Formattable::Type*) uprv_realloc(argTypes, sizeof(*argTypes) * capacity); - if (a == NULL) { + if (a == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return false; } @@ -404,10 +404,10 @@ MessageFormat::operator==(const Format& rhs) const } // Compare hashtables. - if ((customFormatArgStarts == NULL) != (that.customFormatArgStarts == NULL)) { + if ((customFormatArgStarts == nullptr) != (that.customFormatArgStarts == nullptr)) { return false; } - if (customFormatArgStarts == NULL) { + if (customFormatArgStarts == nullptr) { return true; } @@ -450,9 +450,9 @@ MessageFormat::setLocale(const Locale& theLocale) { if (fLocale != theLocale) { delete defaultNumberFormat; - defaultNumberFormat = NULL; + defaultNumberFormat = nullptr; delete defaultDateFormat; - defaultDateFormat = NULL; + defaultDateFormat = nullptr; fLocale = theLocale; setLocaleIDs(fLocale.getName(), fLocale.getName()); pluralProvider.reset(); @@ -500,9 +500,9 @@ MessageFormat::applyPattern(const UnicodeString& pattern, void MessageFormat::resetPattern() { msgPattern.clear(); uhash_close(cachedFormatters); - cachedFormatters = NULL; + cachedFormatters = nullptr; uhash_close(customFormatArgStarts); - customFormatArgStarts = NULL; + customFormatArgStarts = nullptr; argTypeCount = 0; hasArgTypeConflicts = false; } @@ -523,7 +523,7 @@ MessageFormat::applyPattern(const UnicodeString& pattern, UnicodeString& MessageFormat::toPattern(UnicodeString& appendTo) const { - if ((customFormatArgStarts != NULL && 0 != uhash_count(customFormatArgStarts)) || + if ((customFormatArgStarts != nullptr && 0 != uhash_count(customFormatArgStarts)) || 0 == msgPattern.countParts() ) { appendTo.setToBogus(); @@ -554,7 +554,7 @@ void MessageFormat::setArgStartFormat(int32_t argStart, delete formatter; return; } - if (cachedFormatters == NULL) { + if (cachedFormatters == nullptr) { cachedFormatters=uhash_open(uhash_hashLong, uhash_compareLong, equalFormatsForHash, &status); if (U_FAILURE(status)) { @@ -563,7 +563,7 @@ void MessageFormat::setArgStartFormat(int32_t argStart, } uhash_setValueDeleter(cachedFormatters, uprv_deleteUObject); } - if (formatter == NULL) { + if (formatter == nullptr) { formatter = new DummyFormat(); } uhash_iput(cachedFormatters, argStart, formatter, &status); @@ -583,23 +583,23 @@ void MessageFormat::setCustomArgStartFormat(int32_t argStart, Format* formatter, UErrorCode& status) { setArgStartFormat(argStart, formatter, status); - if (customFormatArgStarts == NULL) { + if (customFormatArgStarts == nullptr) { customFormatArgStarts=uhash_open(uhash_hashLong, uhash_compareLong, - NULL, &status); + nullptr, &status); } uhash_iputi(customFormatArgStarts, argStart, 1, &status); } Format* MessageFormat::getCachedFormatter(int32_t argumentNumber) const { - if (cachedFormatters == NULL) { - return NULL; + if (cachedFormatters == nullptr) { + return nullptr; } void* ptr = uhash_iget(cachedFormatters, argumentNumber); - if (ptr != NULL && dynamic_cast((Format*)ptr) == NULL) { + if (ptr != nullptr && dynamic_cast((Format*)ptr) == nullptr) { return (Format*) ptr; } else { - // Not cached, or a DummyFormat representing setFormat(NULL). - return NULL; + // Not cached, or a DummyFormat representing setFormat(nullptr). + return nullptr; } } @@ -609,14 +609,14 @@ Format* MessageFormat::getCachedFormatter(int32_t argumentNumber) const { void MessageFormat::adoptFormats(Format** newFormats, int32_t count) { - if (newFormats == NULL || count < 0) { + if (newFormats == nullptr || count < 0) { return; } // Throw away any cached formatters. - if (cachedFormatters != NULL) { + if (cachedFormatters != nullptr) { uhash_removeAll(cachedFormatters); } - if (customFormatArgStarts != NULL) { + if (customFormatArgStarts != nullptr) { uhash_removeAll(customFormatArgStarts); } @@ -642,14 +642,14 @@ MessageFormat::adoptFormats(Format** newFormats, void MessageFormat::setFormats(const Format** newFormats, int32_t count) { - if (newFormats == NULL || count < 0) { + if (newFormats == nullptr || count < 0) { return; } // Throw away any cached formatters. - if (cachedFormatters != NULL) { + if (cachedFormatters != nullptr) { uhash_removeAll(cachedFormatters); } - if (customFormatArgStarts != NULL) { + if (customFormatArgStarts != nullptr) { uhash_removeAll(customFormatArgStarts); } @@ -657,10 +657,10 @@ MessageFormat::setFormats(const Format** newFormats, int32_t formatNumber = 0; for (int32_t partIndex = 0; formatNumber < count && U_SUCCESS(status) && (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) { - Format* newFormat = NULL; - if (newFormats[formatNumber] != NULL) { + Format* newFormat = nullptr; + if (newFormats[formatNumber] != nullptr) { newFormat = newFormats[formatNumber]->clone(); - if (newFormat == NULL) { + if (newFormat == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } } @@ -715,11 +715,11 @@ MessageFormat::adoptFormat(const UnicodeString& formatName, Format* f; if (p.isValid()) { f = p.orphan(); - } else if (formatToAdopt == NULL) { - f = NULL; + } else if (formatToAdopt == nullptr) { + f = nullptr; } else { f = formatToAdopt->clone(); - if (f == NULL) { + if (f == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -757,19 +757,19 @@ MessageFormat::setFormat(int32_t n, const Format& newFormat) { // Do nothing if the variable is not less than the array count. Format * MessageFormat::getFormat(const UnicodeString& formatName, UErrorCode& status) { - if (U_FAILURE(status) || cachedFormatters == NULL) return NULL; + if (U_FAILURE(status) || cachedFormatters == nullptr) return nullptr; int32_t argNumber = MessagePattern::validateArgumentName(formatName); if (argNumber < UMSGPAT_ARG_NAME_NOT_NUMBER) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) { if (argNameMatches(partIndex + 1, formatName, argNumber)) { return getCachedFormatter(partIndex); } } - return NULL; + return nullptr; } // ------------------------------------- @@ -791,7 +791,7 @@ MessageFormat::setFormat(const UnicodeString& formatName, ) { if (argNameMatches(partIndex + 1, formatName, argNumber)) { Format* new_format = newFormat.clone(); - if (new_format == NULL) { + if (new_format == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -852,7 +852,7 @@ UnicodeString MessageFormat::getArgName(int32_t partIndex) { StringEnumeration* MessageFormat::getFormatNames(UErrorCode& status) { - if (U_FAILURE(status)) return NULL; + if (U_FAILURE(status)) return nullptr; LocalPointer formatNames(new UVector(status), status); if (U_FAILURE(status)) { @@ -882,7 +882,7 @@ MessageFormat::format(const Formattable* source, FieldPosition& ignore, UErrorCode& success) const { - return format(source, NULL, cnt, appendTo, &ignore, success); + return format(source, nullptr, cnt, appendTo, &ignore, success); } // ------------------------------------- @@ -898,7 +898,7 @@ MessageFormat::format( const UnicodeString& pattern, UErrorCode& success) { MessageFormat temp(pattern, success); - return temp.format(arguments, NULL, cnt, appendTo, NULL, success); + return temp.format(arguments, nullptr, cnt, appendTo, nullptr, success); } // ------------------------------------- @@ -920,7 +920,7 @@ MessageFormat::format(const Formattable& source, } int32_t cnt; const Formattable* tmpPtr = source.getArray(cnt); - return format(tmpPtr, NULL, cnt, appendTo, &ignore, success); + return format(tmpPtr, nullptr, cnt, appendTo, &ignore, success); } UnicodeString& @@ -929,7 +929,7 @@ MessageFormat::format(const UnicodeString* argumentNames, int32_t count, UnicodeString& appendTo, UErrorCode& success) const { - return format(arguments, argumentNames, count, appendTo, NULL, success); + return format(arguments, argumentNames, count, appendTo, nullptr, success); } // Does linear search to find the match for an ArgName. @@ -941,7 +941,7 @@ const Formattable* MessageFormat::getArgFromListByName(const Formattable* argume return arguments + i; } } - return NULL; + return nullptr; } @@ -958,7 +958,7 @@ MessageFormat::format(const Formattable* arguments, UnicodeStringAppendable usapp(appendTo); AppendableWrapper app(usapp); - format(0, NULL, arguments, argumentNames, cnt, app, pos, status); + format(0, nullptr, arguments, argumentNames, cnt, app, pos, status); return appendTo; } @@ -973,7 +973,7 @@ public: PluralSelectorContext(int32_t start, const UnicodeString &name, const Formattable &num, double off, UErrorCode &errorCode) : startIndex(start), argName(name), offset(off), - numberArgIndex(-1), formatter(NULL), forReplaceNumber(false) { + numberArgIndex(-1), formatter(nullptr), forReplaceNumber(false) { // number needs to be set even when select() is not called. // Keep it as a Number/Formattable: // For format() methods, and to preserve information (e.g., BigDecimal). @@ -1002,8 +1002,8 @@ public: } // namespace -// if argumentNames is NULL, this means arguments is a numeric array. -// arguments can not be NULL. +// if argumentNames is nullptr, this means arguments is a numeric array. +// arguments can not be nullptr. // We use const void *plNumber rather than const PluralSelectorContext *pluralNumber // so that we need not declare the PluralSelectorContext in the public header file. void MessageFormat::format(int32_t msgStart, const void *plNumber, @@ -1050,29 +1050,29 @@ void MessageFormat::format(int32_t msgStart, const void *plNumber, const Formattable* arg; UBool noArg = false; UnicodeString argName = msgPattern.getSubstring(*part); - if (argumentNames == NULL) { + if (argumentNames == nullptr) { int32_t argNumber = part->getValue(); // ARG_NUMBER if (0 <= argNumber && argNumber < cnt) { arg = arguments + argNumber; } else { - arg = NULL; + arg = nullptr; noArg = true; } } else { arg = getArgFromListByName(arguments, argumentNames, cnt, argName); - if (arg == NULL) { + if (arg == nullptr) { noArg = true; } } ++i; int32_t prevDestLength = appendTo.length(); - const Format* formatter = NULL; + const Format* formatter = nullptr; if (noArg) { appendTo.append( UnicodeString(LEFT_CURLY_BRACE).append(argName).append(RIGHT_CURLY_BRACE)); - } else if (arg == NULL) { + } else if (arg == nullptr) { appendTo.append(NULL_STRING, 4); - } else if(plNumber!=NULL && + } else if(plNumber!=nullptr && static_cast(plNumber)->numberArgIndex==(i-2)) { const PluralSelectorContext &pluralNumber = *static_cast(plNumber); @@ -1099,7 +1099,7 @@ void MessageFormat::format(int32_t msgStart, const void *plNumber, (subMsgString.indexOf(SINGLE_QUOTE) >= 0 && !MessageImpl::jdkAposMode(msgPattern)) ) { MessageFormat subMsgFormat(subMsgString, fLocale, success); - subMsgFormat.format(0, NULL, arguments, argumentNames, cnt, appendTo, ignore, success); + subMsgFormat.format(0, nullptr, arguments, argumentNames, cnt, appendTo, ignore, success); } else { appendTo.append(subMsgString); } @@ -1107,7 +1107,7 @@ void MessageFormat::format(int32_t msgStart, const void *plNumber, appendTo.formatAndAppend(formatter, *arg, success); } } else if (argType == UMSGPAT_ARG_TYPE_NONE || (cachedFormatters && uhash_iget(cachedFormatters, i - 2))) { - // We arrive here if getCachedFormatter returned NULL, but there was actually an element in the hash table. + // We arrive here if getCachedFormatter returned nullptr, but there was actually an element in the hash table. // This can only happen if the hash table contained a DummyFormat, so the if statement above is a check // for the hash table containing DummyFormat. if (arg->isNumeric()) { @@ -1128,7 +1128,7 @@ void MessageFormat::format(int32_t msgStart, const void *plNumber, // because only this one converts non-double numeric types to double. const double number = arg->getDouble(success); int32_t subMsgStart = ChoiceFormat::findSubMessage(msgPattern, i, number); - formatComplexSubMessage(subMsgStart, NULL, arguments, argumentNames, + formatComplexSubMessage(subMsgStart, nullptr, arguments, argumentNames, cnt, appendTo, success); } else if (UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType)) { if (!arg->isNumeric()) { @@ -1147,7 +1147,7 @@ void MessageFormat::format(int32_t msgStart, const void *plNumber, cnt, appendTo, success); } else if (argType == UMSGPAT_ARG_TYPE_SELECT) { int32_t subMsgStart = SelectFormat::findSubMessage(msgPattern, i, arg->getString(success), success); - formatComplexSubMessage(subMsgStart, NULL, arguments, argumentNames, + formatComplexSubMessage(subMsgStart, nullptr, arguments, argumentNames, cnt, appendTo, success); } else { // This should never happen. @@ -1173,7 +1173,7 @@ void MessageFormat::formatComplexSubMessage(int32_t msgStart, } if (!MessageImpl::jdkAposMode(msgPattern)) { - format(msgStart, plNumber, arguments, argumentNames, cnt, appendTo, NULL, success); + format(msgStart, plNumber, arguments, argumentNames, cnt, appendTo, nullptr, success); return; } @@ -1218,8 +1218,8 @@ void MessageFormat::formatComplexSubMessage(int32_t msgStart, if (sb.indexOf(LEFT_CURLY_BRACE) >= 0) { UnicodeString emptyPattern; // gcc 3.3.3 fails with "UnicodeString()" as the first parameter. MessageFormat subMsgFormat(emptyPattern, fLocale, success); - subMsgFormat.applyPattern(sb, UMSGPAT_APOS_DOUBLE_REQUIRED, NULL, success); - subMsgFormat.format(0, NULL, arguments, argumentNames, cnt, appendTo, NULL, success); + subMsgFormat.applyPattern(sb, UMSGPAT_APOS_DOUBLE_REQUIRED, nullptr, success); + subMsgFormat.format(0, nullptr, arguments, argumentNames, cnt, appendTo, nullptr, success); } else { appendTo.append(sb); } @@ -1248,12 +1248,12 @@ UnicodeString MessageFormat::getLiteralStringUntilNextArgument(int32_t from) con FieldPosition* MessageFormat::updateMetaData(AppendableWrapper& /*dest*/, int32_t /*prevLength*/, FieldPosition* /*fp*/, const Formattable* /*argId*/) const { // Unlike in Java, there are no field attributes defined for MessageFormat. Do nothing. - return NULL; + return nullptr; /* - if (fp != NULL && Field.ARGUMENT.equals(fp.getFieldAttribute())) { + if (fp != nullptr && Field.ARGUMENT.equals(fp.getFieldAttribute())) { fp->setBeginIndex(prevLength); fp->setEndIndex(dest.get_length()); - return NULL; + return nullptr; } return fp; */ @@ -1325,14 +1325,14 @@ void MessageFormat::copyObjects(const MessageFormat& that, UErrorCode& ec) { } uprv_memcpy(argTypes, that.argTypes, argTypeCount * sizeof(argTypes[0])); } - if (cachedFormatters != NULL) { + if (cachedFormatters != nullptr) { uhash_removeAll(cachedFormatters); } - if (customFormatArgStarts != NULL) { + if (customFormatArgStarts != nullptr) { uhash_removeAll(customFormatArgStarts); } if (that.cachedFormatters) { - if (cachedFormatters == NULL) { + if (cachedFormatters == nullptr) { cachedFormatters=uhash_open(uhash_hashLong, uhash_compareLong, equalFormatsForHash, &ec); if (U_FAILURE(ec)) { @@ -1355,9 +1355,9 @@ void MessageFormat::copyObjects(const MessageFormat& that, UErrorCode& ec) { } } if (that.customFormatArgStarts) { - if (customFormatArgStarts == NULL) { + if (customFormatArgStarts == nullptr) { customFormatArgStarts=uhash_open(uhash_hashLong, uhash_compareLong, - NULL, &ec); + nullptr, &ec); } const int32_t count = uhash_count(that.customFormatArgStarts); int32_t pos, idx; @@ -1378,13 +1378,13 @@ MessageFormat::parse(int32_t msgStart, count = 0; if (U_FAILURE(ec)) { pos.setErrorIndex(pos.getIndex()); - return NULL; + return nullptr; } // parse() does not work with named arguments. if (msgPattern.hasNamedArguments()) { ec = U_ARGUMENT_TYPE_MISMATCH; pos.setErrorIndex(pos.getIndex()); - return NULL; + return nullptr; } LocalArray resultArray(new Formattable[argTypeCount ? argTypeCount : 1]); const UnicodeString& msgString=msgPattern.getPatternString(); @@ -1404,7 +1404,7 @@ MessageFormat::parse(int32_t msgStart, prevIndex += len; } else { pos.setErrorIndex(sourceOffset); - return NULL; // leave index as is to signal error + return nullptr; // leave index as is to signal error } if(type==UMSGPAT_PART_TYPE_MSG_LIMIT) { // Things went well! Done. @@ -1425,22 +1425,22 @@ MessageFormat::parse(int32_t msgStart, int32_t argNumber = part->getValue(); // ARG_NUMBER UnicodeString key; ++i; - const Format* formatter = NULL; + const Format* formatter = nullptr; Formattable& argResult = resultArray[argNumber]; - if(cachedFormatters!=NULL && (formatter = getCachedFormatter(i - 2))!=NULL) { + if(cachedFormatters!=nullptr && (formatter = getCachedFormatter(i - 2))!=nullptr) { // Just parse using the formatter. tempStatus.setIndex(sourceOffset); formatter->parseObject(source, argResult, tempStatus); if (tempStatus.getIndex() == sourceOffset) { pos.setErrorIndex(sourceOffset); - return NULL; // leave index as is to signal error + return nullptr; // leave index as is to signal error } sourceOffset = tempStatus.getIndex(); haveArgResult = true; } else if( argType==UMSGPAT_ARG_TYPE_NONE || (cachedFormatters && uhash_iget(cachedFormatters, i -2))) { - // We arrive here if getCachedFormatter returned NULL, but there was actually an element in the hash table. + // We arrive here if getCachedFormatter returned nullptr, but there was actually an element in the hash table. // This can only happen if the hash table contained a DummyFormat, so the if statement above is a check // for the hash table containing DummyFormat. @@ -1457,7 +1457,7 @@ MessageFormat::parse(int32_t msgStart, } if (next < 0) { pos.setErrorIndex(sourceOffset); - return NULL; // leave index as is to signal error + return nullptr; // leave index as is to signal error } else { UnicodeString strValue(source.tempSubString(sourceOffset, next - sourceOffset)); UnicodeString compValue; @@ -1475,7 +1475,7 @@ MessageFormat::parse(int32_t msgStart, double choiceResult = ChoiceFormat::parseArgument(msgPattern, i, source, tempStatus); if (tempStatus.getIndex() == sourceOffset) { pos.setErrorIndex(sourceOffset); - return NULL; // leave index as is to signal error + return nullptr; // leave index as is to signal error } argResult.setDouble(choiceResult); haveArgResult = true; @@ -1483,11 +1483,11 @@ MessageFormat::parse(int32_t msgStart, } else if(UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType) || argType==UMSGPAT_ARG_TYPE_SELECT) { // Parsing not supported. ec = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } else { // This should never happen. ec = U_INTERNAL_PROGRAM_ERROR; - return NULL; + return nullptr; } if (haveArgResult && count <= argNumber) { count = argNumber + 1; @@ -1521,7 +1521,7 @@ MessageFormat::parse(const UnicodeString& source, { if (msgPattern.hasNamedArguments()) { success = U_ARGUMENT_TYPE_MISMATCH; - return NULL; + return nullptr; } ParsePosition status(0); // Calls the actual implementation method and starts @@ -1530,7 +1530,7 @@ MessageFormat::parse(const UnicodeString& source, if (status.getIndex() == 0) { success = U_MESSAGE_PARSE_ERROR; delete[] result; - return NULL; + return nullptr; } return result; } @@ -1545,7 +1545,7 @@ MessageFormat::parseObject( const UnicodeString& source, { int32_t cnt = 0; Formattable* tmpResult = parse(source, status, cnt); - if (tmpResult != NULL) + if (tmpResult != nullptr) result.adoptArray(tmpResult, cnt); } @@ -1557,7 +1557,7 @@ MessageFormat::autoQuoteApostrophe(const UnicodeString& pattern, UErrorCode& sta const UChar* pat = pattern.getBuffer(); int32_t blen = plen * 2 + 1; // space for null termination, convenience UChar* buf = result.getBuffer(blen); - if (buf == NULL) { + if (buf == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } else { int32_t len = umsg_autoQuoteApostrophe(pat, plen, buf, blen, &status); @@ -1574,7 +1574,7 @@ MessageFormat::autoQuoteApostrophe(const UnicodeString& pattern, UErrorCode& sta static Format* makeRBNF(URBNFRuleSetTag tag, const Locale& locale, const UnicodeString& defaultRuleSet, UErrorCode& ec) { RuleBasedNumberFormat* fmt = new RuleBasedNumberFormat(tag, locale, ec); - if (fmt == NULL) { + if (fmt == nullptr) { ec = U_MEMORY_ALLOCATION_ERROR; } else if (U_SUCCESS(ec) && defaultRuleSet.length() > 0) { UErrorCode localStatus = U_ZERO_ERROR; // ignore unrecognized default rule set @@ -1588,10 +1588,10 @@ void MessageFormat::cacheExplicitFormats(UErrorCode& status) { return; } - if (cachedFormatters != NULL) { + if (cachedFormatters != nullptr) { uhash_removeAll(cachedFormatters); } - if (customFormatArgStarts != NULL) { + if (customFormatArgStarts != nullptr) { uhash_removeAll(customFormatArgStarts); } @@ -1684,9 +1684,9 @@ Format* MessageFormat::createAppropriateFormat(UnicodeString& type, UnicodeStrin Formattable::Type& formattableType, UParseError& parseError, UErrorCode& ec) { if (U_FAILURE(ec)) { - return NULL; + return nullptr; } - Format* fmt = NULL; + Format* fmt = nullptr; int32_t typeID, styleID; DateFormat::EStyle date_style; int32_t firstNonSpace; @@ -1747,9 +1747,9 @@ Format* MessageFormat::createAppropriateFormat(UnicodeString& type, UnicodeStrin fmt = DateFormat::createTimeInstance(date_style, fLocale); } - if (styleID < 0 && fmt != NULL) { + if (styleID < 0 && fmt != nullptr) { SimpleDateFormat* sdtfmt = dynamic_cast(fmt); - if (sdtfmt != NULL) { + if (sdtfmt != nullptr) { sdtfmt->applyPattern(style); } } @@ -1808,7 +1808,7 @@ NumberFormat* MessageFormat::createIntegerFormat(const Locale& locale, UErrorCode& status) const { NumberFormat *temp = NumberFormat::createInstance(locale, status); DecimalFormat *temp2; - if (temp != NULL && (temp2 = dynamic_cast(temp)) != NULL) { + if (temp != nullptr && (temp2 = dynamic_cast(temp)) != nullptr) { temp2->setMaximumFractionDigits(0); temp2->setDecimalSeparatorAlwaysShown(false); temp2->setParseIntegerOnly(true); @@ -1819,19 +1819,19 @@ MessageFormat::createIntegerFormat(const Locale& locale, UErrorCode& status) con /** * Return the default number format. Used to format a numeric - * argument when subformats[i].format is NULL. Returns NULL + * argument when subformats[i].format is nullptr. Returns nullptr * on failure. * * Semantically const but may modify *this. */ const NumberFormat* MessageFormat::getDefaultNumberFormat(UErrorCode& ec) const { - if (defaultNumberFormat == NULL) { + if (defaultNumberFormat == nullptr) { MessageFormat* t = (MessageFormat*) this; t->defaultNumberFormat = NumberFormat::createInstance(fLocale, ec); if (U_FAILURE(ec)) { delete t->defaultNumberFormat; - t->defaultNumberFormat = NULL; - } else if (t->defaultNumberFormat == NULL) { + t->defaultNumberFormat = nullptr; + } else if (t->defaultNumberFormat == nullptr) { ec = U_MEMORY_ALLOCATION_ERROR; } } @@ -1840,16 +1840,16 @@ const NumberFormat* MessageFormat::getDefaultNumberFormat(UErrorCode& ec) const /** * Return the default date format. Used to format a date - * argument when subformats[i].format is NULL. Returns NULL + * argument when subformats[i].format is nullptr. Returns nullptr * on failure. * * Semantically const but may modify *this. */ const DateFormat* MessageFormat::getDefaultDateFormat(UErrorCode& ec) const { - if (defaultDateFormat == NULL) { + if (defaultDateFormat == nullptr) { MessageFormat* t = (MessageFormat*) this; t->defaultDateFormat = DateFormat::createDateTimeInstance(DateFormat::kShort, DateFormat::kShort, fLocale); - if (t->defaultDateFormat == NULL) { + if (t->defaultDateFormat == nullptr) { ec = U_MEMORY_ALLOCATION_ERROR; } } @@ -1924,7 +1924,7 @@ FormatNameEnumeration::snext(UErrorCode& status) { if (U_SUCCESS(status) && pos < fFormatNames->size()) { return (const UnicodeString*)fFormatNames->elementAt(pos++); } - return NULL; + return nullptr; } void @@ -1934,14 +1934,14 @@ FormatNameEnumeration::reset(UErrorCode& /*status*/) { int32_t FormatNameEnumeration::count(UErrorCode& /*status*/) const { - return (fFormatNames==NULL) ? 0 : fFormatNames->size(); + return (fFormatNames==nullptr) ? 0 : fFormatNames->size(); } FormatNameEnumeration::~FormatNameEnumeration() { } MessageFormat::PluralSelectorProvider::PluralSelectorProvider(const MessageFormat &mf, UPluralType t) - : msgFormat(mf), rules(NULL), type(t) { + : msgFormat(mf), rules(nullptr), type(t) { } MessageFormat::PluralSelectorProvider::~PluralSelectorProvider() { @@ -1954,7 +1954,7 @@ UnicodeString MessageFormat::PluralSelectorProvider::select(void *ctx, double nu return UnicodeString(false, OTHER_STRING, 5); } MessageFormat::PluralSelectorProvider* t = const_cast(this); - if(rules == NULL) { + if(rules == nullptr) { t->rules = PluralRules::forLocale(msgFormat.fLocale, type, ec); if (U_FAILURE(ec)) { return UnicodeString(false, OTHER_STRING, 5); @@ -1969,11 +1969,11 @@ UnicodeString MessageFormat::PluralSelectorProvider::select(void *ctx, double nu PluralSelectorContext &context = *static_cast(ctx); int32_t otherIndex = msgFormat.findOtherSubMessage(context.startIndex); context.numberArgIndex = msgFormat.findFirstPluralNumberArg(otherIndex, context.argName); - if(context.numberArgIndex > 0 && msgFormat.cachedFormatters != NULL) { + if(context.numberArgIndex > 0 && msgFormat.cachedFormatters != nullptr) { context.formatter = (const Format*)uhash_iget(msgFormat.cachedFormatters, context.numberArgIndex); } - if(context.formatter == NULL) { + if(context.formatter == nullptr) { context.formatter = msgFormat.getDefaultNumberFormat(ec); context.forReplaceNumber = true; } @@ -1983,7 +1983,7 @@ UnicodeString MessageFormat::PluralSelectorProvider::select(void *ctx, double nu } context.formatter->format(context.number, context.numberString, ec); auto* decFmt = dynamic_cast(context.formatter); - if(decFmt != NULL) { + if(decFmt != nullptr) { number::impl::DecimalQuantity dq; decFmt->formatToDecimalQuantity(context.number, dq, ec); if (U_FAILURE(ec)) { @@ -1997,7 +1997,7 @@ UnicodeString MessageFormat::PluralSelectorProvider::select(void *ctx, double nu void MessageFormat::PluralSelectorProvider::reset() { delete rules; - rules = NULL; + rules = nullptr; } diff --git a/icu4c/source/i18n/name2uni.cpp b/icu4c/source/i18n/name2uni.cpp index b22c68b022a..4cdac1503dc 100644 --- a/icu4c/source/i18n/name2uni.cpp +++ b/icu4c/source/i18n/name2uni.cpp @@ -68,10 +68,10 @@ NameUnicodeTransliterator::NameUnicodeTransliterator(UnicodeFilter* adoptedFilte USetAdder sa = { (USet *)legalPtr, // USet* == UnicodeSet* _set_add, - NULL, // Don't need _set_addRange - NULL, // Don't need _set_addString - NULL, // Don't need remove() - NULL + nullptr, // Don't need _set_addRange + nullptr, // Don't need _set_addString + nullptr, // Don't need remove() + nullptr }; uprv_getCharNameCharacters(&sa); } @@ -111,7 +111,7 @@ void NameUnicodeTransliterator::handleTransliterate(Replaceable& text, UTransPos UBool isIncremental) const { // The failure mode, here and below, is to behave like Any-Null, // if either there is no name data (max len == 0) or there is no - // memory (malloc() => NULL). + // memory (malloc() => nullptr). int32_t maxLen = uprv_getMaxCharNameLength(); if (maxLen == 0) { @@ -122,7 +122,7 @@ void NameUnicodeTransliterator::handleTransliterate(Replaceable& text, UTransPos // Accommodate the longest possible name ++maxLen; // allow for temporary trailing space char* cbuf = (char*) uprv_malloc(maxLen); - if (cbuf == NULL) { + if (cbuf == nullptr) { offsets.start = offsets.limit; return; } diff --git a/icu4c/source/i18n/nfrlist.h b/icu4c/source/i18n/nfrlist.h index 3eb1882b2f9..1864d4d3bd9 100644 --- a/icu4c/source/i18n/nfrlist.h +++ b/icu4c/source/i18n/nfrlist.h @@ -39,7 +39,7 @@ protected: uint32_t fCapacity; public: NFRuleList(uint32_t capacity = 10) - : fStuff(capacity ? (NFRule**)uprv_malloc(capacity * sizeof(NFRule*)) : NULL) + : fStuff(capacity ? (NFRule**)uprv_malloc(capacity * sizeof(NFRule*)) : nullptr) , fCount(0) , fCapacity(capacity) {} ~NFRuleList() { @@ -50,10 +50,10 @@ public: uprv_free(fStuff); } } - NFRule* operator[](uint32_t index) const { return fStuff != NULL ? fStuff[index] : NULL; } + NFRule* operator[](uint32_t index) const { return fStuff != nullptr ? fStuff[index] : nullptr; } NFRule* remove(uint32_t index) { - if (fStuff == NULL) { - return NULL; + if (fStuff == nullptr) { + return nullptr; } NFRule* result = fStuff[index]; fCount -= 1; @@ -67,7 +67,7 @@ public: fCapacity += 10; fStuff = (NFRule**)uprv_realloc(fStuff, fCapacity * sizeof(NFRule*)); // assume success } - if (fStuff != NULL) { + if (fStuff != nullptr) { fStuff[fCount++] = thing; } else { fCapacity = 0; @@ -75,17 +75,17 @@ public: } } uint32_t size() const { return fCount; } - NFRule* last() const { return (fCount > 0 && fStuff != NULL) ? fStuff[fCount-1] : NULL; } + NFRule* last() const { return (fCount > 0 && fStuff != nullptr) ? fStuff[fCount-1] : nullptr; } NFRule** release() { - add(NULL); // ensure null termination + add(nullptr); // ensure null termination NFRule** result = fStuff; - fStuff = NULL; + fStuff = nullptr; fCount = 0; fCapacity = 0; return result; } void deleteAll() { - NFRule** tmp = NULL; + NFRule** tmp = nullptr; int32_t size = fCount; if (size > 0) { tmp = release(); diff --git a/icu4c/source/i18n/nfrs.cpp b/icu4c/source/i18n/nfrs.cpp index 17fab139113..709aff0328f 100644 --- a/icu4c/source/i18n/nfrs.cpp +++ b/icu4c/source/i18n/nfrs.cpp @@ -143,7 +143,7 @@ NFRuleSet::NFRuleSet(RuleBasedNumberFormat *_owner, UnicodeString* descriptions, , fIsParseable(true) { for (int32_t i = 0; i < NON_NUMERICAL_RULE_LENGTH; ++i) { - nonNumericalRules[i] = NULL; + nonNumericalRules[i] = nullptr; } if (U_FAILURE(status)) { @@ -303,7 +303,7 @@ void NFRuleSet::setBestFractionRule(int32_t originalIndex, NFRule *newRule, UBoo fractionRules.add(newRule); } NFRule *bestResult = nonNumericalRules[originalIndex]; - if (bestResult == NULL) { + if (bestResult == nullptr) { nonNumericalRules[originalIndex] = newRule; } else { @@ -535,7 +535,7 @@ NFRuleSet::findNormalRule(int64_t number) const } } if (hi == 0) { // bad rule set, minimum base > 0 - return NULL; // want to throw exception here + return nullptr; // want to throw exception here } NFRule *result = rules[hi - 1]; @@ -547,7 +547,7 @@ NFRuleSet::findNormalRule(int64_t number) const // return if (result->shouldRollBack(number)) { if (hi == 1) { // bad rule set, no prior rule to rollback to from this base - return NULL; + return nullptr; } result = rules[hi - 2]; } @@ -671,7 +671,7 @@ NFRuleSet::findFractionRuleSetRule(double number) const static void dumpUS(FILE* f, const UnicodeString& us) { int len = us.length(); char* buf = (char *)uprv_malloc((len+1)*sizeof(char)); //new char[len+1]; - if (buf != NULL) { + if (buf != nullptr) { us.extract(0, len, buf); buf[len] = 0; fprintf(f, "%s", buf); diff --git a/icu4c/source/i18n/nfrule.cpp b/icu4c/source/i18n/nfrule.cpp index 2f8383c764c..8e9040b59e3 100644 --- a/icu4c/source/i18n/nfrule.cpp +++ b/icu4c/source/i18n/nfrule.cpp @@ -40,10 +40,10 @@ NFRule::NFRule(const RuleBasedNumberFormat* _rbnf, const UnicodeString &_ruleTex , exponent(0) , decimalPoint(0) , fRuleText(_ruleText) - , sub1(NULL) - , sub2(NULL) + , sub1(nullptr) + , sub2(nullptr) , formatter(_rbnf) - , rulePatternFormat(NULL) + , rulePatternFormat(nullptr) { if (!fRuleText.isEmpty()) { parseRuleDescriptor(fRuleText, status); @@ -54,12 +54,12 @@ NFRule::~NFRule() { if (sub1 != sub2) { delete sub2; - sub2 = NULL; + sub2 = nullptr; } delete sub1; - sub1 = NULL; + sub1 = nullptr; delete rulePatternFormat; - rulePatternFormat = NULL; + rulePatternFormat = nullptr; } static const UChar gLeftBracket = 0x005b; @@ -101,7 +101,7 @@ static const UChar gGreaterGreaterGreater[] = {0x3E, 0x3E, 0x3E, 0}; /* ">>>" static const UChar * const RULE_PREFIXES[] = { gLessLess, gLessPercent, gLessHash, gLessZero, gGreaterGreater, gGreaterPercent,gGreaterHash, gGreaterZero, - gEqualPercent, gEqualHash, gEqualZero, NULL + gEqualPercent, gEqualHash, gEqualZero, nullptr }; void @@ -117,7 +117,7 @@ NFRule::makeRules(UnicodeString& description, // (this also strips the rule descriptor, if any, off the // description string) NFRule* rule1 = new NFRule(rbnf, description, status); - /* test for NULL */ + /* test for nullptr */ if (rule1 == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -144,7 +144,7 @@ NFRule::makeRules(UnicodeString& description, else { // if the description does contain a matched pair of brackets, // then it's really shorthand for two rules (with one exception) - NFRule* rule2 = NULL; + NFRule* rule2 = nullptr; UnicodeString sbuf; // we'll actually only split the rule into two rules if its @@ -161,7 +161,7 @@ NFRule::makeRules(UnicodeString& description, // increment the original rule's base value ("rule1" actually // goes SECOND in the rule set's rule list) rule2 = new NFRule(rbnf, UnicodeString(), status); - /* test for NULL */ + /* test for nullptr */ if (rule2 == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -217,7 +217,7 @@ NFRule::makeRules(UnicodeString& description, // BEFORE rule1 in the list: in all cases, rule2 OMITS the // material in the brackets and rule1 INCLUDES the material // in the brackets) - if (rule2 != NULL) { + if (rule2 != nullptr) { if (rule2->baseValue >= kNoBase) { rules.add(rule2); } @@ -420,9 +420,9 @@ NFRule::extractSubstitutions(const NFRuleSet* ruleSet, } fRuleText = ruleText; sub1 = extractSubstitution(ruleSet, predecessor, status); - if (sub1 == NULL) { + if (sub1 == nullptr) { // Small optimization. There is no need to create a redundant NullSubstitution. - sub2 = NULL; + sub2 = nullptr; } else { sub2 = extractSubstitution(ruleSet, predecessor, status); @@ -469,7 +469,7 @@ NFRule::extractSubstitution(const NFRuleSet* ruleSet, const NFRule* predecessor, UErrorCode& status) { - NFSubstitution* result = NULL; + NFSubstitution* result = nullptr; // search the rule's rule text for the first two characters of // a substitution token @@ -479,7 +479,7 @@ NFRule::extractSubstitution(const NFRuleSet* ruleSet, // if we didn't find one, create a null substitution positioned // at the end of the rule text if (subStart == -1) { - return NULL; + return nullptr; } // special-case the ">>>" token, since searching for the > at the @@ -506,7 +506,7 @@ NFRule::extractSubstitution(const NFRuleSet* ruleSet, // unmatched token character), create a null substitution positioned // at the end of the rule if (subEnd == -1) { - return NULL; + return nullptr; } // if we get here, we have a real substitution token (or at least @@ -549,10 +549,10 @@ NFRule::setBaseValue(int64_t newBaseValue, UErrorCode& status) // description didn't specify a base value. This means it // has substitutions, and some substitutions hold on to copies // of the rule's divisor. Fix their copies of the divisor. - if (sub1 != NULL) { + if (sub1 != nullptr) { sub1->setDivisor(radix, exponent, status); } - if (sub2 != NULL) { + if (sub2 != nullptr) { sub2->setDivisor(radix, exponent, status); } @@ -690,7 +690,7 @@ NFRule::_appendRuleText(UnicodeString& result) const // if the rule text begins with a space, write an apostrophe // (whitespace after the rule descriptor is ignored; the // apostrophe is used to make the whitespace significant) - if (fRuleText.charAt(0) == gSpace && (sub1 == NULL || sub1->getPos() != 0)) { + if (fRuleText.charAt(0) == gSpace && (sub1 == nullptr || sub1->getPos() != 0)) { result.append(gTick); } @@ -700,11 +700,11 @@ NFRule::_appendRuleText(UnicodeString& result) const ruleTextCopy.setTo(fRuleText); UnicodeString temp; - if (sub2 != NULL) { + if (sub2 != nullptr) { sub2->toString(temp); ruleTextCopy.insert(sub2->getPos(), temp); } - if (sub1 != NULL) { + if (sub1 != nullptr) { sub1->toString(temp); ruleTextCopy.insert(sub1->getPos(), temp); } @@ -763,10 +763,10 @@ NFRule::doFormat(int64_t number, UnicodeString& toInsertInto, int32_t pos, int32 lengthOffset = fRuleText.length() - (toInsertInto.length() - initialLength); } - if (sub2 != NULL) { + if (sub2 != nullptr) { sub2->doSubstitution(number, toInsertInto, pos - (sub2->getPos() > pluralRuleStart ? lengthOffset : 0), recursionCount, status); } - if (sub1 != NULL) { + if (sub1 != nullptr) { sub1->doSubstitution(number, toInsertInto, pos - (sub1->getPos() > pluralRuleStart ? lengthOffset : 0), recursionCount, status); } } @@ -817,10 +817,10 @@ NFRule::doFormat(double number, UnicodeString& toInsertInto, int32_t pos, int32_ lengthOffset = fRuleText.length() - (toInsertInto.length() - initialLength); } - if (sub2 != NULL) { + if (sub2 != nullptr) { sub2->doSubstitution(number, toInsertInto, pos - (sub2->getPos() > pluralRuleStart ? lengthOffset : 0), recursionCount, status); } - if (sub1 != NULL) { + if (sub1 != nullptr) { sub1->doSubstitution(number, toInsertInto, pos - (sub1->getPos() > pluralRuleStart ? lengthOffset : 0), recursionCount, status); } } @@ -852,7 +852,7 @@ NFRule::shouldRollBack(int64_t number) const // a modulus substitution, its base value isn't an even multiple // of 100, and the value we're trying to format _is_ an even // multiple of 100. This is called the "rollback rule." - if ((sub1 != NULL && sub1->isModulusSubstitution()) || (sub2 != NULL && sub2->isModulusSubstitution())) { + if ((sub1 != nullptr && sub1->isModulusSubstitution()) || (sub2 != nullptr && sub2->isModulusSubstitution())) { int64_t re = util64_pow(radix, exponent); return (number % re) == 0 && (baseValue % re) != 0; } @@ -887,7 +887,7 @@ NFRule::shouldRollBack(int64_t number) const static void dumpUS(FILE* f, const UnicodeString& us) { int len = us.length(); char* buf = (char *)uprv_malloc((len+1)*sizeof(char)); //new char[len+1]; - if (buf != NULL) { + if (buf != nullptr) { us.extract(0, len, buf); buf[len] = 0; fprintf(f, "%s", buf); @@ -908,8 +908,8 @@ NFRule::doParse(const UnicodeString& text, ParsePosition pp; UnicodeString workText(text); - int32_t sub1Pos = sub1 != NULL ? sub1->getPos() : fRuleText.length(); - int32_t sub2Pos = sub2 != NULL ? sub2->getPos() : fRuleText.length(); + int32_t sub1Pos = sub1 != nullptr ? sub1->getPos() : fRuleText.length(); + int32_t sub2Pos = sub2 != nullptr ? sub2->getPos() : fRuleText.length(); // check to see whether the text before the first substitution // matches the text at the beginning of the string being @@ -1010,7 +1010,7 @@ NFRule::doParse(const UnicodeString& text, // null substitution), pp is now pointing at the first unmatched // character. Take note of that, and try matchToDelimiter() // on the input text again - if (pp.getIndex() != 0 || sub1 == NULL) { + if (pp.getIndex() != 0 || sub1 == nullptr) { start = pp.getIndex(); UnicodeString workText2; @@ -1030,7 +1030,7 @@ NFRule::doParse(const UnicodeString& text, // if we got a successful match on this second // matchToDelimiter() call, update the high-water mark // and result (if necessary) - if (pp2.getIndex() != 0 || sub2 == NULL) { + if (pp2.getIndex() != 0 || sub2 == nullptr) { if (prefixLength + pp.getIndex() + pp2.getIndex() > highWaterMark) { highWaterMark = prefixLength + pp.getIndex() + pp2.getIndex(); result = partialResult; @@ -1078,7 +1078,7 @@ NFRule::doParse(const UnicodeString& text, // we have to account for it here. By definition, if the matching // rule in a fraction rule set has no substitutions, its numerator // is 1, and so the result is the reciprocal of its base value. - if (isFractionRule && highWaterMark > 0 && sub1 == NULL) { + if (isFractionRule && highWaterMark > 0 && sub1 == nullptr) { result = 1 / result; } @@ -1235,7 +1235,7 @@ NFRule::matchToDelimiter(const UnicodeString& text, // for "delimiter". Instead, just use "sub" to parse as much of // "text" as possible. } - else if (sub == NULL) { + else if (sub == nullptr) { return _baseValue; } else { @@ -1309,7 +1309,7 @@ NFRule::prefixLength(const UnicodeString& str, const UnicodeString& prefix, UErr // the CollationElementIterator protocol. Hopefully, this // will change someday.) const RuleBasedCollator* collator = formatter->getCollator(); - if (collator == NULL) { + if (collator == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1588,7 +1588,7 @@ NFRule::allIgnorable(const UnicodeString& str, UErrorCode& status) const // element is 0 (ignorable) at the primary level if (formatter->isLenient()) { const RuleBasedCollator* collator = formatter->getCollator(); - if (collator == NULL) { + if (collator == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return false; } @@ -1618,10 +1618,10 @@ NFRule::allIgnorable(const UnicodeString& str, UErrorCode& status) const void NFRule::setDecimalFormatSymbols(const DecimalFormatSymbols& newSymbols, UErrorCode& status) { - if (sub1 != NULL) { + if (sub1 != nullptr) { sub1->setDecimalFormatSymbols(newSymbols, status); } - if (sub2 != NULL) { + if (sub2 != nullptr) { sub2->setDecimalFormatSymbols(newSymbols, status); } } diff --git a/icu4c/source/i18n/nfsubs.cpp b/icu4c/source/i18n/nfsubs.cpp index 9dba77b1e30..113bb529ee6 100644 --- a/icu4c/source/i18n/nfsubs.cpp +++ b/icu4c/source/i18n/nfsubs.cpp @@ -324,7 +324,7 @@ NFSubstitution::makeSubstitution(int32_t pos, { // if the description is empty, return a NullSubstitution if (description.length() == 0) { - return NULL; + return nullptr; } switch (description.charAt(0)) { @@ -335,7 +335,7 @@ NFSubstitution::makeSubstitution(int32_t pos, if (rule->getBaseValue() == NFRule::kNegativeNumberRule) { // throw new IllegalArgumentException("<< not allowed in negative-number rule"); status = U_PARSE_ERROR; - return NULL; + return nullptr; } // if the rule is a fraction rule, return an @@ -380,7 +380,7 @@ NFSubstitution::makeSubstitution(int32_t pos, else if (ruleSet->isFractionRuleSet()) { // throw new IllegalArgumentException(">> not allowed in fraction rule set"); status = U_PARSE_ERROR; - return NULL; + return nullptr; } // otherwise, return a ModulusSubstitution @@ -399,14 +399,14 @@ NFSubstitution::makeSubstitution(int32_t pos, // throw new IllegalArgumentException("Illegal substitution character"); status = U_PARSE_ERROR; } - return NULL; + return nullptr; } NFSubstitution::NFSubstitution(int32_t _pos, const NFRuleSet* _ruleSet, const UnicodeString& description, UErrorCode& status) - : pos(_pos), ruleSet(NULL), numberFormat(NULL) + : pos(_pos), ruleSet(nullptr), numberFormat(nullptr) { // the description should begin and end with the same character. // If it doesn't that's a syntax error. Otherwise, @@ -448,7 +448,7 @@ NFSubstitution::NFSubstitution(int32_t _pos, return; } DecimalFormat *tempNumberFormat = new DecimalFormat(workingDescription, *sym, status); - /* test for NULL */ + /* test for nullptr */ if (!tempNumberFormat) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -467,9 +467,9 @@ NFSubstitution::NFSubstitution(int32_t _pos, // a number even when it's 0) // this causes problems when >>> is used in a frationalPartSubstitution - // this->ruleSet = NULL; + // this->ruleSet = nullptr; this->ruleSet = _ruleSet; - this->numberFormat = NULL; + this->numberFormat = nullptr; } else { // and of the description is none of these things, it's a syntax error @@ -482,7 +482,7 @@ NFSubstitution::NFSubstitution(int32_t _pos, NFSubstitution::~NFSubstitution() { delete numberFormat; - numberFormat = NULL; + numberFormat = nullptr; } /** @@ -499,7 +499,7 @@ NFSubstitution::setDivisor(int32_t /*radix*/, int16_t /*exponent*/, UErrorCode& void NFSubstitution::setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErrorCode& /*status*/) { - if (numberFormat != NULL) { + if (numberFormat != nullptr) { numberFormat->setDecimalFormatSymbols(newSymbols); } } @@ -523,10 +523,10 @@ NFSubstitution::operator==(const NFSubstitution& rhs) const // this should be called by subclasses before their own equality tests return typeid(*this) == typeid(rhs) && pos == rhs.pos - && (ruleSet == NULL) == (rhs.ruleSet == NULL) + && (ruleSet == nullptr) == (rhs.ruleSet == nullptr) // && ruleSet == rhs.ruleSet causes circularity, other checks to make instead? - && (numberFormat == NULL - ? (rhs.numberFormat == NULL) + && (numberFormat == nullptr + ? (rhs.numberFormat == nullptr) : (*numberFormat == *rhs.numberFormat)); } @@ -547,9 +547,9 @@ NFSubstitution::toString(UnicodeString& text) const text.append(tokenChar()); UnicodeString temp; - if (ruleSet != NULL) { + if (ruleSet != nullptr) { ruleSet->getName(temp); - } else if (numberFormat != NULL) { + } else if (numberFormat != nullptr) { numberFormat->toPattern(temp); } text.append(temp); @@ -573,12 +573,12 @@ NFSubstitution::toString(UnicodeString& text) const void NFSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos, int32_t recursionCount, UErrorCode& status) const { - if (ruleSet != NULL) { + if (ruleSet != nullptr) { // Perform a transformation on the number that is dependent // on the type of substitution this is, then just call its // rule set's format() method to format the result ruleSet->format(transformNumber(number), toInsertInto, _pos + this->pos, recursionCount, status); - } else if (numberFormat != NULL) { + } else if (numberFormat != nullptr) { if (number <= MAX_INT64_IN_DOUBLE) { // or perform the transformation on the number (preserving // the result's fractional part if the formatter it set @@ -634,16 +634,16 @@ NFSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32 // if the result is an integer, from here on out we work in integer // space (saving time and memory and preserving accuracy) - if (numberToFormat == uprv_floor(numberToFormat) && ruleSet != NULL) { + if (numberToFormat == uprv_floor(numberToFormat) && ruleSet != nullptr) { ruleSet->format(util64_fromDouble(numberToFormat), toInsertInto, _pos + this->pos, recursionCount, status); // if the result isn't an integer, then call either our rule set's // format() method or our DecimalFormat's format() method to // format the result } else { - if (ruleSet != NULL) { + if (ruleSet != nullptr) { ruleSet->format(numberToFormat, toInsertInto, _pos + this->pos, recursionCount, status); - } else if (numberFormat != NULL) { + } else if (numberFormat != nullptr) { UnicodeString temp; numberFormat->format(numberToFormat, temp); toInsertInto.insert(_pos + this->pos, temp); @@ -715,7 +715,7 @@ NFSubstitution::doParse(const UnicodeString& text, // be false even when the formatter's lenient-parse mode is // on), then also try parsing the text using a default- // constructed NumberFormat - if (ruleSet != NULL) { + if (ruleSet != nullptr) { ruleSet->parse(text, parsePosition, upperBound, nonNumericalExecutedRuleMask, result); if (lenientParse && !ruleSet->isFractionRuleSet() && parsePosition.getIndex() == 0) { UErrorCode status = U_ZERO_ERROR; @@ -727,7 +727,7 @@ NFSubstitution::doParse(const UnicodeString& text, } // ...or use our DecimalFormat to parse the text - } else if (numberFormat != NULL) { + } else if (numberFormat != nullptr) { numberFormat->parse(text, result, parsePosition); } @@ -834,7 +834,7 @@ ModulusSubstitution::ModulusSubstitution(int32_t _pos, UErrorCode& status) : NFSubstitution(_pos, _ruleSet, description, status) , divisor(rule->getDivisor()) - , ruleToUse(NULL) + , ruleToUse(nullptr) { // the owning rule's divisor controls the behavior of this // substitution: rather than keeping a backpointer to the rule, @@ -882,7 +882,7 @@ ModulusSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, // if this isn't a >>> substitution, just use the inherited version // of this function (which uses either a rule set or a DecimalFormat // to format its substitution value) - if (ruleToUse == NULL) { + if (ruleToUse == nullptr) { NFSubstitution::doSubstitution(number, toInsertInto, _pos, recursionCount, status); // a >>> substitution goes straight to a particular rule to @@ -907,7 +907,7 @@ ModulusSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, // if this isn't a >>> substitution, just use the inherited version // of this function (which uses either a rule set or a DecimalFormat // to format its substitution value) - if (ruleToUse == NULL) { + if (ruleToUse == nullptr) { NFSubstitution::doSubstitution(number, toInsertInto, _pos, recursionCount, status); // a >>> substitution goes straight to a particular rule to @@ -943,7 +943,7 @@ ModulusSubstitution::doParse(const UnicodeString& text, { // if this isn't a >>> substitution, we can just use the // inherited parse() routine to do the parsing - if (ruleToUse == NULL) { + if (ruleToUse == nullptr) { return NFSubstitution::doParse(text, parsePosition, baseValue, upperBound, lenientParse, nonNumericalExecutedRuleMask, result); // but if it IS a >>> substitution, we have to do it here: we @@ -976,7 +976,7 @@ ModulusSubstitution::toString(UnicodeString& text) const // either the name of the rule set it uses, or the pattern of // the DecimalFormat it uses - if ( ruleToUse != NULL ) { // Must have been a >>> substitution. + if ( ruleToUse != nullptr ) { // Must have been a >>> substitution. text.remove(); text.append(tokenChar()); text.append(tokenChar()); @@ -1146,7 +1146,7 @@ FractionalPartSubstitution::doParse(const UnicodeString& text, DecimalQuantity dl; int32_t totalDigits = 0; - NumberFormat* fmt = NULL; + NumberFormat* fmt = nullptr; while (workText.length() > 0 && workPos.getIndex() != 0) { workPos.setIndex(0); Formattable temp; @@ -1163,7 +1163,7 @@ FractionalPartSubstitution::doParse(const UnicodeString& text, fmt = NumberFormat::createInstance(status); if (U_FAILURE(status)) { delete fmt; - fmt = NULL; + fmt = nullptr; } } if (fmt) { @@ -1224,7 +1224,7 @@ NumeratorSubstitution::doSubstitution(double number, UnicodeString& toInsertInto int64_t longNF = util64_fromDouble(numberToFormat); const NFRuleSet* aruleSet = getRuleSet(); - if (withZeros && aruleSet != NULL) { + if (withZeros && aruleSet != nullptr) { // if there are leading zeros in the decimal expansion then emit them int64_t nf =longNF; int32_t len = toInsertInto.length(); @@ -1237,14 +1237,14 @@ NumeratorSubstitution::doSubstitution(double number, UnicodeString& toInsertInto // if the result is an integer, from here on out we work in integer // space (saving time and memory and preserving accuracy) - if (numberToFormat == longNF && aruleSet != NULL) { + if (numberToFormat == longNF && aruleSet != nullptr) { aruleSet->format(longNF, toInsertInto, apos + getPos(), recursionCount, status); // if the result isn't an integer, then call either our rule set's // format() method or our DecimalFormat's format() method to // format the result } else { - if (aruleSet != NULL) { + if (aruleSet != nullptr) { aruleSet->format(numberToFormat, toInsertInto, apos + getPos(), recursionCount, status); } else { UnicodeString temp; diff --git a/icu4c/source/i18n/nortrans.cpp b/icu4c/source/i18n/nortrans.cpp index b1809daebd0..d793433b3d2 100644 --- a/icu4c/source/i18n/nortrans.cpp +++ b/icu4c/source/i18n/nortrans.cpp @@ -62,11 +62,11 @@ Transliterator* NormalizationTransliterator::_create(const UnicodeString& ID, const char *name = (const char *)context.pointer; UNormalization2Mode mode = (UNormalization2Mode)uprv_strchr(name, 0)[1]; UErrorCode errorCode = U_ZERO_ERROR; - const Normalizer2 *norm2 = Normalizer2::getInstance(NULL, name, mode, errorCode); + const Normalizer2 *norm2 = Normalizer2::getInstance(nullptr, name, mode, errorCode); if(U_SUCCESS(errorCode)) { return new NormalizationTransliterator(ID, *norm2); } else { - return NULL; + return nullptr; } } diff --git a/icu4c/source/i18n/number_grouping.cpp b/icu4c/source/i18n/number_grouping.cpp index 9ba639e67e2..54aeffee811 100644 --- a/icu4c/source/i18n/number_grouping.cpp +++ b/icu4c/source/i18n/number_grouping.cpp @@ -18,7 +18,7 @@ namespace { int16_t getMinGroupingForLocale(const Locale& locale) { // TODO: Cache this? UErrorCode localStatus = U_ZERO_ERROR; - LocalUResourceBundlePointer bundle(ures_open(NULL, locale.getName(), &localStatus)); + LocalUResourceBundlePointer bundle(ures_open(nullptr, locale.getName(), &localStatus)); int32_t resultLen = 0; const char16_t* result = ures_getStringByKeyWithFallback( bundle.getAlias(), diff --git a/icu4c/source/i18n/number_longnames.cpp b/icu4c/source/i18n/number_longnames.cpp index be0320cecf2..237abdde311 100644 --- a/icu4c/source/i18n/number_longnames.cpp +++ b/icu4c/source/i18n/number_longnames.cpp @@ -606,7 +606,7 @@ class DerivedComponents { */ DerivedComponents(const Locale &locale, const char *feature, const char *structure) { StackUResourceBundle derivationsBundle, stackBundle; - ures_openDirectFillIn(derivationsBundle.getAlias(), NULL, "grammaticalFeatures", &status); + ures_openDirectFillIn(derivationsBundle.getAlias(), nullptr, "grammaticalFeatures", &status); ures_getByKey(derivationsBundle.getAlias(), "grammaticalData", derivationsBundle.getAlias(), &status); ures_getByKey(derivationsBundle.getAlias(), "derivations", derivationsBundle.getAlias(), @@ -695,7 +695,7 @@ class DerivedComponents { UnicodeString getDeriveCompoundRule(Locale locale, const char *feature, const char *structure, UErrorCode &status) { StackUResourceBundle derivationsBundle, stackBundle; - ures_openDirectFillIn(derivationsBundle.getAlias(), NULL, "grammaticalFeatures", &status); + ures_openDirectFillIn(derivationsBundle.getAlias(), nullptr, "grammaticalFeatures", &status); ures_getByKey(derivationsBundle.getAlias(), "grammaticalData", derivationsBundle.getAlias(), &status); ures_getByKey(derivationsBundle.getAlias(), "derivations", derivationsBundle.getAlias(), &status); @@ -1529,7 +1529,7 @@ void LongNameHandler::multiSimpleFormatsToModifiers(const UnicodeString *leadFor void LongNameHandler::processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const { - if (parent != NULL) { + if (parent != nullptr) { parent->processQuantity(quantity, micros, status); } StandardPlural::Form pluralForm = utils::getPluralSafe(micros.rounder, rules, quantity, status); @@ -1726,12 +1726,12 @@ LongNameMultiplexer *LongNameMultiplexer::forMeasureUnits(const Locale &loc, result->fMeasureUnits[i] = unit; if (unit.getComplexity(status) == UMEASURE_UNIT_MIXED) { MixedUnitLongNameHandler *mlnh = result->fMixedUnitHandlers.createAndCheckErrorCode(status); - MixedUnitLongNameHandler::forMeasureUnit(loc, unit, width, unitDisplayCase, rules, NULL, + MixedUnitLongNameHandler::forMeasureUnit(loc, unit, width, unitDisplayCase, rules, nullptr, mlnh, status); result->fHandlers[i] = mlnh; } else { LongNameHandler *lnh = result->fLongNameHandlers.createAndCheckErrorCode(status); - LongNameHandler::forMeasureUnit(loc, unit, width, unitDisplayCase, rules, NULL, lnh, status); + LongNameHandler::forMeasureUnit(loc, unit, width, unitDisplayCase, rules, nullptr, lnh, status); result->fHandlers[i] = lnh; } if (U_FAILURE(status)) { diff --git a/icu4c/source/i18n/numfmt.cpp b/icu4c/source/i18n/numfmt.cpp index 9e841da74a4..fd878831799 100644 --- a/icu4c/source/i18n/numfmt.cpp +++ b/icu4c/source/i18n/numfmt.cpp @@ -109,38 +109,38 @@ const int32_t icu::NumberFormat::gDefaultMaxIntegerDigits = 2000000000; const int32_t icu::NumberFormat::gDefaultMinIntegerDigits = 127; static const UChar * const gLastResortNumberPatterns[UNUM_FORMAT_STYLE_COUNT] = { - NULL, // UNUM_PATTERN_DECIMAL + nullptr, // UNUM_PATTERN_DECIMAL gLastResortDecimalPat, // UNUM_DECIMAL gLastResortCurrencyPat, // UNUM_CURRENCY gLastResortPercentPat, // UNUM_PERCENT gLastResortScientificPat, // UNUM_SCIENTIFIC - NULL, // UNUM_SPELLOUT - NULL, // UNUM_ORDINAL - NULL, // UNUM_DURATION + nullptr, // UNUM_SPELLOUT + nullptr, // UNUM_ORDINAL + nullptr, // UNUM_DURATION gLastResortDecimalPat, // UNUM_NUMBERING_SYSTEM - NULL, // UNUM_PATTERN_RULEBASED + nullptr, // UNUM_PATTERN_RULEBASED gLastResortIsoCurrencyPat, // UNUM_CURRENCY_ISO gLastResortPluralCurrencyPat, // UNUM_CURRENCY_PLURAL gLastResortAccountingCurrencyPat, // UNUM_CURRENCY_ACCOUNTING gLastResortCurrencyPat, // UNUM_CASH_CURRENCY - NULL, // UNUM_DECIMAL_COMPACT_SHORT - NULL, // UNUM_DECIMAL_COMPACT_LONG + nullptr, // UNUM_DECIMAL_COMPACT_SHORT + nullptr, // UNUM_DECIMAL_COMPACT_LONG gLastResortCurrencyPat, // UNUM_CURRENCY_STANDARD }; // Keys used for accessing resource bundles static const icu::number::impl::CldrPatternStyle gFormatCldrStyles[UNUM_FORMAT_STYLE_COUNT] = { - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_PATTERN_DECIMAL + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_PATTERN_DECIMAL icu::number::impl::CLDR_PATTERN_STYLE_DECIMAL, // UNUM_DECIMAL icu::number::impl::CLDR_PATTERN_STYLE_CURRENCY, // UNUM_CURRENCY icu::number::impl::CLDR_PATTERN_STYLE_PERCENT, // UNUM_PERCENT icu::number::impl::CLDR_PATTERN_STYLE_SCIENTIFIC, // UNUM_SCIENTIFIC - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_SPELLOUT - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_ORDINAL - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DURATION - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_NUMBERING_SYSTEM - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_PATTERN_RULEBASED + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_SPELLOUT + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_ORDINAL + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DURATION + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_NUMBERING_SYSTEM + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_PATTERN_RULEBASED // For UNUM_CURRENCY_ISO and UNUM_CURRENCY_PLURAL, // the pattern is the same as the pattern of UNUM_CURRENCY // except for replacing the single currency sign with @@ -149,17 +149,17 @@ static const icu::number::impl::CldrPatternStyle gFormatCldrStyles[UNUM_FORMAT_S icu::number::impl::CLDR_PATTERN_STYLE_CURRENCY, // UNUM_CURRENCY_PLURAL icu::number::impl::CLDR_PATTERN_STYLE_ACCOUNTING, // UNUM_CURRENCY_ACCOUNTING icu::number::impl::CLDR_PATTERN_STYLE_CURRENCY, // UNUM_CASH_CURRENCY - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DECIMAL_COMPACT_SHORT - /* NULL */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DECIMAL_COMPACT_LONG + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DECIMAL_COMPACT_SHORT + /* nullptr */ icu::number::impl::CLDR_PATTERN_STYLE_COUNT, // UNUM_DECIMAL_COMPACT_LONG icu::number::impl::CLDR_PATTERN_STYLE_CURRENCY, // UNUM_CURRENCY_STANDARD }; // Static hashtable cache of NumberingSystem objects used by NumberFormat -static UHashtable * NumberingSystem_cache = NULL; +static UHashtable * NumberingSystem_cache = nullptr; static icu::UInitOnce gNSCacheInitOnce {}; #if !UCONFIG_NO_SERVICE -static icu::ICULocaleService* gService = NULL; +static icu::ICULocaleService* gService = nullptr; static icu::UInitOnce gServiceInitOnce {}; #endif @@ -177,14 +177,14 @@ static UBool U_CALLCONV numfmt_cleanup(void) { gServiceInitOnce.reset(); if (gService) { delete gService; - gService = NULL; + gService = nullptr; } #endif gNSCacheInitOnce.reset(); if (NumberingSystem_cache) { // delete NumberingSystem_cache; uhash_close(NumberingSystem_cache); - NumberingSystem_cache = NULL; + NumberingSystem_cache = nullptr; } return true; } @@ -222,7 +222,7 @@ SimpleNumberFormatFactory::getSupportedIDs(int32_t &count, UErrorCode& status) c return &_id; } count = 0; - return NULL; + return nullptr; } #endif /* #if !UCONFIG_NO_SERVICE */ @@ -504,9 +504,9 @@ ArgExtractor::iso(void) const { ArgExtractor::ArgExtractor(const NumberFormat& /*nf*/, const Formattable& obj, UErrorCode& /*status*/) : num(&obj), fWasCurrency(false) { - const UObject* o = obj.getObject(); // most commonly o==NULL + const UObject* o = obj.getObject(); // most commonly o==nullptr const CurrencyAmount* amt; - if (o != NULL && (amt = dynamic_cast(o)) != NULL) { + if (o != nullptr && (amt = dynamic_cast(o)) != nullptr) { // getISOCurrency() returns a pointer to internal storage, so we // copy it to retain it across the call to setCurrency(). //const UChar* curr = amt->getISOCurrency(); @@ -575,7 +575,7 @@ NumberFormat::format(const Formattable& obj, return cloneFmt->format(*n, appendTo, pos, status); } - if (n->isNumeric() && n->getDecimalQuantity() != NULL) { + if (n->isNumeric() && n->getDecimalQuantity() != nullptr) { // Decimal Number. We will have a DigitList available if the value was // set to a decimal number, or if the value originated with a parse. // @@ -630,7 +630,7 @@ NumberFormat::format(const Formattable& obj, return cloneFmt->format(*n, appendTo, posIter, status); } - if (n->isNumeric() && n->getDecimalQuantity() != NULL) { + if (n->isNumeric() && n->getDecimalQuantity() != nullptr) { // Decimal Number format(*n->getDecimalQuantity(), appendTo, posIter, status); } else { @@ -745,7 +745,7 @@ CurrencyAmount* NumberFormat::parseCurrency(const UnicodeString& text, } } } - return NULL; + return nullptr; } // ------------------------------------- @@ -878,7 +878,7 @@ public: NFFactory(NumberFormatFactory* delegate) : LocaleKeyFactory(delegate->visible() ? VISIBLE : INVISIBLE) , _delegate(delegate) - , _ids(NULL) + , _ids(nullptr) { } @@ -893,12 +893,12 @@ public: int32_t kind = lkey.kind(); UObject* result = _delegate->createFormat(loc, (UNumberFormatStyle)kind); - if (result == NULL) { - result = service->getKey((ICUServiceKey&)key /* cast away const */, NULL, this, status); + if (result == nullptr) { + result = service->getKey((ICUServiceKey&)key /* cast away const */, nullptr, this, status); } return result; } - return NULL; + return nullptr; } protected: @@ -922,7 +922,7 @@ protected: } return _ids; } - return NULL; + return nullptr; } }; @@ -965,7 +965,7 @@ ICUNumberFormatService::~ICUNumberFormatService() {} // ------------------------------------- static void U_CALLCONV initNumberFormatService() { - U_ASSERT(gService == NULL); + U_ASSERT(gService == nullptr); ucln_i18n_registerCleanup(UCLN_I18N_NUMFMT, numfmt_cleanup); gService = new ICUNumberFormatService(); } @@ -978,7 +978,7 @@ getNumberFormatService(void) } static UBool haveService() { - return !gServiceInitOnce.isReset() && (getNumberFormatService() != NULL); + return !gServiceInitOnce.isReset() && (getNumberFormatService() != nullptr); } // ------------------------------------- @@ -993,12 +993,12 @@ NumberFormat::registerFactory(NumberFormatFactory* toAdopt, UErrorCode& status) ICULocaleService *service = getNumberFormatService(); if (service) { NFFactory *tempnnf = new NFFactory(toAdopt); - if (tempnnf != NULL) { + if (tempnnf != nullptr) { return service->registerFactory(tempnnf, status); } } status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } // ------------------------------------- @@ -1025,7 +1025,7 @@ NumberFormat::getAvailableLocales(void) if (service) { return service->getAvailableLocales(); } - return NULL; // no way to return error condition + return nullptr; // no way to return error condition } #endif /* UCONFIG_NO_SERVICE */ // ------------------------------------- @@ -1057,11 +1057,11 @@ NumberFormat::createInstance(const Locale& loc, UNumberFormatStyle kind, UErrorC } const SharedNumberFormat *shared = createSharedInstance(loc, kind, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } NumberFormat *result = (*shared)->clone(); shared->removeRef(); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } return result; @@ -1200,7 +1200,7 @@ void NumberFormat::getEffectiveCurrency(UChar* result, UErrorCode& ec) const { result[3] = 0; } else { const char* loc = getLocaleID(ULOC_VALID_LOCALE, ec); - if (loc == NULL) { + if (loc == nullptr) { loc = uloc_getDefault(); } ucurr_forLocale(loc, result, 4, &ec); @@ -1239,16 +1239,16 @@ UDisplayContext NumberFormat::getContext(UDisplayContextType type, UErrorCode& s // or percent) for the desired locale. static void U_CALLCONV nscacheInit() { - U_ASSERT(NumberingSystem_cache == NULL); + U_ASSERT(NumberingSystem_cache == nullptr); ucln_i18n_registerCleanup(UCLN_I18N_NUMFMT, numfmt_cleanup); UErrorCode status = U_ZERO_ERROR; NumberingSystem_cache = uhash_open(uhash_hashLong, uhash_compareLong, - NULL, + nullptr, &status); if (U_FAILURE(status)) { // Number Format code will run with no cache if creation fails. - NumberingSystem_cache = NULL; + NumberingSystem_cache = nullptr; return; } uhash_setValueDeleter(NumberingSystem_cache, deleteNumberingSystem); @@ -1261,13 +1261,13 @@ const SharedNumberFormat *LocaleCacheKey::createObject( NumberFormat *nf = NumberFormat::internalCreateInstance( localeId, UNUM_DECIMAL, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } SharedNumberFormat *result = new SharedNumberFormat(nf); - if (result == NULL) { + if (result == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; delete nf; - return NULL; + return nullptr; } result->addRef(); return result; @@ -1276,20 +1276,20 @@ const SharedNumberFormat *LocaleCacheKey::createObject( const SharedNumberFormat* U_EXPORT2 NumberFormat::createSharedInstance(const Locale& loc, UNumberFormatStyle kind, UErrorCode& status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (kind != UNUM_DECIMAL) { status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } - const SharedNumberFormat *result = NULL; + const SharedNumberFormat *result = nullptr; UnifiedCache::getByLocale(loc, result, status); return result; } UBool NumberFormat::isStyleSupported(UNumberFormatStyle style) { - return gLastResortNumberPatterns[style] != NULL; + return gLastResortNumberPatterns[style] != nullptr; } NumberFormat* @@ -1304,11 +1304,11 @@ NumberFormat::makeInstance(const Locale& desiredLocale, UNumberFormatStyle style, UBool mustBeDecimalFormat, UErrorCode& status) { - if (U_FAILURE(status)) return NULL; + if (U_FAILURE(status)) return nullptr; if (style < 0 || style >= UNUM_FORMAT_STYLE_COUNT) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } // For the purposes of general number formatting, UNUM_NUMBERING_SYSTEM should behave the same @@ -1327,7 +1327,7 @@ NumberFormat::makeInstance(const Locale& desiredLocale, // because this method does not take a pattern string. if (!isStyleSupported(style)) { status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } #if U_PLATFORM_USES_ONLY_WIN32_API @@ -1369,15 +1369,15 @@ NumberFormat::makeInstance(const Locale& desiredLocale, // Get cached numbering system LocalPointer ownedNs; - NumberingSystem *ns = NULL; - if (NumberingSystem_cache != NULL) { + NumberingSystem *ns = nullptr; + if (NumberingSystem_cache != nullptr) { // TODO: Bad hash key usage, see ticket #8504. int32_t hashKey = desiredLocale.hashCode(); static UMutex nscacheMutex; Mutex lock(&nscacheMutex); ns = (NumberingSystem *)uhash_iget(NumberingSystem_cache, hashKey); - if (ns == NULL) { + if (ns == nullptr) { ns = NumberingSystem::createInstance(desiredLocale,status); uhash_iput(NumberingSystem_cache, hashKey, (void*)ns, &status); } @@ -1388,25 +1388,25 @@ NumberFormat::makeInstance(const Locale& desiredLocale, // check results of getting a numbering system if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (mustBeDecimalFormat && ns->isAlgorithmic()) { status = U_UNSUPPORTED_ERROR; - return NULL; + return nullptr; } LocalPointer symbolsToAdopt; UnicodeString pattern; - LocalUResourceBundlePointer ownedResource(ures_open(NULL, desiredLocale.getName(), &status)); + LocalUResourceBundlePointer ownedResource(ures_open(nullptr, desiredLocale.getName(), &status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } else { // Loads the decimal symbols of the desired locale. symbolsToAdopt.adoptInsteadAndCheckErrorCode(new DecimalFormatSymbols(desiredLocale, status), status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } // Load the pattern from data using the common library function @@ -1418,12 +1418,12 @@ NumberFormat::makeInstance(const Locale& desiredLocale, pattern = UnicodeString(true, patternPtr, -1); } if (U_FAILURE(status)) { - return NULL; + return nullptr; } if(style==UNUM_CURRENCY || style == UNUM_CURRENCY_ISO || style == UNUM_CURRENCY_ACCOUNTING || style == UNUM_CASH_CURRENCY || style == UNUM_CURRENCY_STANDARD){ const UChar* currPattern = symbolsToAdopt->getCurrencyPattern(); - if(currPattern!=NULL){ + if(currPattern!=nullptr){ pattern.setTo(currPattern, u_strlen(currPattern)); } } @@ -1458,9 +1458,9 @@ NumberFormat::makeInstance(const Locale& desiredLocale, } RuleBasedNumberFormat *r = new RuleBasedNumberFormat(desiredRulesType,nsLoc,status); - if (r == NULL) { + if (r == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } r->setDefaultRuleSet(nsRuleSetName,status); f.adoptInstead(r); @@ -1504,7 +1504,7 @@ NumberFormat::makeInstance(const Locale& desiredLocale, f->setLocaleIDs(ures_getLocaleByType(ownedResource.getAlias(), ULOC_VALID_LOCALE, &status), ures_getLocaleByType(ownedResource.getAlias(), ULOC_ACTUAL_LOCALE, &status)); if (U_FAILURE(status)) { - return NULL; + return nullptr; } return f.orphan(); } diff --git a/icu4c/source/i18n/numrange_impl.cpp b/icu4c/source/i18n/numrange_impl.cpp index ffee174dcca..19453ea3a3f 100644 --- a/icu4c/source/i18n/numrange_impl.cpp +++ b/icu4c/source/i18n/numrange_impl.cpp @@ -92,7 +92,7 @@ class NumberRangeDataSink : public ResourceSink { void getNumberRangeData(const char* localeName, const char* nsName, NumberRangeData& data, UErrorCode& status) { if (U_FAILURE(status)) { return; } - LocalUResourceBundlePointer rb(ures_open(NULL, localeName, &status)); + LocalUResourceBundlePointer rb(ures_open(nullptr, localeName, &status)); if (U_FAILURE(status)) { return; } NumberRangeDataSink sink(data); diff --git a/icu4c/source/i18n/olsontz.cpp b/icu4c/source/i18n/olsontz.cpp index e5c60f8cbe0..b6511155951 100644 --- a/icu4c/source/i18n/olsontz.cpp +++ b/icu4c/source/i18n/olsontz.cpp @@ -52,10 +52,10 @@ static void debug_tz_msg(const char *pat, ...) #endif static UBool arrayEqual(const void *a1, const void *a2, int32_t size) { - if (a1 == NULL && a2 == NULL) { + if (a1 == nullptr && a2 == nullptr) { return true; } - if ((a1 != NULL && a2 == NULL) || (a1 == NULL && a2 != NULL)) { + if ((a1 != nullptr && a2 == nullptr) || (a1 == nullptr && a2 != nullptr)) { return false; } if (a1 == a2) { @@ -97,17 +97,17 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(OlsonTimeZone) * constructor fails so the resultant object is well-behaved. */ void OlsonTimeZone::constructEmpty() { - canonicalID = NULL; + canonicalID = nullptr; transitionCountPre32 = transitionCount32 = transitionCountPost32 = 0; - transitionTimesPre32 = transitionTimes32 = transitionTimesPost32 = NULL; + transitionTimesPre32 = transitionTimes32 = transitionTimesPost32 = nullptr; - typeMapData = NULL; + typeMapData = nullptr; typeCount = 1; typeOffsets = ZEROS; - finalZone = NULL; + finalZone = nullptr; } /** @@ -121,11 +121,11 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, const UResourceBundle* res, const UnicodeString& tzid, UErrorCode& ec) : - BasicTimeZone(tzid), finalZone(NULL) + BasicTimeZone(tzid), finalZone(nullptr) { clearTransitionRules(); U_DEBUG_TZ_MSG(("OlsonTimeZone(%s)\n", ures_getKey((UResourceBundle*)res))); - if ((top == NULL || res == NULL) && U_SUCCESS(ec)) { + if ((top == nullptr || res == nullptr) && U_SUCCESS(ec)) { ec = U_ILLEGAL_ARGUMENT_ERROR; } if (U_SUCCESS(ec)) { @@ -142,7 +142,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, transitionCountPre32 = static_cast(len >> 1); if (ec == U_MISSING_RESOURCE_ERROR) { // No pre-32bit transitions - transitionTimesPre32 = NULL; + transitionTimesPre32 = nullptr; transitionCountPre32 = 0; ec = U_ZERO_ERROR; } else if (U_SUCCESS(ec) && (len < 0 || len > 0x7FFF || (len & 1) != 0) /* len must be even */) { @@ -155,7 +155,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, transitionCount32 = static_cast(len); if (ec == U_MISSING_RESOURCE_ERROR) { // No 32bit transitions - transitionTimes32 = NULL; + transitionTimes32 = nullptr; transitionCount32 = 0; ec = U_ZERO_ERROR; } else if (U_SUCCESS(ec) && (len < 0 || len > 0x7FFF)) { @@ -168,7 +168,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, transitionCountPost32 = static_cast(len >> 1); if (ec == U_MISSING_RESOURCE_ERROR) { // No pre-32bit transitions - transitionTimesPost32 = NULL; + transitionTimesPost32 = nullptr; transitionCountPost32 = 0; ec = U_ZERO_ERROR; } else if (U_SUCCESS(ec) && (len < 0 || len > 0x7FFF || (len & 1) != 0) /* len must be even */) { @@ -184,7 +184,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, typeCount = (int16_t) len >> 1; // Type map data must be of the same size as the transition count - typeMapData = NULL; + typeMapData = nullptr; if (transitionCount() > 0) { ures_getByKey(res, kTYPEMAP, r.getAlias(), &ec); typeMapData = ures_getBinary(r.getAlias(), &len, &ec); @@ -205,7 +205,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, int32_t ruleYear = ures_getInt(r.getAlias(), &ec); if (U_SUCCESS(ec)) { UnicodeString ruleID(true, ruleIdUStr, len); - UResourceBundle *rule = TimeZone::loadRule(top, ruleID, NULL, ec); + UResourceBundle *rule = TimeZone::loadRule(top, ruleID, nullptr, ec); const int32_t *ruleData = ures_getIntVector(rule, &len, &ec); if (U_SUCCESS(ec) && len == 11) { UnicodeString emptyStr; @@ -219,7 +219,7 @@ OlsonTimeZone::OlsonTimeZone(const UResourceBundle* top, ruleData[8] * U_MILLIS_PER_SECOND, (SimpleTimeZone::TimeMode) ruleData[9], ruleData[10] * U_MILLIS_PER_SECOND, ec); - if (finalZone == NULL) { + if (finalZone == nullptr) { ec = U_MEMORY_ALLOCATION_ERROR; } else { finalStartYear = ruleYear; @@ -373,7 +373,7 @@ int32_t OlsonTimeZone::getOffset(uint8_t era, int32_t year, int32_t month, year = -year; } - if (finalZone != NULL && year >= finalStartYear) { + if (finalZone != nullptr && year >= finalStartYear) { return finalZone->getOffset(era, year, month, dom, dow, millis, monthLength, ec); } @@ -393,7 +393,7 @@ void OlsonTimeZone::getOffset(UDate date, UBool local, int32_t& rawoff, if (U_FAILURE(ec)) { return; } - if (finalZone != NULL && date >= finalStartMillis) { + if (finalZone != nullptr && date >= finalStartMillis) { finalZone->getOffset(date, local, rawoff, dstoff, ec); } else { getHistoricalOffset(date, local, kFormer, kLatter, rawoff, dstoff); @@ -406,7 +406,7 @@ void OlsonTimeZone::getOffsetFromLocal(UDate date, UTimeZoneLocalOption nonExist if (U_FAILURE(ec)) { return; } - if (finalZone != NULL && date >= finalStartMillis) { + if (finalZone != nullptr && date >= finalStartMillis) { finalZone->getOffsetFromLocal(date, nonExistingTimeOpt, duplicatedTimeOpt, rawoff, dstoff, ec); } else { getHistoricalOffset(date, true, nonExistingTimeOpt, duplicatedTimeOpt, rawoff, dstoff); @@ -564,7 +564,7 @@ UBool OlsonTimeZone::useDaylightTime() const { // and returns true if so. UDate current = uprv_getUTCtime(); - if (finalZone != NULL && current >= finalStartMillis) { + if (finalZone != nullptr && current >= finalStartMillis) { return finalZone->useDaylightTime(); } @@ -591,7 +591,7 @@ UBool OlsonTimeZone::useDaylightTime() const { } int32_t OlsonTimeZone::getDSTSavings() const{ - if (finalZone != NULL){ + if (finalZone != nullptr){ return finalZone->getDSTSavings(); } return TimeZone::getDSTSavings(); @@ -611,7 +611,7 @@ OlsonTimeZone::hasSameRules(const TimeZone &other) const { return true; } const OlsonTimeZone* z = dynamic_cast(&other); - if (z == NULL) { + if (z == nullptr) { return false; } @@ -624,13 +624,13 @@ OlsonTimeZone::hasSameRules(const TimeZone &other) const { // If the pointers are not equal, the zones may still // be equal if their rules and transitions are equal - if ((finalZone == NULL && z->finalZone != NULL) - || (finalZone != NULL && z->finalZone == NULL) - || (finalZone != NULL && z->finalZone != NULL && *finalZone != *z->finalZone)) { + if ((finalZone == nullptr && z->finalZone != nullptr) + || (finalZone != nullptr && z->finalZone == nullptr) + || (finalZone != nullptr && z->finalZone != nullptr && *finalZone != *z->finalZone)) { return false; } - if (finalZone != NULL) { + if (finalZone != nullptr) { if (finalStartYear != z->finalStartYear || finalStartMillis != z->finalStartMillis) { return false; } @@ -652,33 +652,33 @@ OlsonTimeZone::hasSameRules(const TimeZone &other) const { void OlsonTimeZone::clearTransitionRules(void) { - initialRule = NULL; - firstTZTransition = NULL; - firstFinalTZTransition = NULL; - historicRules = NULL; + initialRule = nullptr; + firstTZTransition = nullptr; + firstFinalTZTransition = nullptr; + historicRules = nullptr; historicRuleCount = 0; - finalZoneWithStartYear = NULL; + finalZoneWithStartYear = nullptr; firstTZTransitionIdx = 0; transitionRulesInitOnce.reset(); } void OlsonTimeZone::deleteTransitionRules(void) { - if (initialRule != NULL) { + if (initialRule != nullptr) { delete initialRule; } - if (firstTZTransition != NULL) { + if (firstTZTransition != nullptr) { delete firstTZTransition; } - if (firstFinalTZTransition != NULL) { + if (firstFinalTZTransition != nullptr) { delete firstFinalTZTransition; } - if (finalZoneWithStartYear != NULL) { + if (finalZoneWithStartYear != nullptr) { delete finalZoneWithStartYear; } - if (historicRules != NULL) { + if (historicRules != nullptr) { for (int i = 0; i < historicRuleCount; i++) { - if (historicRules[i] != NULL) { + if (historicRules[i] != nullptr) { delete historicRules[i]; } } @@ -720,7 +720,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { dst = initialDstOffset() * U_MILLIS_PER_SECOND; initialRule = new InitialTimeZoneRule((dst == 0 ? stdName : dstName), raw, dst); // Check to make sure initialRule was created - if (initialRule == NULL) { + if (initialRule == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -745,7 +745,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { } else { // Build historic rule array UDate* times = (UDate*)uprv_malloc(sizeof(UDate)*transCount); /* large enough to store all transition times */ - if (times == NULL) { + if (times == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -756,7 +756,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { for (transitionIdx = firstTZTransitionIdx; transitionIdx < transCount; transitionIdx++) { if (typeIdx == (int16_t)typeMapData[transitionIdx]) { UDate tt = (UDate)transitionTime(transitionIdx); - if (finalZone == NULL || tt <= finalStartMillis) { + if (finalZone == nullptr || tt <= finalStartMillis) { // Exclude transitions after finalMillis times[nTimes++] = tt; } @@ -766,24 +766,24 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { // Create a TimeArrayTimeZoneRule raw = typeOffsets[typeIdx << 1] * U_MILLIS_PER_SECOND; dst = typeOffsets[(typeIdx << 1) + 1] * U_MILLIS_PER_SECOND; - if (historicRules == NULL) { + if (historicRules == nullptr) { historicRuleCount = typeCount; historicRules = (TimeArrayTimeZoneRule**)uprv_malloc(sizeof(TimeArrayTimeZoneRule*)*historicRuleCount); - if (historicRules == NULL) { + if (historicRules == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); uprv_free(times); return; } for (int i = 0; i < historicRuleCount; i++) { - // Initialize TimeArrayTimeZoneRule pointers as NULL - historicRules[i] = NULL; + // Initialize TimeArrayTimeZoneRule pointers as nullptr + historicRules[i] = nullptr; } } historicRules[typeIdx] = new TimeArrayTimeZoneRule((dst == 0 ? stdName : dstName), raw, dst, times, nTimes, DateTimeRule::UTC_TIME); // Check for memory allocation error - if (historicRules[typeIdx] == NULL) { + if (historicRules[typeIdx] == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -797,17 +797,17 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { firstTZTransition = new TimeZoneTransition((UDate)transitionTime(firstTZTransitionIdx), *initialRule, *historicRules[typeIdx]); // Check to make sure firstTZTransition was created. - if (firstTZTransition == NULL) { + if (firstTZTransition == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; } } } - if (finalZone != NULL) { + if (finalZone != nullptr) { // Get the first occurrence of final rule starts UDate startTime = (UDate)finalStartMillis; - TimeZoneRule *firstFinalRule = NULL; + TimeZoneRule *firstFinalRule = nullptr; if (finalZone->useDaylightTime()) { /* @@ -819,7 +819,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { */ finalZoneWithStartYear = finalZone->clone(); // Check to make sure finalZone was actually cloned. - if (finalZoneWithStartYear == NULL) { + if (finalZoneWithStartYear == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -830,7 +830,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { finalZoneWithStartYear->getNextTransition(startTime, false, tzt); firstFinalRule = tzt.getTo()->clone(); // Check to make sure firstFinalRule received proper clone. - if (firstFinalRule == NULL) { + if (firstFinalRule == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -840,7 +840,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { // final rule with no transitions finalZoneWithStartYear = finalZone->clone(); // Check to make sure finalZone was actually cloned. - if (finalZoneWithStartYear == NULL) { + if (finalZoneWithStartYear == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -849,23 +849,23 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { firstFinalRule = new TimeArrayTimeZoneRule(tzid, finalZone->getRawOffset(), 0, &startTime, 1, DateTimeRule::UTC_TIME); // Check firstFinalRule was properly created. - if (firstFinalRule == NULL) { + if (firstFinalRule == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; } } - TimeZoneRule *prevRule = NULL; + TimeZoneRule *prevRule = nullptr; if (transCount > 0) { prevRule = historicRules[typeMapData[transCount - 1]]; } - if (prevRule == NULL) { + if (prevRule == nullptr) { // No historic transitions, but only finalZone available prevRule = initialRule; } firstFinalTZTransition = new TimeZoneTransition(); // Check to make sure firstFinalTZTransition was created before dereferencing - if (firstFinalTZTransition == NULL) { + if (firstFinalTZTransition == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; deleteTransitionRules(); return; @@ -884,7 +884,7 @@ OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition return false; } - if (finalZone != NULL) { + if (finalZone != nullptr) { if (inclusive && base == firstFinalTZTransition->getTime()) { result = *firstFinalTZTransition; return true; @@ -898,7 +898,7 @@ OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition } } } - if (historicRules != NULL) { + if (historicRules != nullptr) { // Find a historical transition int16_t transCount = transitionCount(); int16_t ttidx = transCount - 1; @@ -909,7 +909,7 @@ OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition } } if (ttidx == transCount - 1) { - if (firstFinalTZTransition != NULL) { + if (firstFinalTZTransition != nullptr) { result = *firstFinalTZTransition; return true; } else { @@ -949,7 +949,7 @@ OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransi return false; } - if (finalZone != NULL) { + if (finalZone != nullptr) { if (inclusive && base == firstFinalTZTransition->getTime()) { result = *firstFinalTZTransition; return true; @@ -964,7 +964,7 @@ OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransi } } - if (historicRules != NULL) { + if (historicRules != nullptr) { // Find a historical transition int16_t ttidx = transitionCount() - 1; for (; ttidx >= firstTZTransitionIdx; ttidx--) { @@ -1013,16 +1013,16 @@ OlsonTimeZone::countTransitionRules(UErrorCode& status) const { } int32_t count = 0; - if (historicRules != NULL) { + if (historicRules != nullptr) { // historicRules may contain null entries when original zoneinfo data // includes non transition data. for (int32_t i = 0; i < historicRuleCount; i++) { - if (historicRules[i] != NULL) { + if (historicRules[i] != nullptr) { count++; } } } - if (finalZone != NULL) { + if (finalZone != nullptr) { if (finalZone->useDaylightTime()) { count += 2; } else { @@ -1050,11 +1050,11 @@ OlsonTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial, // Transition rules int32_t cnt = 0; - if (historicRules != NULL && trscount > cnt) { + if (historicRules != nullptr && trscount > cnt) { // historicRules may contain null entries when original zoneinfo data // includes non transition data. for (int32_t i = 0; i < historicRuleCount; i++) { - if (historicRules[i] != NULL) { + if (historicRules[i] != nullptr) { trsrules[cnt++] = historicRules[i]; if (cnt >= trscount) { break; @@ -1062,7 +1062,7 @@ OlsonTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial, } } } - if (finalZoneWithStartYear != NULL && trscount > cnt) { + if (finalZoneWithStartYear != nullptr && trscount > cnt) { const InitialTimeZoneRule *tmpini; int32_t tmpcnt = trscount - cnt; finalZoneWithStartYear->getTimeZoneRules(tmpini, &trsrules[cnt], tmpcnt, status); diff --git a/icu4c/source/i18n/olsontz.h b/icu4c/source/i18n/olsontz.h index 525bbd2b129..728f94460ef 100644 --- a/icu4c/source/i18n/olsontz.h +++ b/icu4c/source/i18n/olsontz.h @@ -263,7 +263,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { /** * Gets the InitialTimeZoneRule and the set of TimeZoneRule * which represent time transitions for this time zone. On successful return, - * the argument initial points to non-NULL InitialTimeZoneRule and + * the argument initial points to non-nullptr InitialTimeZoneRule and * the array trsrules is filled with 0 or multiple TimeZoneRule * instances up to the size specified by trscount. The results are referencing the * rule instance held by this time zone instance. Therefore, after this time zone @@ -328,20 +328,20 @@ private: /** * Time of each transition in seconds from 1970 epoch before 32bit second range (<= 1900). * Each transition in this range is represented by a pair of int32_t. - * Length is transitionCount int32_t's. NULL if no transitions in this range. + * Length is transitionCount int32_t's. nullptr if no transitions in this range. */ const int32_t *transitionTimesPre32; // alias into res; do not delete /** * Time of each transition in seconds from 1970 epoch in 32bit second range. - * Length is transitionCount int32_t's. NULL if no transitions in this range. + * Length is transitionCount int32_t's. nullptr if no transitions in this range. */ const int32_t *transitionTimes32; // alias into res; do not delete /** * Time of each transition in seconds from 1970 epoch after 32bit second range (>= 2038). * Each transition in this range is represented by a pair of int32_t. - * Length is transitionCount int32_t's. NULL if no transitions in this range. + * Length is transitionCount int32_t's. nullptr if no transitions in this range. */ const int32_t *transitionTimesPost32; // alias into res; do not delete @@ -360,14 +360,14 @@ private: /** * Type description data, consisting of transitionCount uint8_t * type indices (from 0..typeCount-1). - * Length is transitionCount int16_t's. NULL if no transitions. + * Length is transitionCount int16_t's. nullptr if no transitions. */ const uint8_t *typeMapData; // alias into res; do not delete /** * A SimpleTimeZone that governs the behavior for date >= finalMillis. */ - SimpleTimeZone *finalZone; // owned, may be NULL + SimpleTimeZone *finalZone; // owned, may be nullptr /** * For date >= finalMillis, the finalZone will be used. diff --git a/icu4c/source/i18n/plurfmt.cpp b/icu4c/source/i18n/plurfmt.cpp index 3b8f3a660e5..5ce4d8b1b4f 100644 --- a/icu4c/source/i18n/plurfmt.cpp +++ b/icu4c/source/i18n/plurfmt.cpp @@ -40,23 +40,23 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(PluralFormat) PluralFormat::PluralFormat(UErrorCode& status) : locale(Locale::getDefault()), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, UPLURAL_TYPE_CARDINAL, status); + init(nullptr, UPLURAL_TYPE_CARDINAL, status); } PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, UPLURAL_TYPE_CARDINAL, status); + init(nullptr, UPLURAL_TYPE_CARDINAL, status); } PluralFormat::PluralFormat(const PluralRules& rules, UErrorCode& status) : locale(Locale::getDefault()), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { init(&rules, UPLURAL_TYPE_COUNT, status); } @@ -66,7 +66,7 @@ PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { init(&rules, UPLURAL_TYPE_COUNT, status); } @@ -76,18 +76,18 @@ PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, type, status); + init(nullptr, type, status); } PluralFormat::PluralFormat(const UnicodeString& pat, UErrorCode& status) : locale(Locale::getDefault()), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, UPLURAL_TYPE_CARDINAL, status); + init(nullptr, UPLURAL_TYPE_CARDINAL, status); applyPattern(pat, status); } @@ -96,9 +96,9 @@ PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, UPLURAL_TYPE_CARDINAL, status); + init(nullptr, UPLURAL_TYPE_CARDINAL, status); applyPattern(pat, status); } @@ -107,7 +107,7 @@ PluralFormat::PluralFormat(const PluralRules& rules, UErrorCode& status) : locale(Locale::getDefault()), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { init(&rules, UPLURAL_TYPE_COUNT, status); applyPattern(pat, status); @@ -119,7 +119,7 @@ PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { init(&rules, UPLURAL_TYPE_COUNT, status); applyPattern(pat, status); @@ -131,9 +131,9 @@ PluralFormat::PluralFormat(const Locale& loc, UErrorCode& status) : locale(loc), msgPattern(status), - numberFormat(NULL), + numberFormat(nullptr), offset(0) { - init(NULL, type, status); + init(nullptr, type, status); applyPattern(pat, status); } @@ -141,7 +141,7 @@ PluralFormat::PluralFormat(const PluralFormat& other) : Format(other), locale(other.locale), msgPattern(other.msgPattern), - numberFormat(NULL), + numberFormat(nullptr), offset(other.offset) { copyObjects(other); } @@ -149,19 +149,19 @@ PluralFormat::PluralFormat(const PluralFormat& other) void PluralFormat::copyObjects(const PluralFormat& other) { UErrorCode status = U_ZERO_ERROR; - if (numberFormat != NULL) { + if (numberFormat != nullptr) { delete numberFormat; } - if (pluralRulesWrapper.pluralRules != NULL) { + if (pluralRulesWrapper.pluralRules != nullptr) { delete pluralRulesWrapper.pluralRules; } - if (other.numberFormat == NULL) { + if (other.numberFormat == nullptr) { numberFormat = NumberFormat::createInstance(locale, status); } else { numberFormat = other.numberFormat->clone(); } - if (other.pluralRulesWrapper.pluralRules == NULL) { + if (other.pluralRulesWrapper.pluralRules == nullptr) { pluralRulesWrapper.pluralRules = PluralRules::forLocale(locale, status); } else { pluralRulesWrapper.pluralRules = other.pluralRulesWrapper.pluralRules->clone(); @@ -179,11 +179,11 @@ PluralFormat::init(const PluralRules* rules, UPluralType type, UErrorCode& statu return; } - if (rules==NULL) { + if (rules==nullptr) { pluralRulesWrapper.pluralRules = PluralRules::forLocale(locale, type, status); } else { pluralRulesWrapper.pluralRules = rules->clone(); - if (pluralRulesWrapper.pluralRules == NULL) { + if (pluralRulesWrapper.pluralRules == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -194,7 +194,7 @@ PluralFormat::init(const PluralRules* rules, UPluralType type, UErrorCode& statu void PluralFormat::applyPattern(const UnicodeString& newPattern, UErrorCode& status) { - msgPattern.parsePluralStyle(newPattern, NULL, status); + msgPattern.parsePluralStyle(newPattern, nullptr, status); if (U_FAILURE(status)) { msgPattern.clear(); offset = 0; @@ -343,9 +343,9 @@ PluralFormat::setLocale(const Locale& loc, UErrorCode& status) { msgPattern.clear(); delete numberFormat; offset = 0; - numberFormat = NULL; + numberFormat = nullptr; pluralRulesWrapper.reset(); - init(NULL, UPLURAL_TYPE_CARDINAL, status); + init(nullptr, UPLURAL_TYPE_CARDINAL, status); } void @@ -354,7 +354,7 @@ PluralFormat::setNumberFormat(const NumberFormat* format, UErrorCode& status) { return; } NumberFormat* nf = format->clone(); - if (nf != NULL) { + if (nf != nullptr) { delete numberFormat; numberFormat = nf; } else { @@ -393,10 +393,10 @@ PluralFormat::operator==(const Format& other) const { return locale == o.locale && msgPattern == o.msgPattern && // implies same offset - (numberFormat == NULL) == (o.numberFormat == NULL) && - (numberFormat == NULL || *numberFormat == *o.numberFormat) && - (pluralRulesWrapper.pluralRules == NULL) == (o.pluralRulesWrapper.pluralRules == NULL) && - (pluralRulesWrapper.pluralRules == NULL || + (numberFormat == nullptr) == (o.numberFormat == nullptr) && + (numberFormat == nullptr || *numberFormat == *o.numberFormat) && + (pluralRulesWrapper.pluralRules == nullptr) == (o.pluralRulesWrapper.pluralRules == nullptr) && + (pluralRulesWrapper.pluralRules == nullptr || *pluralRulesWrapper.pluralRules == *o.pluralRulesWrapper.pluralRules); } @@ -548,7 +548,7 @@ void PluralFormat::parseType(const UnicodeString& source, const NFRule *rbnfLeni } UnicodeString currArg = pattern.tempSubString(partStart->getLimit(), partLimit->getIndex() - partStart->getLimit()); - if (rbnfLenientScanner != NULL) { + if (rbnfLenientScanner != nullptr) { // Check if non-lenient rule finds the text before call lenient parsing int32_t tempIndex = source.indexOf(currArg, startingAt); if (tempIndex >= 0) { @@ -595,7 +595,7 @@ UnicodeString PluralFormat::PluralSelectorAdapter::select(void *context, double void PluralFormat::PluralSelectorAdapter::reset() { delete pluralRules; - pluralRules = NULL; + pluralRules = nullptr; } diff --git a/icu4c/source/i18n/quantityformatter.cpp b/icu4c/source/i18n/quantityformatter.cpp index 7b4d51e803f..0a1982e3d4c 100644 --- a/icu4c/source/i18n/quantityformatter.cpp +++ b/icu4c/source/i18n/quantityformatter.cpp @@ -32,14 +32,14 @@ U_NAMESPACE_BEGIN QuantityFormatter::QuantityFormatter() { for (int32_t i = 0; i < UPRV_LENGTHOF(formatters); ++i) { - formatters[i] = NULL; + formatters[i] = nullptr; } } QuantityFormatter::QuantityFormatter(const QuantityFormatter &other) { for (int32_t i = 0; i < UPRV_LENGTHOF(formatters); ++i) { - if (other.formatters[i] == NULL) { - formatters[i] = NULL; + if (other.formatters[i] == nullptr) { + formatters[i] = nullptr; } else { formatters[i] = new SimpleFormatter(*other.formatters[i]); } @@ -53,8 +53,8 @@ QuantityFormatter &QuantityFormatter::operator=( } for (int32_t i = 0; i < UPRV_LENGTHOF(formatters); ++i) { delete formatters[i]; - if (other.formatters[i] == NULL) { - formatters[i] = NULL; + if (other.formatters[i] == nullptr) { + formatters[i] = nullptr; } else { formatters[i] = new SimpleFormatter(*other.formatters[i]); } @@ -71,7 +71,7 @@ QuantityFormatter::~QuantityFormatter() { void QuantityFormatter::reset() { for (int32_t i = 0; i < UPRV_LENGTHOF(formatters); ++i) { delete formatters[i]; - formatters[i] = NULL; + formatters[i] = nullptr; } } @@ -83,11 +83,11 @@ UBool QuantityFormatter::addIfAbsent( if (U_FAILURE(status)) { return false; } - if (formatters[pluralIndex] != NULL) { + if (formatters[pluralIndex] != nullptr) { return true; } SimpleFormatter *newFmt = new SimpleFormatter(rawPattern, 0, 1, status); - if (newFmt == NULL) { + if (newFmt == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return false; } @@ -100,7 +100,7 @@ UBool QuantityFormatter::addIfAbsent( } UBool QuantityFormatter::isValid() const { - return formatters[StandardPlural::OTHER] != NULL; + return formatters[StandardPlural::OTHER] != nullptr; } const SimpleFormatter *QuantityFormatter::getByVariant( @@ -108,7 +108,7 @@ const SimpleFormatter *QuantityFormatter::getByVariant( U_ASSERT(isValid()); int32_t pluralIndex = StandardPlural::indexOrOtherIndexFromString(variant); const SimpleFormatter *pattern = formatters[pluralIndex]; - if (pattern == NULL) { + if (pattern == nullptr) { pattern = formatters[StandardPlural::OTHER]; } return pattern; @@ -127,9 +127,9 @@ UnicodeString &QuantityFormatter::format( return appendTo; } const SimpleFormatter *pattern = formatters[p]; - if (pattern == NULL) { + if (pattern == nullptr) { pattern = formatters[StandardPlural::OTHER]; - if (pattern == NULL) { + if (pattern == nullptr) { status = U_INVALID_STATE_ERROR; return appendTo; } @@ -152,7 +152,7 @@ StandardPlural::Form QuantityFormatter::selectPlural( } UnicodeString pluralKeyword; const DecimalFormat *decFmt = dynamic_cast(&fmt); - if (decFmt != NULL) { + if (decFmt != nullptr) { number::impl::DecimalQuantity dq; decFmt->formatToDecimalQuantity(number, dq, status); if (U_FAILURE(status)) { diff --git a/icu4c/source/i18n/quantityformatter.h b/icu4c/source/i18n/quantityformatter.h index 841798cf889..ca0c0ee3711 100644 --- a/icu4c/source/i18n/quantityformatter.h +++ b/icu4c/source/i18n/quantityformatter.h @@ -86,7 +86,7 @@ public: /** * Gets the pattern formatter that would be used for a particular variant. * If isValid() returns true, this method is guaranteed to return a - * non-NULL value. + * non-nullptr value. */ const SimpleFormatter *getByVariant(const char *variant) const; diff --git a/icu4c/source/i18n/rbnf.cpp b/icu4c/source/i18n/rbnf.cpp index 3d0da00bdb8..ea503a0e4b8 100644 --- a/icu4c/source/i18n/rbnf.cpp +++ b/icu4c/source/i18n/rbnf.cpp @@ -96,7 +96,7 @@ public: if (refcount && --refcount == 0) { delete this; } - return NULL; + return nullptr; } virtual bool operator==(const LocalizationInfo* rhs) const; @@ -119,7 +119,7 @@ LocalizationInfo::~LocalizationInfo() {} //UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(LocalizationInfo) -// if both strings are NULL, this returns true +// if both strings are nullptr, this returns true static UBool streq(const UChar* lhs, const UChar* rhs) { if (rhs == lhs) { @@ -198,9 +198,9 @@ class VArray { int32_t size; Fn_Deleter deleter; public: - VArray() : buf(NULL), cap(0), size(0), deleter(NULL) {} + VArray() : buf(nullptr), cap(0), size(0), deleter(nullptr) {} - VArray(Fn_Deleter del) : buf(NULL), cap(0), size(0), deleter(del) {} + VArray(Fn_Deleter del) : buf(nullptr), cap(0), size(0), deleter(del) {} ~VArray() { if (deleter) { @@ -225,12 +225,12 @@ public: } else { cap += 256; } - if (buf == NULL) { + if (buf == nullptr) { buf = (void**)uprv_malloc(cap * sizeof(void*)); } else { buf = (void**)uprv_realloc(buf, cap * sizeof(void*)); } - if (buf == NULL) { + if (buf == nullptr) { // if we couldn't realloc, we leak the memory we've already allocated, but we're in deep trouble anyway status = U_MEMORY_ALLOCATION_ERROR; return; @@ -245,7 +245,7 @@ public: void** release(void) { void** result = buf; - buf = NULL; + buf = nullptr; cap = 0; size = 0; return result; @@ -307,12 +307,12 @@ class LocDataParser { public: LocDataParser(UParseError& parseError, UErrorCode& status) - : data(NULL), e(NULL), p(NULL), ch(0xffff), pe(parseError), ec(status) {} + : data(nullptr), e(nullptr), p(nullptr), ch(0xffff), pe(parseError), ec(status) {} ~LocDataParser() {} /* * On a successful parse, return a StringLocalizationInfo*, otherwise delete locData, set perror and status, - * and return NULL. The StringLocalizationInfo will adopt locData if it is created. + * and return nullptr. The StringLocalizationInfo will adopt locData if it is created. */ StringLocalizationInfo* parse(UChar* data, int32_t len); @@ -357,13 +357,13 @@ private: #ifdef RBNF_DEBUG #define ERROR(msg) UPRV_BLOCK_MACRO_BEGIN { \ parseError(msg); \ - return NULL; \ + return nullptr; \ } UPRV_BLOCK_MACRO_END #define EXPLANATION_ARG explanationArg #else #define ERROR(msg) UPRV_BLOCK_MACRO_BEGIN { \ - parseError(NULL); \ - return NULL; \ + parseError(nullptr); \ + return nullptr; \ } UPRV_BLOCK_MACRO_END #define EXPLANATION_ARG #endif @@ -390,7 +390,7 @@ StringLocalizationInfo* LocDataParser::parse(UChar* _data, int32_t len) { if (U_FAILURE(ec)) { if (_data) uprv_free(_data); - return NULL; + return nullptr; } pe.line = 0; @@ -398,15 +398,15 @@ LocDataParser::parse(UChar* _data, int32_t len) { pe.postContext[0] = 0; pe.preContext[0] = 0; - if (_data == NULL) { + if (_data == nullptr) { ec = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if (len <= 0) { ec = U_ILLEGAL_ARGUMENT_ERROR; uprv_free(_data); - return NULL; + return nullptr; } data = _data; @@ -457,12 +457,12 @@ LocDataParser::doParse(void) { ERROR("Extra text after close of localization data"); } - array.add(NULL, ec); + array.add(nullptr, ec); if (U_SUCCESS(ec)) { - int32_t numLocs = array.length() - 2; // subtract first, NULL + int32_t numLocs = array.length() - 2; // subtract first, nullptr UChar*** result = (UChar***)array.release(); - return new StringLocalizationInfo(data, result, requiredLength-2, numLocs); // subtract first, NULL + return new StringLocalizationInfo(data, result, requiredLength-2, numLocs); // subtract first, nullptr } } @@ -472,7 +472,7 @@ LocDataParser::doParse(void) { UChar** LocDataParser::nextArray(int32_t& requiredLength) { if (U_FAILURE(ec)) { - return NULL; + return nullptr; } skipWhitespace(); @@ -506,7 +506,7 @@ LocDataParser::nextArray(int32_t& requiredLength) { } } - array.add(NULL, ec); + array.add(nullptr, ec); if (U_SUCCESS(ec)) { if (requiredLength == -1) { requiredLength = array.length() + 1; @@ -522,7 +522,7 @@ LocDataParser::nextArray(int32_t& requiredLength) { UChar* LocDataParser::nextString() { - UChar* result = NULL; + UChar* result = nullptr; skipWhitespace(); if (p < e) { @@ -610,9 +610,9 @@ void LocDataParser::parseError(const char* EXPLANATION_ARG) #endif uprv_free(data); - data = NULL; - p = NULL; - e = NULL; + data = nullptr; + p = nullptr; + e = nullptr; if (U_SUCCESS(ec)) { ec = U_PARSE_ERROR; @@ -624,18 +624,18 @@ void LocDataParser::parseError(const char* EXPLANATION_ARG) StringLocalizationInfo* StringLocalizationInfo::create(const UnicodeString& info, UParseError& perror, UErrorCode& status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } int32_t len = info.length(); if (len == 0) { - return NULL; // no error; + return nullptr; // no error; } UChar* p = (UChar*)uprv_malloc(len * sizeof(UChar)); if (!p) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } info.extract(p, len, status); if (!U_FAILURE(status)) { @@ -661,7 +661,7 @@ StringLocalizationInfo::getRuleSetName(int32_t index) const { if (index >= 0 && index < getNumberOfRuleSets()) { return data[0][index]; } - return NULL; + return nullptr; } const UChar* @@ -669,7 +669,7 @@ StringLocalizationInfo::getLocaleName(int32_t index) const { if (index >= 0 && index < getNumberOfDisplayLocales()) { return data[index+1][0]; } - return NULL; + return nullptr; } const UChar* @@ -678,7 +678,7 @@ StringLocalizationInfo::getDisplayName(int32_t localeIndex, int32_t ruleIndex) c ruleIndex >= 0 && ruleIndex < getNumberOfRuleSets()) { return data[localeIndex+1][ruleIndex+1]; } - return NULL; + return nullptr; } // ---------- @@ -686,23 +686,23 @@ StringLocalizationInfo::getDisplayName(int32_t localeIndex, int32_t ruleIndex) c RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, const UnicodeString& locs, const Locale& alocale, UParseError& perror, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(alocale) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { LocalizationInfo* locinfo = StringLocalizationInfo::create(locs, perror, status); init(description, locinfo, perror, status); @@ -711,23 +711,23 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, const UnicodeString& locs, UParseError& perror, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(Locale::getDefault()) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { LocalizationInfo* locinfo = StringLocalizationInfo::create(locs, perror, status); init(description, locinfo, perror, status); @@ -736,23 +736,23 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, LocalizationInfo* info, const Locale& alocale, UParseError& perror, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(alocale) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { init(description, info, perror, status); } @@ -760,70 +760,70 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, UParseError& perror, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(Locale::getDefault()) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { - init(description, NULL, perror, status); + init(description, nullptr, perror, status); } RuleBasedNumberFormat::RuleBasedNumberFormat(const UnicodeString& description, const Locale& aLocale, UParseError& perror, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(aLocale) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { - init(description, NULL, perror, status); + init(description, nullptr, perror, status); } RuleBasedNumberFormat::RuleBasedNumberFormat(URBNFRuleSetTag tag, const Locale& alocale, UErrorCode& status) - : fRuleSets(NULL) - , ruleSetDescriptions(NULL) + : fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(alocale) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { if (U_FAILURE(status)) { return; @@ -840,18 +840,18 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(URBNFRuleSetTag tag, const Locale& } // TODO: read localization info from resource - LocalizationInfo* locinfo = NULL; + LocalizationInfo* locinfo = nullptr; UResourceBundle* nfrb = ures_open(U_ICUDATA_RBNF, locale.getName(), &status); if (U_SUCCESS(status)) { setLocaleIDs(ures_getLocaleByType(nfrb, ULOC_VALID_LOCALE, &status), ures_getLocaleByType(nfrb, ULOC_ACTUAL_LOCALE, &status)); - UResourceBundle* rbnfRules = ures_getByKeyWithFallback(nfrb, rules_tag, NULL, &status); + UResourceBundle* rbnfRules = ures_getByKeyWithFallback(nfrb, rules_tag, nullptr, &status); if (U_FAILURE(status)) { ures_close(nfrb); } - UResourceBundle* ruleSets = ures_getByKeyWithFallback(rbnfRules, fmt_tag, NULL, &status); + UResourceBundle* ruleSets = ures_getByKeyWithFallback(rbnfRules, fmt_tag, nullptr, &status); if (U_FAILURE(status)) { ures_close(rbnfRules); ures_close(nfrb); @@ -860,7 +860,7 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(URBNFRuleSetTag tag, const Locale& UnicodeString desc; while (ures_hasNext(ruleSets)) { - desc.append(ures_getNextUnicodeString(ruleSets,NULL,&status)); + desc.append(ures_getNextUnicodeString(ruleSets,nullptr,&status)); } UParseError perror; @@ -874,23 +874,23 @@ RuleBasedNumberFormat::RuleBasedNumberFormat(URBNFRuleSetTag tag, const Locale& RuleBasedNumberFormat::RuleBasedNumberFormat(const RuleBasedNumberFormat& rhs) : NumberFormat(rhs) - , fRuleSets(NULL) - , ruleSetDescriptions(NULL) + , fRuleSets(nullptr) + , ruleSetDescriptions(nullptr) , numRuleSets(0) - , defaultRuleSet(NULL) + , defaultRuleSet(nullptr) , locale(rhs.locale) - , collator(NULL) - , decimalFormatSymbols(NULL) - , defaultInfinityRule(NULL) - , defaultNaNRule(NULL) + , collator(nullptr) + , decimalFormatSymbols(nullptr) + , defaultInfinityRule(nullptr) + , defaultNaNRule(nullptr) , fRoundingMode(DecimalFormat::ERoundingMode::kRoundUnnecessary) , lenient(false) - , lenientParseRules(NULL) - , localizations(NULL) + , lenientParseRules(nullptr) + , localizations(nullptr) , capitalizationInfoSet(false) , capitalizationForUIListMenu(false) , capitalizationForStandAlone(false) - , capitalizationBrkIter(NULL) + , capitalizationBrkIter(nullptr) { this->operator=(rhs); } @@ -911,7 +911,7 @@ RuleBasedNumberFormat::operator=(const RuleBasedNumberFormat& rhs) UParseError perror; setDecimalFormatSymbols(*rhs.getDecimalFormatSymbols()); - init(rhs.originalDescription, rhs.localizations ? rhs.localizations->ref() : NULL, perror, status); + init(rhs.originalDescription, rhs.localizations ? rhs.localizations->ref() : nullptr, perror, status); setDefaultRuleSet(rhs.getDefaultRuleSetName(), status); setRoundingMode(rhs.getRoundingMode()); @@ -919,7 +919,7 @@ RuleBasedNumberFormat::operator=(const RuleBasedNumberFormat& rhs) capitalizationForUIListMenu = rhs.capitalizationForUIListMenu; capitalizationForStandAlone = rhs.capitalizationForStandAlone; #if !UCONFIG_NO_BREAK_ITERATION - capitalizationBrkIter = (rhs.capitalizationBrkIter!=NULL)? rhs.capitalizationBrkIter->clone(): NULL; + capitalizationBrkIter = (rhs.capitalizationBrkIter!=nullptr)? rhs.capitalizationBrkIter->clone(): nullptr; #endif return *this; @@ -950,24 +950,24 @@ RuleBasedNumberFormat::operator==(const Format& other) const // the info here is just derived from that. if (locale == rhs.locale && lenient == rhs.lenient && - (localizations == NULL - ? rhs.localizations == NULL - : (rhs.localizations == NULL + (localizations == nullptr + ? rhs.localizations == nullptr + : (rhs.localizations == nullptr ? false : *localizations == rhs.localizations))) { NFRuleSet** p = fRuleSets; NFRuleSet** q = rhs.fRuleSets; - if (p == NULL) { - return q == NULL; - } else if (q == NULL) { + if (p == nullptr) { + return q == nullptr; + } else if (q == nullptr) { return false; } while (*p && *q && (**p == **q)) { ++p; ++q; } - return *q == NULL && *p == NULL; + return *q == nullptr && *p == nullptr; } } @@ -978,7 +978,7 @@ UnicodeString RuleBasedNumberFormat::getRules() const { UnicodeString result; - if (fRuleSets != NULL) { + if (fRuleSets != nullptr) { for (NFRuleSet** p = fRuleSets; *p; ++p) { (*p)->appendRules(result); } @@ -1046,7 +1046,7 @@ RuleBasedNumberFormat::getRuleSetDisplayNameLocale(int32_t index, UErrorCode& st char* bp = buffer; if (cap > 64) { bp = (char *)uprv_malloc(cap); - if (bp == NULL) { + if (bp == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return Locale(""); } @@ -1113,7 +1113,7 @@ RuleBasedNumberFormat::findRuleSet(const UnicodeString& name, UErrorCode& status } status = U_ILLEGAL_ARGUMENT_ERROR; } - return NULL; + return nullptr; } UnicodeString& @@ -1326,7 +1326,7 @@ RuleBasedNumberFormat::adjustForCapitalizationContext(int32_t startPos, if (capitalizationContext != UDISPCTX_CAPITALIZATION_NONE && startPos == 0 && currentResult.length() > 0) { // capitalize currentResult according to context UChar32 ch = currentResult.char32At(0); - if (u_islower(ch) && U_SUCCESS(status) && capitalizationBrkIter != NULL && + if (u_islower(ch) && U_SUCCESS(status) && capitalizationBrkIter != nullptr && ( capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || (capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU && capitalizationForUIListMenu) || (capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_STANDALONE && capitalizationForStandAlone)) ) { @@ -1402,7 +1402,7 @@ RuleBasedNumberFormat::setLenient(UBool enabled) lenient = enabled; if (!enabled && collator) { delete collator; - collator = NULL; + collator = nullptr; } } @@ -1422,7 +1422,7 @@ RuleBasedNumberFormat::setDefaultRuleSet(const UnicodeString& ruleSetName, UErro status = U_ILLEGAL_ARGUMENT_ERROR; } else { NFRuleSet* result = findRuleSet(ruleSetName, status); - if (result != NULL) { + if (result != nullptr) { defaultRuleSet = result; } } @@ -1443,7 +1443,7 @@ RuleBasedNumberFormat::getDefaultRuleSetName() const { void RuleBasedNumberFormat::initDefaultRuleSet() { - defaultRuleSet = NULL; + defaultRuleSet = nullptr; if (!fRuleSets) { return; } @@ -1480,7 +1480,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, LocalizationInfo* locali { // TODO: implement UParseError uprv_memset(&pErr, 0, sizeof(UParseError)); - // Note: this can leave ruleSets == NULL, so remaining code should check + // Note: this can leave ruleSets == nullptr, so remaining code should check if (U_FAILURE(status)) { return; } @@ -1492,7 +1492,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, LocalizationInfo* locali return; } - this->localizations = localizationInfos == NULL ? NULL : localizationInfos->ref(); + this->localizations = localizationInfos == nullptr ? nullptr : localizationInfos->ref(); UnicodeString description(rules); if (!description.length()) { @@ -1533,7 +1533,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, LocalizationInfo* locali // copy out the lenient-parse rules and delete them // from the description lenientParseRules = new UnicodeString(); - /* test for NULL */ + /* test for nullptr */ if (lenientParseRules == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -1556,14 +1556,14 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, LocalizationInfo* locali // our rule list is an array of the appropriate size fRuleSets = (NFRuleSet **)uprv_malloc((numRuleSets + 1) * sizeof(NFRuleSet *)); - /* test for NULL */ + /* test for nullptr */ if (fRuleSets == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; } for (int i = 0; i <= numRuleSets; ++i) { - fRuleSets[i] = NULL; + fRuleSets[i] = nullptr; } // divide up the descriptions into individual rule-set descriptions @@ -1638,7 +1638,7 @@ RuleBasedNumberFormat::init(const UnicodeString& rules, LocalizationInfo* locali for (int32_t i = 0; i < localizationInfos->getNumberOfRuleSets(); ++i) { UnicodeString name(true, localizationInfos->getRuleSetName(i), -1); NFRuleSet* rs = findRuleSet(name, status); - if (rs == NULL) { + if (rs == nullptr) { break; // error } if (i == 0) { @@ -1664,14 +1664,14 @@ RuleBasedNumberFormat::setContext(UDisplayContext value, UErrorCode& status) capitalizationInfoSet = true; } #if !UCONFIG_NO_BREAK_ITERATION - if ( capitalizationBrkIter == NULL && (value==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || + if ( capitalizationBrkIter == nullptr && (value==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || (value==UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU && capitalizationForUIListMenu) || (value==UDISPCTX_CAPITALIZATION_FOR_STANDALONE && capitalizationForStandAlone)) ) { status = U_ZERO_ERROR; capitalizationBrkIter = BreakIterator::createSentenceInstance(locale, status); if (U_FAILURE(status)) { delete capitalizationBrkIter; - capitalizationBrkIter = NULL; + capitalizationBrkIter = nullptr; } } #endif @@ -1682,15 +1682,15 @@ void RuleBasedNumberFormat::initCapitalizationContextInfo(const Locale& thelocale) { #if !UCONFIG_NO_BREAK_ITERATION - const char * localeID = (thelocale != NULL)? thelocale.getBaseName(): NULL; + const char * localeID = (thelocale != nullptr)? thelocale.getBaseName(): nullptr; UErrorCode status = U_ZERO_ERROR; - UResourceBundle *rb = ures_open(NULL, localeID, &status); + UResourceBundle *rb = ures_open(nullptr, localeID, &status); rb = ures_getByKeyWithFallback(rb, "contextTransforms", rb, &status); rb = ures_getByKeyWithFallback(rb, "number-spellout", rb, &status); - if (U_SUCCESS(status) && rb != NULL) { + if (U_SUCCESS(status) && rb != nullptr) { int32_t len = 0; const int32_t * intVector = ures_getIntVector(rb, &len, &status); - if (U_SUCCESS(status) && intVector != NULL && len >= 2) { + if (U_SUCCESS(status) && intVector != nullptr && len >= 2) { capitalizationForUIListMenu = static_cast(intVector[0]); capitalizationForStandAlone = static_cast(intVector[1]); } @@ -1748,34 +1748,34 @@ RuleBasedNumberFormat::dispose() delete *p; } uprv_free(fRuleSets); - fRuleSets = NULL; + fRuleSets = nullptr; } if (ruleSetDescriptions) { delete [] ruleSetDescriptions; - ruleSetDescriptions = NULL; + ruleSetDescriptions = nullptr; } #if !UCONFIG_NO_COLLATION delete collator; #endif - collator = NULL; + collator = nullptr; delete decimalFormatSymbols; - decimalFormatSymbols = NULL; + decimalFormatSymbols = nullptr; delete defaultInfinityRule; - defaultInfinityRule = NULL; + defaultInfinityRule = nullptr; delete defaultNaNRule; - defaultNaNRule = NULL; + defaultNaNRule = nullptr; delete lenientParseRules; - lenientParseRules = NULL; + lenientParseRules = nullptr; #if !UCONFIG_NO_BREAK_ITERATION delete capitalizationBrkIter; - capitalizationBrkIter = NULL; + capitalizationBrkIter = nullptr; #endif if (localizations) { @@ -1799,11 +1799,11 @@ RuleBasedNumberFormat::getCollator() const { #if !UCONFIG_NO_COLLATION if (!fRuleSets) { - return NULL; + return nullptr; } // lazy-evaluate the collator - if (collator == NULL && lenient) { + if (collator == nullptr && lenient) { // create a default collator based on the formatter's locale, // then pull out that collator's rules, append any additional // rules specified in the description, and create a _new_ @@ -1813,18 +1813,18 @@ RuleBasedNumberFormat::getCollator() const Collator* temp = Collator::createInstance(locale, status); RuleBasedCollator* newCollator; - if (U_SUCCESS(status) && (newCollator = dynamic_cast(temp)) != NULL) { + if (U_SUCCESS(status) && (newCollator = dynamic_cast(temp)) != nullptr) { if (lenientParseRules) { UnicodeString rules(newCollator->getRules()); rules.append(*lenientParseRules); newCollator = new RuleBasedCollator(rules, status); // Exit if newCollator could not be created. - if (newCollator == NULL) { - return NULL; + if (newCollator == nullptr) { + return nullptr; } } else { - temp = NULL; + temp = nullptr; } if (U_SUCCESS(status)) { newCollator->setAttribute(UCOL_DECOMPOSITION_MODE, UCOL_ON, status); @@ -1875,7 +1875,7 @@ RuleBasedNumberFormat::initializeDefaultInfinityRule(UErrorCode &status) if (U_FAILURE(status)) { return nullptr; } - if (defaultInfinityRule == NULL) { + if (defaultInfinityRule == nullptr) { UnicodeString rule(UNICODE_STRING_SIMPLE("Inf: ")); rule.append(getDecimalFormatSymbols()->getSymbol(DecimalFormatSymbols::kInfinitySymbol)); LocalPointer temp(new NFRule(this, rule, status), status); @@ -1919,11 +1919,11 @@ RuleBasedNumberFormat::getDefaultNaNRule() const void RuleBasedNumberFormat::adoptDecimalFormatSymbols(DecimalFormatSymbols* symbolsToAdopt) { - if (symbolsToAdopt == NULL) { - return; // do not allow caller to set decimalFormatSymbols to NULL + if (symbolsToAdopt == nullptr) { + return; // do not allow caller to set decimalFormatSymbols to nullptr } - if (decimalFormatSymbols != NULL) { + if (decimalFormatSymbols != nullptr) { delete decimalFormatSymbols; } @@ -1934,11 +1934,11 @@ RuleBasedNumberFormat::adoptDecimalFormatSymbols(DecimalFormatSymbols* symbolsTo UErrorCode status = U_ZERO_ERROR; delete defaultInfinityRule; - defaultInfinityRule = NULL; + defaultInfinityRule = nullptr; initializeDefaultInfinityRule(status); // Reset with the new DecimalFormatSymbols delete defaultNaNRule; - defaultNaNRule = NULL; + defaultNaNRule = nullptr; initializeDefaultNaNRule(status); // Reset with the new DecimalFormatSymbols if (fRuleSets) { diff --git a/icu4c/source/i18n/rbt.cpp b/icu4c/source/i18n/rbt.cpp index 86d6cbd8bda..2176e89fddc 100644 --- a/icu4c/source/i18n/rbt.cpp +++ b/icu4c/source/i18n/rbt.cpp @@ -27,7 +27,7 @@ U_NAMESPACE_BEGIN UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RuleBasedTransliterator) -static Replaceable *gLockedText = NULL; +static Replaceable *gLockedText = nullptr; void RuleBasedTransliterator::_construct(const UnicodeString& rules, UTransDirection direction, @@ -46,7 +46,7 @@ void RuleBasedTransliterator::_construct(const UnicodeString& rules, } if (parser.idBlockVector.size() != 0 || - parser.compoundFilter != NULL || + parser.compoundFilter != nullptr || parser.dataVector.size() == 0) { status = U_INVALID_RBT_SYNTAX; // ::ID blocks disallowed in RBT return; @@ -267,7 +267,7 @@ RuleBasedTransliterator::handleTransliterate(Replaceable& text, UTransPosition& } // Check to make sure we don't dereference a null pointer. - if (fData != NULL) { + if (fData != nullptr) { while (index.start < index.limit && loopCount <= loopLimit && fData->ruleSet.transliterate(text, index, isIncremental)) { @@ -277,7 +277,7 @@ RuleBasedTransliterator::handleTransliterate(Replaceable& text, UTransPosition& if (lockedMutexAtThisLevel) { { Mutex m; - gLockedText = NULL; + gLockedText = nullptr; } umtx_unlock(&transliteratorDataMutex); } diff --git a/icu4c/source/i18n/rbt_data.cpp b/icu4c/source/i18n/rbt_data.cpp index 866f0c2bfa1..f4212848cb5 100644 --- a/icu4c/source/i18n/rbt_data.cpp +++ b/icu4c/source/i18n/rbt_data.cpp @@ -50,7 +50,7 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData& UnicodeString* value = new UnicodeString(*(const UnicodeString*)e->value.pointer); // Exit out if value could not be created. - if (value == NULL) { + if (value == nullptr) { return; } variableNames.put(*(UnicodeString*)e->key.pointer, value, status); @@ -59,14 +59,14 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData& variables = 0; if (other.variables != 0) { variables = (UnicodeFunctor **)uprv_malloc(variablesLength * sizeof(UnicodeFunctor *)); - /* test for NULL */ + /* test for nullptr */ if (variables == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; } for (i=0; iclone(); - if (variables[i] == NULL) { + if (variables[i] == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -78,7 +78,7 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData& delete variables[n]; } uprv_free(variables); - variables = NULL; + variables = nullptr; return; } diff --git a/icu4c/source/i18n/rbt_data.h b/icu4c/source/i18n/rbt_data.h index 52a961dde01..39fea53d0dc 100644 --- a/icu4c/source/i18n/rbt_data.h +++ b/icu4c/source/i18n/rbt_data.h @@ -118,7 +118,7 @@ public: /** * Given a stand-in character, return the UnicodeFunctor that it - * represents, or NULL if it doesn't represent anything. + * represents, or nullptr if it doesn't represent anything. * @param standIn the given stand-in character. * @return the UnicodeFunctor that 'standIn' represents */ @@ -126,7 +126,7 @@ public: /** * Given a stand-in character, return the UnicodeMatcher that it - * represents, or NULL if it doesn't represent anything or if it + * represents, or nullptr if it doesn't represent anything or if it * represents something that is not a matcher. * @param standIn the given stand-in character. * @return return the UnicodeMatcher that 'standIn' represents @@ -135,7 +135,7 @@ public: /** * Given a stand-in character, return the UnicodeReplacer that it - * represents, or NULL if it doesn't represent anything or if it + * represents, or nullptr if it doesn't represent anything or if it * represents something that is not a replacer. * @param standIn the given stand-in character. * @return return the UnicodeReplacer that 'standIn' represents diff --git a/icu4c/source/i18n/rbt_pars.cpp b/icu4c/source/i18n/rbt_pars.cpp index f13bf1c227a..9933043bbae 100644 --- a/icu4c/source/i18n/rbt_pars.cpp +++ b/icu4c/source/i18n/rbt_pars.cpp @@ -191,7 +191,7 @@ const UnicodeString* ParseData::lookup(const UnicodeString& name) const { const UnicodeFunctor* ParseData::lookupMatcher(UChar32 ch) const { // Note that we cannot use data.lookupSet() because the // set array has not been constructed yet. - const UnicodeFunctor* set = NULL; + const UnicodeFunctor* set = nullptr; int32_t i = ch - data->variablesBase; if (i >= 0 && i < variablesVector->size()) { int32_t j = ch - data->variablesBase; @@ -231,7 +231,7 @@ UBool ParseData::isMatcher(UChar32 ch) { int32_t i = ch - data->variablesBase; if (i >= 0 && i < variablesVector->size()) { UnicodeFunctor *f = (UnicodeFunctor*) variablesVector->elementAt(i); - return f != NULL && f->toMatcher() != NULL; + return f != nullptr && f->toMatcher() != nullptr; } return true; } @@ -246,7 +246,7 @@ UBool ParseData::isReplacer(UChar32 ch) { int i = ch - data->variablesBase; if (i >= 0 && i < variablesVector->size()) { UnicodeFunctor *f = (UnicodeFunctor*) variablesVector->elementAt(i); - return f != NULL && f->toReplacer() != NULL; + return f != nullptr && f->toReplacer() != nullptr; } return true; } @@ -420,7 +420,7 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l // whitespace likely to be seen in code. continue; } - if (u_strchr(HALF_ENDERS, c) != NULL) { + if (u_strchr(HALF_ENDERS, c) != nullptr) { if (isSegment) { // Unclosed segment return syntaxError(U_UNCLOSED_SEGMENT, rule, start, status); @@ -538,7 +538,7 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l StringMatcher* m = new StringMatcher(buf, bufSegStart, buf.length(), segmentNumber, *parser.curData); - if (m == NULL) { + if (m == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } @@ -555,14 +555,14 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l TransliteratorIDParser::SingleID* single = TransliteratorIDParser::parseFilterID(rule, iref); // The next character MUST be a segment open - if (single == NULL || + if (single == nullptr || !ICU_Utility::parseChar(rule, iref, SEGMENT_OPEN)) { return syntaxError(U_INVALID_FUNCTION, rule, start, status); } Transliterator *t = single->createInstance(); delete single; - if (t == NULL) { + if (t == nullptr) { return syntaxError(U_INVALID_FUNCTION, rule, start, status); } @@ -579,7 +579,7 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l buf.extractBetween(bufSegStart, buf.length(), output); FunctionReplacer *r = new FunctionReplacer(t, new StringReplacer(output, parser.curData)); - if (r == NULL) { + if (r == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } @@ -673,7 +673,7 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l UnicodeFunctor *m = new StringMatcher(buf, qstart, qlimit, 0, *parser.curData); - if (m == NULL) { + if (m == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } int32_t min = 0; @@ -690,7 +690,7 @@ int32_t RuleHalf::parseSection(const UnicodeString& rule, int32_t pos, int32_t l // do nothing -- min, max already set } m = new Quantifier(m, min, max); - if (m == NULL) { + if (m == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } buf.truncate(qstart); @@ -833,9 +833,9 @@ variablesVector(statusReturn), segmentObjects(statusReturn) { idBlockVector.setDeleter(uprv_deleteUObject); - curData = NULL; - compoundFilter = NULL; - parseData = NULL; + curData = nullptr; + compoundFilter = nullptr; + parseData = nullptr; variableNames.setValueDeleter(uprv_deleteUObject); } @@ -867,7 +867,7 @@ TransliteratorParser::parse(const UnicodeString& rules, */ UnicodeSet* TransliteratorParser::orphanCompoundFilter() { UnicodeSet* f = compoundFilter; - compoundFilter = NULL; + compoundFilter = nullptr; return f; } @@ -902,26 +902,26 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, } idBlockVector.removeAllElements(); - curData = NULL; + curData = nullptr; direction = theDirection; ruleCount = 0; delete compoundFilter; - compoundFilter = NULL; + compoundFilter = nullptr; while (!variablesVector.isEmpty()) { delete (UnicodeFunctor*)variablesVector.orphanElementAt(0); } variableNames.removeAll(); parseData = new ParseData(0, &variablesVector, &variableNames); - if (parseData == NULL) { + if (parseData == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } dotStandIn = (UChar) -1; - UnicodeString *tempstr = NULL; // used for memory allocation error checking + UnicodeString *tempstr = nullptr; // used for memory allocation error checking UnicodeString str; // scratch UnicodeString idBlockResult; int32_t pos = 0; @@ -932,7 +932,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, // and it is the offset to the _start_ of the compound filter // pattern. Otherwise it is the offset to the _limit_ of the // compound filter pattern within idBlockResult. - compoundFilter = NULL; + compoundFilter = nullptr; int32_t compoundFilterOffset = -1; while (pos < limit && U_SUCCESS(status)) { @@ -974,7 +974,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, int32_t p = pos; if (!parsingIDs) { - if (curData != NULL) { + if (curData != nullptr) { U_ASSERT(!dataVector.hasDeleter()); if (direction == UTRANS_FORWARD) dataVector.addElement(curData, status); @@ -983,7 +983,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, if (U_FAILURE(status)) { delete curData; } - curData = NULL; + curData = nullptr; } parsingIDs = true; } @@ -1003,12 +1003,12 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, } else { // Couldn't parse an ID. Try to parse a global filter int32_t withParens = -1; - UnicodeSet* f = TransliteratorIDParser::parseGlobalFilter(rule, p, direction, withParens, NULL); - if (f != NULL) { + UnicodeSet* f = TransliteratorIDParser::parseGlobalFilter(rule, p, direction, withParens, nullptr); + if (f != nullptr) { if (ICU_Utility::parseChar(rule, p, END_OF_RULE) && (direction == UTRANS_FORWARD) == (withParens == 0)) { - if (compoundFilter != NULL) { + if (compoundFilter != nullptr) { // Multiple compound filters syntaxError(U_MULTIPLE_COMPOUND_FILTERS, rule, pos, status); delete f; @@ -1030,8 +1030,8 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, } else { if (parsingIDs) { tempstr = new UnicodeString(idBlockResult); - // NULL pointer check - if (tempstr == NULL) { + // nullptr pointer check + if (tempstr == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1046,8 +1046,8 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, idBlockResult.remove(); parsingIDs = false; curData = new TransliterationRuleData(status); - // NULL pointer check - if (curData == NULL) { + // nullptr pointer check + if (curData == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1075,8 +1075,8 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, if (parsingIDs && idBlockResult.length() > 0) { tempstr = new UnicodeString(idBlockResult); - // NULL pointer check - if (tempstr == NULL) { + // nullptr pointer check + if (tempstr == nullptr) { // TODO: Testing, forcing this path, shows many memory leaks. ICU-21701 // intltest translit/TransliteratorTest/TestInstantiation status = U_MEMORY_ALLOCATION_ERROR; @@ -1090,7 +1090,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, return; } } - else if (!parsingIDs && curData != NULL) { + else if (!parsingIDs && curData != nullptr) { if (direction == UTRANS_FORWARD) { dataVector.addElement(curData, status); } else { @@ -1112,8 +1112,8 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, data->variables = 0; } else { data->variables = (UnicodeFunctor**)uprv_malloc(data->variablesLength * sizeof(UnicodeFunctor*)); - // NULL pointer check - if (data->variables == NULL) { + // nullptr pointer check + if (data->variables == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1128,9 +1128,9 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, data->variableNames.removeAll(); int32_t p = UHASH_FIRST; const UHashElement* he = variableNames.nextElement(p); - while (he != NULL) { + while (he != nullptr) { UnicodeString* tempus = ((UnicodeString*)(he->value.pointer))->clone(); - if (tempus == NULL) { + if (tempus == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return; } @@ -1142,7 +1142,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, variablesVector.removeAllElements(); // keeps them from getting deleted when we succeed // Index the rules - if (compoundFilter != NULL) { + if (compoundFilter != nullptr) { if ((direction == UTRANS_FORWARD && compoundFilterOffset != 1) || (direction == UTRANS_REVERSE && compoundFilterOffset != ruleCount)) { status = U_MISPLACED_COMPOUND_FILTER; @@ -1218,7 +1218,7 @@ static const UChar PRAGMA_NFC_RULES[] = {0x7E,0x6E,0x66,0x63,0x20,0x72,0x75,0x6C */ UBool TransliteratorParser::resemblesPragma(const UnicodeString& rule, int32_t pos, int32_t limit) { // Must start with /use\s/i - return ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_USE, 4), NULL) >= 0; + return ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_USE, 4), nullptr) >= 0; } /** @@ -1255,13 +1255,13 @@ int32_t TransliteratorParser::parsePragma(const UnicodeString& rule, int32_t pos return p; } - p = ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_NFD_RULES, -1), NULL); + p = ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_NFD_RULES, -1), nullptr); if (p >= 0) { pragmaNormalizeRules(UNORM_NFD); return p; } - p = ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_NFC_RULES, -1), NULL); + p = ICU_Utility::parsePattern(rule, pos, limit, UnicodeString(true, PRAGMA_NFC_RULES, -1), nullptr); if (p >= 0) { pragmaNormalizeRules(UNORM_NFC); return p; @@ -1305,7 +1305,7 @@ int32_t TransliteratorParser::parseRule(const UnicodeString& rule, int32_t pos, return start; } - if (pos == limit || u_strchr(gOPERATORS, (op = rule.charAt(--pos))) == NULL) { + if (pos == limit || u_strchr(gOPERATORS, (op = rule.charAt(--pos))) == nullptr) { return syntaxError(U_MISSING_OPERATOR, rule, start, status); } ++pos; @@ -1366,8 +1366,8 @@ int32_t TransliteratorParser::parseRule(const UnicodeString& rule, int32_t pos, } // We allow anything on the right, including an empty string. UnicodeString* value = new UnicodeString(right->text); - // NULL pointer check - if (value == NULL) { + // nullptr pointer check + if (value == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } variableNames.put(undefinedVariableName, value, status); @@ -1393,7 +1393,7 @@ int32_t TransliteratorParser::parseRule(const UnicodeString& rule, int32_t pos, } } for (i=0; i 0) { segmentsArray = (UnicodeFunctor **)uprv_malloc(segmentObjects.size() * sizeof(UnicodeFunctor *)); // Null pointer check - if (segmentsArray == NULL) { + if (segmentsArray == nullptr) { return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } segmentObjects.toArray((void**) segmentsArray); @@ -1469,7 +1469,7 @@ int32_t TransliteratorParser::parseRule(const UnicodeString& rule, int32_t pos, curData, status); //Null pointer check - if (temptr == NULL) { + if (temptr == nullptr) { uprv_free(segmentsArray); return syntaxError(U_MEMORY_ALLOCATION_ERROR, rule, start, status); } @@ -1527,7 +1527,7 @@ UChar TransliteratorParser::parseSet(const UnicodeString& rule, UErrorCode& status) { UnicodeSet* set = new UnicodeSet(rule, pos, USET_IGNORE_SPACE, parseData, status); // Null pointer check - if (set == NULL) { + if (set == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return (UChar)0x0000; // Return empty character with error. } @@ -1582,7 +1582,7 @@ UChar TransliteratorParser::getSegmentStandin(int32_t seg, UErrorCode& status) { // Set a placeholder in the primary variables vector that will be // filled in later by setSegmentObject(). We know that we will get // called first because setSegmentObject() will call us. - variablesVector.addElement((void*) NULL, status); + variablesVector.addElement((void*) nullptr, status); segmentStandins.setCharAt(seg-1, c); } return c; @@ -1603,8 +1603,8 @@ void TransliteratorParser::setSegmentObject(int32_t seg, StringMatcher* adopted, return; } int32_t index = getSegmentStandin(seg, status) - curData->variablesBase; - if (segmentObjects.elementAt(seg-1) != NULL || - variablesVector.elementAt(index) != NULL) { + if (segmentObjects.elementAt(seg-1) != nullptr || + variablesVector.elementAt(index) != nullptr) { // should never happen if (U_SUCCESS(status)) {status = U_INTERNAL_TRANSLITERATOR_ERROR;} return; @@ -1622,7 +1622,7 @@ UChar TransliteratorParser::getDotStandIn(UErrorCode& status) { if (dotStandIn == (UChar) -1) { UnicodeSet* tempus = new UnicodeSet(UnicodeString(true, DOT_SET, -1), status); // Null pointer check. - if (tempus == NULL) { + if (tempus == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return (UChar)0x0000; } @@ -1639,7 +1639,7 @@ void TransliteratorParser::appendVariableDef(const UnicodeString& name, UnicodeString& buf, UErrorCode& status) { const UnicodeString* s = (const UnicodeString*) variableNames.get(name); - if (s == NULL) { + if (s == nullptr) { // We allow one undefined variable so that variable definition // statements work. For the first undefined variable we return // the special placeholder variableLimit-1, and save the variable diff --git a/icu4c/source/i18n/rbt_rule.cpp b/icu4c/source/i18n/rbt_rule.cpp index ee0d938ca95..27cdf9dd8e7 100644 --- a/icu4c/source/i18n/rbt_rule.cpp +++ b/icu4c/source/i18n/rbt_rule.cpp @@ -116,22 +116,22 @@ TransliterationRule::TransliterationRule(const UnicodeString& input, flags |= ANCHOR_END; } - anteContext = NULL; + anteContext = nullptr; if (anteContextLength > 0) { anteContext = new StringMatcher(pattern, 0, anteContextLength, false, *data); - /* test for NULL */ + /* test for nullptr */ if (anteContext == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; } } - key = NULL; + key = nullptr; if (keyLength > 0) { key = new StringMatcher(pattern, anteContextLength, anteContextLength + keyLength, false, *data); - /* test for NULL */ + /* test for nullptr */ if (key == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -139,11 +139,11 @@ TransliterationRule::TransliterationRule(const UnicodeString& input, } int32_t postContextLength = pattern.length() - keyLength - anteContextLength; - postContext = NULL; + postContext = nullptr; if (postContextLength > 0) { postContext = new StringMatcher(pattern, anteContextLength + keyLength, pattern.length(), false, *data); - /* test for NULL */ + /* test for nullptr */ if (postContext == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -151,7 +151,7 @@ TransliterationRule::TransliterationRule(const UnicodeString& input, } this->output = new StringReplacer(outputStr, cursorPosition + cursorOffset, data); - /* test for NULL */ + /* test for nullptr */ if (this->output == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -163,29 +163,29 @@ TransliterationRule::TransliterationRule(const UnicodeString& input, */ TransliterationRule::TransliterationRule(TransliterationRule& other) : UMemory(other), - anteContext(NULL), - key(NULL), - postContext(NULL), + anteContext(nullptr), + key(nullptr), + postContext(nullptr), pattern(other.pattern), anteContextLength(other.anteContextLength), keyLength(other.keyLength), flags(other.flags), data(other.data) { - segments = NULL; + segments = nullptr; segmentsCount = 0; if (other.segmentsCount > 0) { segments = (UnicodeFunctor **)uprv_malloc(other.segmentsCount * sizeof(UnicodeFunctor *)); uprv_memcpy(segments, other.segments, (size_t)other.segmentsCount*sizeof(segments[0])); } - if (other.anteContext != NULL) { + if (other.anteContext != nullptr) { anteContext = other.anteContext->clone(); } - if (other.key != NULL) { + if (other.key != nullptr) { key = other.key->clone(); } - if (other.postContext != NULL) { + if (other.postContext != nullptr) { postContext = other.postContext->clone(); } output = other.output->clone(); @@ -225,7 +225,7 @@ int16_t TransliterationRule::getIndexValue() const { return -1; } UChar32 c = pattern.char32At(anteContextLength); - return (int16_t)(data->lookupMatcher(c) == NULL ? (c & 0xFF) : -1); + return (int16_t)(data->lookupMatcher(c) == nullptr ? (c & 0xFF) : -1); } /** @@ -241,8 +241,8 @@ int16_t TransliterationRule::getIndexValue() const { UBool TransliterationRule::matchesIndexValue(uint8_t v) const { // Delegate to the key, or if there is none, to the postContext. // If there is neither then we match any key; return true. - UnicodeMatcher *m = (key != NULL) ? key : postContext; - return (m != NULL) ? m->matchesIndexValue(v) : true; + UnicodeMatcher *m = (key != nullptr) ? key : postContext; + return (m != nullptr) ? m->matchesIndexValue(v) : true; } /** @@ -361,7 +361,7 @@ UMatchDegree TransliterationRule::matchAndReplace(Replaceable& text, // ============================ MATCH =========================== // Reset segment match data - if (segments != NULL) { + if (segments != nullptr) { for (int32_t i=0; iresetMatch(); } @@ -391,7 +391,7 @@ UMatchDegree TransliterationRule::matchAndReplace(Replaceable& text, // Start reverse match at char before pos.start oText = posBefore(text, pos.start); - if (anteContext != NULL) { + if (anteContext != nullptr) { match = anteContext->matches(text, oText, anteLimit, false); if (match != U_MATCH) { return U_MISMATCH; @@ -410,7 +410,7 @@ UMatchDegree TransliterationRule::matchAndReplace(Replaceable& text, oText = pos.start; - if (key != NULL) { + if (key != nullptr) { match = key->matches(text, oText, pos.limit, incremental); if (match != U_MATCH) { return match; @@ -419,7 +419,7 @@ UMatchDegree TransliterationRule::matchAndReplace(Replaceable& text, keyLimit = oText; - if (postContext != NULL) { + if (postContext != nullptr) { if (incremental && keyLimit == pos.limit) { // The key matches just before pos.limit, and there is // a postContext. Since we are in incremental mode, @@ -477,7 +477,7 @@ UnicodeString& TransliterationRule::toRule(UnicodeString& rule, // Do not emit the braces '{' '}' around the pattern if there // is neither anteContext nor postContext. UBool emitBraces = - (anteContext != NULL) || (postContext != NULL); + (anteContext != nullptr) || (postContext != nullptr); // Emit start anchor if ((flags & ANCHOR_START) != 0) { @@ -518,10 +518,10 @@ UnicodeString& TransliterationRule::toRule(UnicodeString& rule, void TransliterationRule::setData(const TransliterationRuleData* d) { data = d; - if (anteContext != NULL) anteContext->setData(d); - if (postContext != NULL) postContext->setData(d); - if (key != NULL) key->setData(d); - // assert(output != NULL); + if (anteContext != nullptr) anteContext->setData(d); + if (postContext != nullptr) postContext->setData(d); + if (key != nullptr) key->setData(d); + // assert(output != nullptr); output->setData(d); // Don't have to do segments since they are in the context or key } @@ -536,7 +536,7 @@ void TransliterationRule::addSourceSetTo(UnicodeSet& toUnionTo) const { UChar32 ch = pattern.char32At(i); i += U16_LENGTH(ch); const UnicodeMatcher* matcher = data->lookupMatcher(ch); - if (matcher == NULL) { + if (matcher == nullptr) { toUnionTo.add(ch); } else { matcher->addMatchSetTo(toUnionTo); diff --git a/icu4c/source/i18n/rbt_rule.h b/icu4c/source/i18n/rbt_rule.h index b927f5d6c05..7ea39f7a353 100644 --- a/icu4c/source/i18n/rbt_rule.h +++ b/icu4c/source/i18n/rbt_rule.h @@ -108,7 +108,7 @@ private: UnicodeFunctor** segments; /** - * The number of elements in segments[] or zero if segments is NULL. + * The number of elements in segments[] or zero if segments is nullptr. */ int32_t segmentsCount; diff --git a/icu4c/source/i18n/rbt_set.cpp b/icu4c/source/i18n/rbt_set.cpp index c5174674361..29dde8a9bba 100644 --- a/icu4c/source/i18n/rbt_set.cpp +++ b/icu4c/source/i18n/rbt_set.cpp @@ -296,7 +296,7 @@ void TransliterationRuleSet::freeze(UParseError& parseError,UErrorCode& status) * Be careful not to call malloc(0). */ int16_t* indexValue = (int16_t*) uprv_malloc( sizeof(int16_t) * (n > 0 ? n : 1) ); - /* test for NULL */ + /* test for nullptr */ if (indexValue == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -336,11 +336,11 @@ void TransliterationRuleSet::freeze(UParseError& parseError,UErrorCode& status) /* You can't do malloc(0)! */ if (v.size() == 0) { - rules = NULL; + rules = nullptr; return; } rules = (TransliterationRule **)uprv_malloc(v.size() * sizeof(TransliterationRule *)); - /* test for NULL */ + /* test for nullptr */ if (rules == 0) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -417,7 +417,7 @@ UBool TransliterationRuleSet::transliterate(Replaceable& text, } // No match or partial match from any rule pos.start += U16_LENGTH(text.char32At(pos.start)); - _debugOut("no match", NULL, text, pos); + _debugOut("no match", nullptr, text, pos); return true; } diff --git a/icu4c/source/i18n/rbtz.cpp b/icu4c/source/i18n/rbtz.cpp index 0e174bab38a..fe4a0425ec7 100644 --- a/icu4c/source/i18n/rbtz.cpp +++ b/icu4c/source/i18n/rbtz.cpp @@ -39,9 +39,9 @@ deleteTransition(void* obj) { U_CDECL_END static UBool compareRules(UVector* rules1, UVector* rules2) { - if (rules1 == NULL && rules2 == NULL) { + if (rules1 == nullptr && rules2 == nullptr) { return true; - } else if (rules1 == NULL || rules2 == NULL) { + } else if (rules1 == nullptr || rules2 == nullptr) { return false; } int32_t size = rules1->size(); @@ -61,13 +61,13 @@ static UBool compareRules(UVector* rules1, UVector* rules2) { UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RuleBasedTimeZone) RuleBasedTimeZone::RuleBasedTimeZone(const UnicodeString& id, InitialTimeZoneRule* initialRule) -: BasicTimeZone(id), fInitialRule(initialRule), fHistoricRules(NULL), fFinalRules(NULL), - fHistoricTransitions(NULL), fUpToDate(false) { +: BasicTimeZone(id), fInitialRule(initialRule), fHistoricRules(nullptr), fFinalRules(nullptr), + fHistoricTransitions(nullptr), fUpToDate(false) { } RuleBasedTimeZone::RuleBasedTimeZone(const RuleBasedTimeZone& source) : BasicTimeZone(source), fInitialRule(source.fInitialRule->clone()), - fHistoricTransitions(NULL), fUpToDate(false) { + fHistoricTransitions(nullptr), fUpToDate(false) { fHistoricRules = copyRules(source.fHistoricRules); fFinalRules = copyRules(source.fFinalRules); if (source.fUpToDate) { @@ -180,23 +180,23 @@ RuleBasedTimeZone::complete(UErrorCode& status) { } // Make sure either no final rules or a pair of AnnualTimeZoneRules // are available. - if (fFinalRules != NULL && fFinalRules->size() != 2) { + if (fFinalRules != nullptr && fFinalRules->size() != 2) { status = U_INVALID_STATE_ERROR; return; } // Create a TimezoneTransition and add to the list - if (fHistoricRules != NULL || fFinalRules != NULL) { + if (fHistoricRules != nullptr || fFinalRules != nullptr) { TimeZoneRule *curRule = fInitialRule; UDate lastTransitionTime = MIN_MILLIS; // Build the transition array which represents historical time zone // transitions. - if (fHistoricRules != NULL && fHistoricRules->size() > 0) { + if (fHistoricRules != nullptr && fHistoricRules->size() > 0) { int32_t i; int32_t historicCount = fHistoricRules->size(); LocalMemory done((bool *)uprv_malloc(sizeof(bool) * historicCount)); - if (done == NULL) { + if (done == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; goto cleanup; } @@ -207,8 +207,8 @@ RuleBasedTimeZone::complete(UErrorCode& status) { int32_t curStdOffset = curRule->getRawOffset(); int32_t curDstSavings = curRule->getDSTSavings(); UDate nextTransitionTime = MAX_MILLIS; - TimeZoneRule *nextRule = NULL; - TimeZoneRule *r = NULL; + TimeZoneRule *nextRule = nullptr; + TimeZoneRule *r = nullptr; UBool avail; UDate tt; UnicodeString curName, name; @@ -237,7 +237,7 @@ RuleBasedTimeZone::complete(UErrorCode& status) { } } - if (nextRule == NULL) { + if (nextRule == nullptr) { // Check if all historic rules are done UBool bDoneAll = true; for (int32_t j = 0; j < historicCount; j++) { @@ -251,7 +251,7 @@ RuleBasedTimeZone::complete(UErrorCode& status) { } } - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { // Check if one of final rules has earlier transition date for (i = 0; i < 2 /* fFinalRules->size() */; i++) { TimeZoneRule *fr = (TimeZoneRule*)fFinalRules->elementAt(i); @@ -269,12 +269,12 @@ RuleBasedTimeZone::complete(UErrorCode& status) { } } - if (nextRule == NULL) { + if (nextRule == nullptr) { // Nothing more break; } - if (fHistoricTransitions == NULL) { + if (fHistoricTransitions == nullptr) { LocalPointer lpHistoricTransitions( new UVector(deleteTransition, nullptr, status), status); if (U_FAILURE(status)) { @@ -297,8 +297,8 @@ RuleBasedTimeZone::complete(UErrorCode& status) { curRule = nextRule; } } - if (fFinalRules != NULL) { - if (fHistoricTransitions == NULL) { + if (fFinalRules != nullptr) { + if (fHistoricTransitions == nullptr) { LocalPointer lpHistoricTransitions( new UVector(deleteTransition, nullptr, status), status); if (U_FAILURE(status)) { @@ -427,8 +427,8 @@ RuleBasedTimeZone::getOffsetInternal(UDate date, UBool local, status = U_INVALID_STATE_ERROR; return; } - const TimeZoneRule *rule = NULL; - if (fHistoricTransitions == NULL) { + const TimeZoneRule *rule = nullptr; + if (fHistoricTransitions == nullptr) { rule = fInitialRule; } else { UDate tstart = getTransitionTime((Transition*)fHistoricTransitions->elementAt(0), @@ -440,10 +440,10 @@ RuleBasedTimeZone::getOffsetInternal(UDate date, UBool local, UDate tend = getTransitionTime((Transition*)fHistoricTransitions->elementAt(idx), local, NonExistingTimeOpt, DuplicatedTimeOpt); if (date > tend) { - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { rule = findRuleInFinal(date, local, NonExistingTimeOpt, DuplicatedTimeOpt); } - if (rule == NULL) { + if (rule == nullptr) { // no final rules or the given time is before the first transition // specified by the final rules -> use the last rule rule = ((Transition*)fHistoricTransitions->elementAt(idx))->to; @@ -461,7 +461,7 @@ RuleBasedTimeZone::getOffsetInternal(UDate date, UBool local, } } } - if (rule != NULL) { + if (rule != nullptr) { rawOffset = rule->getRawOffset(); dstOffset = rule->getDSTSavings(); } @@ -578,10 +578,10 @@ RuleBasedTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTr int32_t RuleBasedTimeZone::countTransitionRules(UErrorCode& /*status*/) const { int32_t count = 0; - if (fHistoricRules != NULL) { + if (fHistoricRules != nullptr) { count += fHistoricRules->size(); } - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { count += fFinalRules->size(); } return count; @@ -601,14 +601,14 @@ RuleBasedTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial, // Transition rules int32_t cnt = 0; int32_t idx; - if (fHistoricRules != NULL && cnt < trscount) { + if (fHistoricRules != nullptr && cnt < trscount) { int32_t historicCount = fHistoricRules->size(); idx = 0; while (cnt < trscount && idx < historicCount) { trsrules[cnt++] = (const TimeZoneRule*)fHistoricRules->elementAt(idx++); } } - if (fFinalRules != NULL && cnt < trscount) { + if (fFinalRules != nullptr && cnt < trscount) { int32_t finalCount = fFinalRules->size(); idx = 0; while (cnt < trscount && idx < finalCount) { @@ -622,23 +622,23 @@ RuleBasedTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial, void RuleBasedTimeZone::deleteRules(void) { delete fInitialRule; - fInitialRule = NULL; - if (fHistoricRules != NULL) { + fInitialRule = nullptr; + if (fHistoricRules != nullptr) { delete fHistoricRules; - fHistoricRules = NULL; + fHistoricRules = nullptr; } - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { delete fFinalRules; - fFinalRules = NULL; + fFinalRules = nullptr; } } void RuleBasedTimeZone::deleteTransitions(void) { - if (fHistoricTransitions != NULL) { + if (fHistoricTransitions != nullptr) { delete fHistoricTransitions; } - fHistoricTransitions = NULL; + fHistoricTransitions = nullptr; } UVector* @@ -666,14 +666,14 @@ RuleBasedTimeZone::copyRules(UVector* source) { TimeZoneRule* RuleBasedTimeZone::findRuleInFinal(UDate date, UBool local, int32_t NonExistingTimeOpt, int32_t DuplicatedTimeOpt) const { - if (fFinalRules == NULL) { - return NULL; + if (fFinalRules == nullptr) { + return nullptr; } AnnualTimeZoneRule* fr0 = (AnnualTimeZoneRule*)fFinalRules->elementAt(0); AnnualTimeZoneRule* fr1 = (AnnualTimeZoneRule*)fFinalRules->elementAt(1); - if (fr0 == NULL || fr1 == NULL) { - return NULL; + if (fr0 == nullptr || fr1 == nullptr) { + return nullptr; } UDate start0, start1; @@ -705,7 +705,7 @@ RuleBasedTimeZone::findRuleInFinal(UDate date, UBool local, return fr1; } // Both rules take effect after the given time - return NULL; + return nullptr; } return (start0 > start1) ? fr0 : fr1; @@ -714,7 +714,7 @@ RuleBasedTimeZone::findRuleInFinal(UDate date, UBool local, UBool RuleBasedTimeZone::findNext(UDate base, UBool inclusive, UDate& transitionTime, TimeZoneRule*& fromRule, TimeZoneRule*& toRule) const { - if (fHistoricTransitions == NULL) { + if (fHistoricTransitions == nullptr) { return false; } UBool isFinal = false; @@ -733,7 +733,7 @@ RuleBasedTimeZone::findNext(UDate base, UBool inclusive, UDate& transitionTime, result = *tzt; found = true; } else if (tt <= base) { - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { // Find a transion time with finalRules TimeZoneRule *r0 = (TimeZoneRule*)fFinalRules->elementAt(0); TimeZoneRule *r1 = (TimeZoneRule*)fFinalRules->elementAt(1); @@ -798,7 +798,7 @@ RuleBasedTimeZone::findNext(UDate base, UBool inclusive, UDate& transitionTime, UBool RuleBasedTimeZone::findPrev(UDate base, UBool inclusive, UDate& transitionTime, TimeZoneRule*& fromRule, TimeZoneRule*& toRule) const { - if (fHistoricTransitions == NULL) { + if (fHistoricTransitions == nullptr) { return false; } UBool found = false; @@ -816,7 +816,7 @@ RuleBasedTimeZone::findPrev(UDate base, UBool inclusive, UDate& transitionTime, result = *tzt; found = true; } else if (tt < base) { - if (fFinalRules != NULL) { + if (fFinalRules != nullptr) { // Find a transion time with finalRules TimeZoneRule *r0 = (TimeZoneRule*)fFinalRules->elementAt(0); TimeZoneRule *r1 = (TimeZoneRule*)fFinalRules->elementAt(1); diff --git a/icu4c/source/i18n/regexcmp.cpp b/icu4c/source/i18n/regexcmp.cpp index adc8f700c7f..df315174ca8 100644 --- a/icu4c/source/i18n/regexcmp.cpp +++ b/icu4c/source/i18n/regexcmp.cpp @@ -73,7 +73,7 @@ RegexCompile::RegexCompile(RegexPattern *rxp, UErrorCode &status) : fMatchOpenParen = -1; fMatchCloseParen = -1; - fCaptureName = NULL; + fCaptureName = nullptr; fLastSetLiteral = U_SENTINEL; if (U_SUCCESS(status) && U_FAILURE(rxp->fDeferredStatus)) { @@ -91,7 +91,7 @@ static const UChar chDash = 0x2d; // '-' // //------------------------------------------------------------------------------ RegexCompile::~RegexCompile() { - delete fCaptureName; // Normally will be NULL, but can exist if pattern + delete fCaptureName; // Normally will be nullptr, but can exist if pattern // compilation stops with a syntax error. } @@ -141,7 +141,7 @@ void RegexCompile::compile( } // There should be no pattern stuff in the RegexPattern object. They can not be reused. - U_ASSERT(fRXPat->fPattern == NULL || utext_nativeLength(fRXPat->fPattern) == 0); + U_ASSERT(fRXPat->fPattern == nullptr || utext_nativeLength(fRXPat->fPattern) == 0); // Prepare the RegexPattern object to receive the compiled pattern. fRXPat->fPattern = utext_clone(fRXPat->fPattern, pat, false, true, fStatus); @@ -317,7 +317,7 @@ void RegexCompile::compile( int32_t numSets = fRXPat->fSets->size(); fRXPat->fSets8 = new Regex8BitSet[numSets]; // Null pointer check. - if (fRXPat->fSets8 == NULL) { + if (fRXPat->fSets8 == nullptr) { e = *fStatus = U_MEMORY_ALLOCATION_ERROR; return; } @@ -430,7 +430,7 @@ UBool RegexCompile::doParseActions(int32_t action) // Scanning (?fGroupMap->addElement(varsLoc, *fStatus); // If this is a named capture group, add the name->group number mapping. - if (fCaptureName != NULL) { + if (fCaptureName != nullptr) { if (!fRXPat->initNamedCaptureMap()) { if (U_SUCCESS(*fStatus)) { error(fRXPat->fDeferredStatus); @@ -490,7 +490,7 @@ UBool RegexCompile::doParseActions(int32_t action) } int32_t groupNumber = fRXPat->fGroupMap->size(); int32_t previousMapping = uhash_puti(fRXPat->fNamedCaptureMap, fCaptureName, groupNumber, fStatus); - fCaptureName = NULL; // hash table takes ownership of the name (key) string. + fCaptureName = nullptr; // hash table takes ownership of the name (key) string. if (previousMapping > 0 && U_SUCCESS(*fStatus)) { error(U_REGEX_INVALID_CAPTURE_GROUP_NAME); } @@ -1333,9 +1333,9 @@ UBool RegexCompile::doParseActions(int32_t action) break; case doBeginNamedBackRef: - U_ASSERT(fCaptureName == NULL); + U_ASSERT(fCaptureName == nullptr); fCaptureName = new UnicodeString; - if (fCaptureName == NULL) { + if (fCaptureName == nullptr) { error(U_MEMORY_ALLOCATION_ERROR); } break; @@ -1364,7 +1364,7 @@ UBool RegexCompile::doParseActions(int32_t action) } } delete fCaptureName; - fCaptureName = NULL; + fCaptureName = nullptr; break; } @@ -1820,7 +1820,7 @@ UBool RegexCompile::doParseActions(int32_t action) case doSetPosixProp: { UnicodeSet *s = scanPosixProp(); - if (s != NULL) { + if (s != nullptr) { UnicodeSet *tos = (UnicodeSet *)fSetStack.peek(); tos->addAll(*s); delete s; @@ -1832,7 +1832,7 @@ UBool RegexCompile::doParseActions(int32_t action) // Scanned a \p \P within [brackets]. { UnicodeSet *s = scanProp(); - if (s != NULL) { + if (s != nullptr) { UnicodeSet *tos = (UnicodeSet *)fSetStack.peek(); tos->addAll(*s); delete s; @@ -2390,7 +2390,7 @@ void RegexCompile::handleCloseParen() { //------------------------------------------------------------------------------ void RegexCompile::compileSet(UnicodeSet *theSet) { - if (theSet == NULL) { + if (theSet == nullptr) { return; } // Remove any strings from the set. @@ -4249,14 +4249,14 @@ UChar32 RegexCompile::scanNamedChar() { // the scan position should be just after the '}' // // Return a UnicodeSet, constructed from the \P pattern, -// or NULL if the pattern is invalid. +// or nullptr if the pattern is invalid. // //------------------------------------------------------------------------------ UnicodeSet *RegexCompile::scanProp() { - UnicodeSet *uset = NULL; + UnicodeSet *uset = nullptr; if (U_FAILURE(*fStatus)) { - return NULL; + return nullptr; } (void)chLowerP; // Suppress compiler unused variable warning. U_ASSERT(fC.fChar == chLowerP || fC.fChar == chP); @@ -4266,7 +4266,7 @@ UnicodeSet *RegexCompile::scanProp() { nextChar(fC); if (fC.fChar != chLBrace) { error(U_REGEX_PROPERTY_SYNTAX); - return NULL; + return nullptr; } for (;;) { nextChar(fC); @@ -4276,7 +4276,7 @@ UnicodeSet *RegexCompile::scanProp() { if (fC.fChar == -1) { // Hit the end of the input string without finding the closing '}' error(U_REGEX_PROPERTY_SYNTAX); - return NULL; + return nullptr; } propertyName.append(fC.fChar); } @@ -4294,7 +4294,7 @@ UnicodeSet *RegexCompile::scanProp() { // the scan position must be on the closing ']' // // Return a UnicodeSet constructed from the pattern, -// or NULL if this is not a valid POSIX-style set expression. +// or nullptr if this is not a valid POSIX-style set expression. // If not a property expression, restore the initial scan position // (to the opening ':') // @@ -4305,10 +4305,10 @@ UnicodeSet *RegexCompile::scanProp() { // //------------------------------------------------------------------------------ UnicodeSet *RegexCompile::scanPosixProp() { - UnicodeSet *uset = NULL; + UnicodeSet *uset = nullptr; if (U_FAILURE(*fStatus)) { - return NULL; + return nullptr; } U_ASSERT(fC.fChar == chColon); @@ -4412,7 +4412,7 @@ UnicodeSet *RegexCompile::createSetForProperty(const UnicodeString &propName, UB if (fModeFlags & UREGEX_CASE_INSENSITIVE) { usetFlags |= USET_CASE_INSENSITIVE; } - set.adoptInsteadAndCheckErrorCode(new UnicodeSet(setExpr, usetFlags, NULL, status), status); + set.adoptInsteadAndCheckErrorCode(new UnicodeSet(setExpr, usetFlags, nullptr, status), status); if (U_SUCCESS(status) || status == U_MEMORY_ALLOCATION_ERROR) { break; } @@ -4610,8 +4610,8 @@ UnicodeSet *RegexCompile::createSetForProperty(const UnicodeString &propName, UB // in the expression. // void RegexCompile::setEval(int32_t nextOp) { - UnicodeSet *rightOperand = NULL; - UnicodeSet *leftOperand = NULL; + UnicodeSet *rightOperand = nullptr; + UnicodeSet *leftOperand = nullptr; for (;;) { U_ASSERT(fSetOpStack.empty()==false); int32_t pendingSetOperation = fSetOpStack.peeki(); diff --git a/icu4c/source/i18n/regeximp.cpp b/icu4c/source/i18n/regeximp.cpp index d5556696258..764a6afc0eb 100644 --- a/icu4c/source/i18n/regeximp.cpp +++ b/icu4c/source/i18n/regeximp.cpp @@ -19,7 +19,7 @@ U_NAMESPACE_BEGIN CaseFoldingUTextIterator::CaseFoldingUTextIterator(UText &text) : - fUText(text), fFoldChars(NULL), fFoldLength(0) { + fUText(text), fFoldChars(nullptr), fFoldLength(0) { } CaseFoldingUTextIterator::~CaseFoldingUTextIterator() {} @@ -27,7 +27,7 @@ CaseFoldingUTextIterator::~CaseFoldingUTextIterator() {} UChar32 CaseFoldingUTextIterator::next() { UChar32 foldedC; UChar32 originalC; - if (fFoldChars == NULL) { + if (fFoldChars == nullptr) { // We are not in a string folding of an earlier character. // Start handling the next char from the input UText. originalC = UTEXT_NEXT32(&fUText); @@ -42,7 +42,7 @@ UChar32 CaseFoldingUTextIterator::next() { fFoldLength = ~fFoldLength; } foldedC = (UChar32)fFoldLength; - fFoldChars = NULL; + fFoldChars = nullptr; return foldedC; } // String foldings fall through here. @@ -51,20 +51,20 @@ UChar32 CaseFoldingUTextIterator::next() { U16_NEXT(fFoldChars, fFoldIndex, fFoldLength, foldedC); if (fFoldIndex >= fFoldLength) { - fFoldChars = NULL; + fFoldChars = nullptr; } return foldedC; } UBool CaseFoldingUTextIterator::inExpansion() { - return fFoldChars != NULL; + return fFoldChars != nullptr; } CaseFoldingUCharIterator::CaseFoldingUCharIterator(const UChar *chars, int64_t start, int64_t limit) : - fChars(chars), fIndex(start), fLimit(limit), fFoldChars(NULL), fFoldLength(0) { + fChars(chars), fIndex(start), fLimit(limit), fFoldChars(nullptr), fFoldLength(0) { } @@ -74,7 +74,7 @@ CaseFoldingUCharIterator::~CaseFoldingUCharIterator() {} UChar32 CaseFoldingUCharIterator::next() { UChar32 foldedC; UChar32 originalC; - if (fFoldChars == NULL) { + if (fFoldChars == nullptr) { // We are not in a string folding of an earlier character. // Start handling the next char from the input UText. if (fIndex >= fLimit) { @@ -90,7 +90,7 @@ UChar32 CaseFoldingUCharIterator::next() { fFoldLength = ~fFoldLength; } foldedC = (UChar32)fFoldLength; - fFoldChars = NULL; + fFoldChars = nullptr; return foldedC; } // String foldings fall through here. @@ -99,14 +99,14 @@ UChar32 CaseFoldingUCharIterator::next() { U16_NEXT(fFoldChars, fFoldIndex, fFoldLength, foldedC); if (fFoldIndex >= fFoldLength) { - fFoldChars = NULL; + fFoldChars = nullptr; } return foldedC; } UBool CaseFoldingUCharIterator::inExpansion() { - return fFoldChars != NULL; + return fFoldChars != nullptr; } int64_t CaseFoldingUCharIterator::getIndex() { diff --git a/icu4c/source/i18n/regeximp.h b/icu4c/source/i18n/regeximp.h index bb0e1e838de..a076b5ad04b 100644 --- a/icu4c/source/i18n/regeximp.h +++ b/icu4c/source/i18n/regeximp.h @@ -343,7 +343,7 @@ inline void Regex8BitSet::add(UChar32 c) { } inline void Regex8BitSet::init(const UnicodeSet *s) { - if (s != NULL) { + if (s != nullptr) { for (int32_t i=0; i<=255; i++) { if (s->contains(i)) { this->add(i); diff --git a/icu4c/source/i18n/region.cpp b/icu4c/source/i18n/region.cpp index 6a0c05fc78f..f4228613202 100644 --- a/icu4c/source/i18n/region.cpp +++ b/icu4c/source/i18n/region.cpp @@ -56,10 +56,10 @@ U_NAMESPACE_BEGIN static UInitOnce gRegionDataInitOnce {}; static UVector* availableRegions[URGN_LIMIT]; -static UHashtable *regionAliases = NULL; -static UHashtable *regionIDMap = NULL; -static UHashtable *numericCodeMap = NULL; -static UVector *allRegions = NULL; +static UHashtable *regionAliases = nullptr; +static UHashtable *regionIDMap = nullptr; +static UHashtable *numericCodeMap = nullptr; +static UVector *allRegions = nullptr; static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */ static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */ @@ -79,31 +79,31 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration) void U_CALLCONV Region::loadRegionData(UErrorCode &status) { // Construct service objs first - LocalUHashtablePointer newRegionIDMap(uhash_open(uhash_hashUnicodeString, uhash_compareUnicodeString, NULL, &status)); - LocalUHashtablePointer newNumericCodeMap(uhash_open(uhash_hashLong,uhash_compareLong,NULL,&status)); - LocalUHashtablePointer newRegionAliases(uhash_open(uhash_hashUnicodeString,uhash_compareUnicodeString,NULL,&status)); + LocalUHashtablePointer newRegionIDMap(uhash_open(uhash_hashUnicodeString, uhash_compareUnicodeString, nullptr, &status)); + LocalUHashtablePointer newNumericCodeMap(uhash_open(uhash_hashLong,uhash_compareLong,nullptr,&status)); + LocalUHashtablePointer newRegionAliases(uhash_open(uhash_hashUnicodeString,uhash_compareUnicodeString,nullptr,&status)); LocalPointer continents(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); LocalPointer groupings(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); LocalPointer lpAllRegions(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); allRegions = lpAllRegions.orphan(); - LocalUResourceBundlePointer metadata(ures_openDirect(NULL,"metadata",&status)); - LocalUResourceBundlePointer metadataAlias(ures_getByKey(metadata.getAlias(),"alias",NULL,&status)); - LocalUResourceBundlePointer territoryAlias(ures_getByKey(metadataAlias.getAlias(),"territory",NULL,&status)); + LocalUResourceBundlePointer metadata(ures_openDirect(nullptr,"metadata",&status)); + LocalUResourceBundlePointer metadataAlias(ures_getByKey(metadata.getAlias(),"alias",nullptr,&status)); + LocalUResourceBundlePointer territoryAlias(ures_getByKey(metadataAlias.getAlias(),"territory",nullptr,&status)); - LocalUResourceBundlePointer supplementalData(ures_openDirect(NULL,"supplementalData",&status)); - LocalUResourceBundlePointer codeMappings(ures_getByKey(supplementalData.getAlias(),"codeMappings",NULL,&status)); + LocalUResourceBundlePointer supplementalData(ures_openDirect(nullptr,"supplementalData",&status)); + LocalUResourceBundlePointer codeMappings(ures_getByKey(supplementalData.getAlias(),"codeMappings",nullptr,&status)); - LocalUResourceBundlePointer idValidity(ures_getByKey(supplementalData.getAlias(),"idValidity",NULL,&status)); - LocalUResourceBundlePointer regionList(ures_getByKey(idValidity.getAlias(),"region",NULL,&status)); - LocalUResourceBundlePointer regionRegular(ures_getByKey(regionList.getAlias(),"regular",NULL,&status)); - LocalUResourceBundlePointer regionMacro(ures_getByKey(regionList.getAlias(),"macroregion",NULL,&status)); - LocalUResourceBundlePointer regionUnknown(ures_getByKey(regionList.getAlias(),"unknown",NULL,&status)); + LocalUResourceBundlePointer idValidity(ures_getByKey(supplementalData.getAlias(),"idValidity",nullptr,&status)); + LocalUResourceBundlePointer regionList(ures_getByKey(idValidity.getAlias(),"region",nullptr,&status)); + LocalUResourceBundlePointer regionRegular(ures_getByKey(regionList.getAlias(),"regular",nullptr,&status)); + LocalUResourceBundlePointer regionMacro(ures_getByKey(regionList.getAlias(),"macroregion",nullptr,&status)); + LocalUResourceBundlePointer regionUnknown(ures_getByKey(regionList.getAlias(),"unknown",nullptr,&status)); - LocalUResourceBundlePointer territoryContainment(ures_getByKey(supplementalData.getAlias(),"territoryContainment",NULL,&status)); - LocalUResourceBundlePointer worldContainment(ures_getByKey(territoryContainment.getAlias(),"001",NULL,&status)); - LocalUResourceBundlePointer groupingContainment(ures_getByKey(territoryContainment.getAlias(),"grouping",NULL,&status)); + LocalUResourceBundlePointer territoryContainment(ures_getByKey(supplementalData.getAlias(),"territoryContainment",nullptr,&status)); + LocalUResourceBundlePointer worldContainment(ures_getByKey(territoryContainment.getAlias(),"001",nullptr,&status)); + LocalUResourceBundlePointer groupingContainment(ures_getByKey(territoryContainment.getAlias(),"grouping",nullptr,&status)); ucln_i18n_registerCleanup(UCLN_I18N_REGION, region_cleanup); if (U_FAILURE(status)) { @@ -116,7 +116,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { while (U_SUCCESS(status) && ures_hasNext(regionRegular.getAlias())) { - UnicodeString regionName = ures_getNextUnicodeString(regionRegular.getAlias(),NULL,&status); + UnicodeString regionName = ures_getNextUnicodeString(regionRegular.getAlias(),nullptr,&status); int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER); UChar buf[6]; regionName.extract(buf,6,status); @@ -135,7 +135,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { } while (U_SUCCESS(status) && ures_hasNext(regionMacro.getAlias())) { - UnicodeString regionName = ures_getNextUnicodeString(regionMacro.getAlias(),NULL,&status); + UnicodeString regionName = ures_getNextUnicodeString(regionMacro.getAlias(),nullptr,&status); int32_t rangeMarkerLocation = regionName.indexOf(RANGE_MARKER); UChar buf[6]; regionName.extract(buf,6,status); @@ -160,7 +160,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { } while (U_SUCCESS(status) && ures_hasNext(worldContainment.getAlias())) { - UnicodeString *continentName = new UnicodeString(ures_getNextUnicodeString(worldContainment.getAlias(),NULL,&status)); + UnicodeString *continentName = new UnicodeString(ures_getNextUnicodeString(worldContainment.getAlias(),nullptr,&status)); continents->adoptElement(continentName,status); } if (U_FAILURE(status)) { @@ -204,11 +204,11 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { break; } Region *grouping = (Region *) uhash_get(newRegionIDMap.getAlias(), groupingName); - if (grouping != NULL) { + if (grouping != nullptr) { for (int32_t i = 0; i < ures_getSize(groupingBundle) && U_SUCCESS(status); i++) { UnicodeString child = ures_getUnicodeStringByIndex(groupingBundle, i, &status); if (U_SUCCESS(status)) { - if (grouping->containedRegions == NULL) { + if (grouping->containedRegions == nullptr) { LocalPointer lpContainedRegions( new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); grouping->containedRegions = lpContainedRegions.orphan(); @@ -226,19 +226,19 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { // Process the territory aliases while (U_SUCCESS(status) && ures_hasNext(territoryAlias.getAlias())) { - LocalUResourceBundlePointer res(ures_getNextResource(territoryAlias.getAlias(),NULL,&status)); + LocalUResourceBundlePointer res(ures_getNextResource(territoryAlias.getAlias(),nullptr,&status)); const char *aliasFrom = ures_getKey(res.getAlias()); LocalPointer aliasFromStr(new UnicodeString(aliasFrom, -1, US_INV), status); UnicodeString aliasTo = ures_getUnicodeStringByKey(res.getAlias(),"replacement",&status); - res.adoptInstead(NULL); + res.adoptInstead(nullptr); const Region *aliasToRegion = (Region *) uhash_get(newRegionIDMap.getAlias(),&aliasTo); Region *aliasFromRegion = (Region *)uhash_get(newRegionIDMap.getAlias(),aliasFromStr.getAlias()); - if ( aliasToRegion != NULL && aliasFromRegion == NULL ) { // This is just an alias from some string to a region + if ( aliasToRegion != nullptr && aliasFromRegion == nullptr ) { // This is just an alias from some string to a region uhash_put(newRegionAliases.getAlias(),(void *)aliasFromStr.orphan(), (void *)aliasToRegion,&status); } else { - if ( aliasFromRegion == NULL ) { // Deprecated region code not in the primary codes list - so need to create a deprecated region for it. + if ( aliasFromRegion == nullptr ) { // Deprecated region code not in the primary codes list - so need to create a deprecated region for it. LocalPointer newRgn(new Region, status); if ( U_SUCCESS(status) ) { aliasFromRegion = newRgn.orphan(); @@ -288,7 +288,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { // Process the code mappings - This will allow us to assign numeric codes to most of the territories. while (U_SUCCESS(status) && ures_hasNext(codeMappings.getAlias())) { - UResourceBundle *mapping = ures_getNextResource(codeMappings.getAlias(),NULL,&status); + UResourceBundle *mapping = ures_getNextResource(codeMappings.getAlias(),nullptr,&status); if (U_SUCCESS(status) && ures_getType(mapping) == URES_ARRAY && ures_getSize(mapping) == 3) { UnicodeString codeMappingID = ures_getUnicodeStringByIndex(mapping,0,&status); UnicodeString codeMappingNumber = ures_getUnicodeStringByIndex(mapping,1,&status); @@ -348,7 +348,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { // Load territory containment info from the supplemental data. while ( ures_hasNext(territoryContainment.getAlias()) ) { - LocalUResourceBundlePointer mapping(ures_getNextResource(territoryContainment.getAlias(),NULL,&status)); + LocalUResourceBundlePointer mapping(ures_getNextResource(territoryContainment.getAlias(),nullptr,&status)); if( U_FAILURE(status) ) { return; // error out } @@ -363,10 +363,10 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { for ( int j = 0 ; j < ures_getSize(mapping.getAlias()); j++ ) { UnicodeString child = ures_getUnicodeStringByIndex(mapping.getAlias(),j,&status); Region *childRegion = (Region *) uhash_get(newRegionIDMap.getAlias(),(void *)&child); - if ( parentRegion != NULL && childRegion != NULL ) { + if ( parentRegion != nullptr && childRegion != nullptr ) { // Add the child region to the set of regions contained by the parent - if (parentRegion->containedRegions == NULL) { + if (parentRegion->containedRegions == nullptr) { LocalPointer lpContainedRegions( new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); parentRegion->containedRegions = lpContainedRegions.orphan(); @@ -399,7 +399,7 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { int32_t pos = UHASH_FIRST; while ( const UHashElement* element = uhash_nextElement(newRegionIDMap.getAlias(),&pos)) { Region *ar = (Region *)element->value.pointer; - if ( availableRegions[ar->fType] == NULL ) { + if ( availableRegions[ar->fType] == nullptr ) { LocalPointer newAr(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); availableRegions[ar->fType] = newAr.orphan(); } @@ -437,10 +437,10 @@ void Region::cleanupRegionData() { } if (allRegions) { delete allRegions; - allRegions = NULL; + allRegions = nullptr; } - regionAliases = numericCodeMap = regionIDMap = NULL; + regionAliases = numericCodeMap = regionIDMap = nullptr; gRegionDataInitOnce.reset(); } @@ -448,9 +448,9 @@ void Region::cleanupRegionData() { Region::Region () : code(-1), fType(URGN_UNKNOWN), - containingRegion(NULL), - containedRegions(NULL), - preferredValues(NULL) { + containingRegion(nullptr), + containedRegions(nullptr), + preferredValues(nullptr) { id[0] = 0; } @@ -485,19 +485,19 @@ Region::operator!=(const Region &that) const { * Returns a pointer to a Region using the given region code. The region code can be either 2-letter ISO code, * 3-letter ISO code, UNM.49 numeric code, or other valid Unicode Region Code as defined by the LDML specification. * The identifier will be canonicalized internally using the supplemental metadata as defined in the CLDR. - * If the region code is NULL or not recognized, the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ) + * If the region code is nullptr or not recognized, the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ) */ const Region* U_EXPORT2 Region::getInstance(const char *region_code, UErrorCode &status) { umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } if ( !region_code ) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } UnicodeString regionCodeString = UnicodeString(region_code, -1, US_INV); @@ -509,7 +509,7 @@ Region::getInstance(const char *region_code, UErrorCode &status) { if ( !r ) { // Unknown region code status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if ( r->fType == URGN_DEPRECATED && r->preferredValues->size() == 1) { @@ -533,7 +533,7 @@ Region::getInstance (int32_t code, UErrorCode &status) { umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); if (U_FAILURE(status)) { - return NULL; + return nullptr; } Region *r = (Region *)uhash_iget(numericCodeMap,code); @@ -545,12 +545,12 @@ Region::getInstance (int32_t code, UErrorCode &status) { } if( U_FAILURE(status) ) { - return NULL; + return nullptr; } if ( !r ) { status = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } if ( r->fType == URGN_DEPRECATED && r->preferredValues->size() == 1) { @@ -572,13 +572,13 @@ StringEnumeration* U_EXPORT2 Region::getAvailable(URegionType type, UErrorCode &status) { umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); // returns immediately if U_FAILURE(status) if (U_FAILURE(status)) { - return NULL; + return nullptr; } return new RegionNameEnumeration(availableRegions[type],status); } /** - * Returns a pointer to the region that contains this region. Returns NULL if this region is code "001" (World) + * Returns a pointer to the region that contains this region. Returns nullptr if this region is code "001" (World) * or "ZZ" (Unknown region). For example, calling this method with region "IT" (Italy) returns the * region "039" (Southern Europe). */ @@ -591,17 +591,17 @@ Region::getContainingRegion() const { /** * Return a pointer to the region that geographically contains this region and matches the given type, - * moving multiple steps up the containment chain if necessary. Returns NULL if no containing region can be found + * moving multiple steps up the containment chain if necessary. Returns nullptr if no containing region can be found * that matches the given type. Note: The URegionTypes = "URGN_GROUPING", "URGN_DEPRECATED", or "URGN_UNKNOWN" - * are not appropriate for use in this API. NULL will be returned in this case. For example, calling this method + * are not appropriate for use in this API. nullptr will be returned in this case. For example, calling this method * with region "IT" (Italy) for type "URGN_CONTINENT" returns the region "150" ( Europe ). */ const Region* Region::getContainingRegion(URegionType type) const { UErrorCode status = U_ZERO_ERROR; umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); - if ( containingRegion == NULL ) { - return NULL; + if ( containingRegion == nullptr ) { + return nullptr; } return ( containingRegion->fType == type)? containingRegion: containingRegion->getContainingRegion(type); @@ -610,7 +610,7 @@ Region::getContainingRegion(URegionType type) const { /** * Return an enumeration over the IDs of all the regions that are immediate children of this region in the * region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two, - * depending on the containment data as defined in CLDR. This API may return NULL if this region doesn't have + * depending on the containment data as defined in CLDR. This API may return nullptr if this region doesn't have * any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe) * and "155" (Western Europe). @@ -619,7 +619,7 @@ StringEnumeration* Region::getContainedRegions(UErrorCode &status) const { umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); // returns immediately if U_FAILURE(status) if (U_FAILURE(status)) { - return NULL; + return nullptr; } return new RegionNameEnumeration(containedRegions,status); } @@ -687,14 +687,14 @@ Region::contains(const Region &other) const { /** * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement - * regions for this region. Returns NULL for a non-deprecated region. For example, calling this method with region + * regions for this region. Returns nullptr for a non-deprecated region. For example, calling this method with region * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc... */ StringEnumeration* Region::getPreferredValues(UErrorCode &status) const { umtx_initOnce(gRegionDataInitOnce, &loadRegionData, status); // returns immediately if U_FAILURE(status) if (U_FAILURE(status) || fType != URGN_DEPRECATED) { - return NULL; + return nullptr; } return new RegionNameEnumeration(preferredValues,status); } @@ -741,11 +741,11 @@ RegionNameEnumeration::RegionNameEnumeration(UVector *nameList, UErrorCode& stat const UnicodeString* RegionNameEnumeration::snext(UErrorCode& status) { - if (U_FAILURE(status) || (fRegionNames==NULL)) { - return NULL; + if (U_FAILURE(status) || (fRegionNames==nullptr)) { + return nullptr; } const UnicodeString* nextStr = (const UnicodeString *)fRegionNames->elementAt(pos); - if (nextStr!=NULL) { + if (nextStr!=nullptr) { pos++; } return nextStr; @@ -758,7 +758,7 @@ RegionNameEnumeration::reset(UErrorCode& /*status*/) { int32_t RegionNameEnumeration::count(UErrorCode& /*status*/) const { - return (fRegionNames==NULL) ? 0 : fRegionNames->size(); + return (fRegionNames==nullptr) ? 0 : fRegionNames->size(); } RegionNameEnumeration::~RegionNameEnumeration() { diff --git a/icu4c/source/i18n/reldtfmt.cpp b/icu4c/source/i18n/reldtfmt.cpp index f381bf8981a..62c884ded7b 100644 --- a/icu4c/source/i18n/reldtfmt.cpp +++ b/icu4c/source/i18n/reldtfmt.cpp @@ -34,26 +34,26 @@ U_NAMESPACE_BEGIN struct URelativeString { int32_t offset; /** offset of this item, such as, the relative date **/ int32_t len; /** length of the string **/ - const UChar* string; /** string, or NULL if not set **/ + const UChar* string; /** string, or nullptr if not set **/ }; UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RelativeDateFormat) RelativeDateFormat::RelativeDateFormat(const RelativeDateFormat& other) : - DateFormat(other), fDateTimeFormatter(NULL), fDatePattern(other.fDatePattern), - fTimePattern(other.fTimePattern), fCombinedFormat(NULL), + DateFormat(other), fDateTimeFormatter(nullptr), fDatePattern(other.fDatePattern), + fTimePattern(other.fTimePattern), fCombinedFormat(nullptr), fDateStyle(other.fDateStyle), fLocale(other.fLocale), - fDatesLen(other.fDatesLen), fDates(NULL), + fDatesLen(other.fDatesLen), fDates(nullptr), fCombinedHasDateAtStart(other.fCombinedHasDateAtStart), fCapitalizationInfoSet(other.fCapitalizationInfoSet), fCapitalizationOfRelativeUnitsForUIListMenu(other.fCapitalizationOfRelativeUnitsForUIListMenu), fCapitalizationOfRelativeUnitsForStandAlone(other.fCapitalizationOfRelativeUnitsForStandAlone), - fCapitalizationBrkIter(NULL) + fCapitalizationBrkIter(nullptr) { - if(other.fDateTimeFormatter != NULL) { + if(other.fDateTimeFormatter != nullptr) { fDateTimeFormatter = other.fDateTimeFormatter->clone(); } - if(other.fCombinedFormat != NULL) { + if(other.fCombinedFormat != nullptr) { fCombinedFormat = new SimpleFormatter(*other.fCombinedFormat); } if (fDatesLen > 0) { @@ -61,7 +61,7 @@ RelativeDateFormat::RelativeDateFormat(const RelativeDateFormat& other) : uprv_memcpy(fDates, other.fDates, sizeof(fDates[0])*(size_t)fDatesLen); } #if !UCONFIG_NO_BREAK_ITERATION - if (other.fCapitalizationBrkIter != NULL) { + if (other.fCapitalizationBrkIter != nullptr) { fCapitalizationBrkIter = (other.fCapitalizationBrkIter)->clone(); } #endif @@ -69,11 +69,11 @@ RelativeDateFormat::RelativeDateFormat(const RelativeDateFormat& other) : RelativeDateFormat::RelativeDateFormat( UDateFormatStyle timeStyle, UDateFormatStyle dateStyle, const Locale& locale, UErrorCode& status) : - DateFormat(), fDateTimeFormatter(NULL), fDatePattern(), fTimePattern(), fCombinedFormat(NULL), - fDateStyle(dateStyle), fLocale(locale), fDatesLen(0), fDates(NULL), + DateFormat(), fDateTimeFormatter(nullptr), fDatePattern(), fTimePattern(), fCombinedFormat(nullptr), + fDateStyle(dateStyle), fLocale(locale), fDatesLen(0), fDates(nullptr), fCombinedHasDateAtStart(false), fCapitalizationInfoSet(false), fCapitalizationOfRelativeUnitsForUIListMenu(false), fCapitalizationOfRelativeUnitsForStandAlone(false), - fCapitalizationBrkIter(NULL) + fCapitalizationBrkIter(nullptr) { if(U_FAILURE(status) ) { return; @@ -91,7 +91,7 @@ RelativeDateFormat::RelativeDateFormat( UDateFormatStyle timeStyle, UDateFormatS if (baseDateStyle != UDAT_NONE) { df = createDateInstance((EStyle)baseDateStyle, locale); fDateTimeFormatter=dynamic_cast(df); - if (fDateTimeFormatter == NULL) { + if (fDateTimeFormatter == nullptr) { status = U_UNSUPPORTED_ERROR; return; } @@ -99,7 +99,7 @@ RelativeDateFormat::RelativeDateFormat( UDateFormatStyle timeStyle, UDateFormatS if (timeStyle != UDAT_NONE) { df = createTimeInstance((EStyle)timeStyle, locale); SimpleDateFormat *sdf = dynamic_cast(df); - if (sdf != NULL) { + if (sdf != nullptr) { sdf->toPattern(fTimePattern); delete sdf; } @@ -108,7 +108,7 @@ RelativeDateFormat::RelativeDateFormat( UDateFormatStyle timeStyle, UDateFormatS // does not matter whether timeStyle is UDAT_NONE, we need something for fDateTimeFormatter df = createTimeInstance((EStyle)timeStyle, locale); fDateTimeFormatter=dynamic_cast(df); - if (fDateTimeFormatter == NULL) { + if (fDateTimeFormatter == nullptr) { status = U_UNSUPPORTED_ERROR; delete df; return; @@ -117,7 +117,7 @@ RelativeDateFormat::RelativeDateFormat( UDateFormatStyle timeStyle, UDateFormatS } // Initialize the parent fCalendar, so that parse() works correctly. - initializeCalendar(NULL, locale, status); + initializeCalendar(nullptr, locale, status); loadDates(status); } @@ -165,16 +165,16 @@ UnicodeString& RelativeDateFormat::format( Calendar& cal, // look up string int32_t len = 0; const UChar *theString = getStringForDay(dayDiff, len, status); - if(U_SUCCESS(status) && (theString!=NULL)) { + if(U_SUCCESS(status) && (theString!=nullptr)) { // found a relative string relativeDayString.setTo(theString, len); } if ( relativeDayString.length() > 0 && !fDatePattern.isEmpty() && - (fTimePattern.isEmpty() || fCombinedFormat == NULL || fCombinedHasDateAtStart)) { + (fTimePattern.isEmpty() || fCombinedFormat == nullptr || fCombinedHasDateAtStart)) { #if !UCONFIG_NO_BREAK_ITERATION // capitalize relativeDayString according to context for relative, set formatter no context - if ( u_islower(relativeDayString.char32At(0)) && fCapitalizationBrkIter!= NULL && + if ( u_islower(relativeDayString.char32At(0)) && fCapitalizationBrkIter!= nullptr && ( capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || (capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU && fCapitalizationOfRelativeUnitsForUIListMenu) || (capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_STANDALONE && fCapitalizationOfRelativeUnitsForStandAlone) ) ) { @@ -191,7 +191,7 @@ UnicodeString& RelativeDateFormat::format( Calendar& cal, if (fDatePattern.isEmpty()) { fDateTimeFormatter->applyPattern(fTimePattern); fDateTimeFormatter->format(cal,appendTo,pos); - } else if (fTimePattern.isEmpty() || fCombinedFormat == NULL) { + } else if (fTimePattern.isEmpty() || fCombinedFormat == nullptr) { if (relativeDayString.length() > 0) { appendTo.append(relativeDayString); } else { @@ -243,12 +243,12 @@ void RelativeDateFormat::parse( const UnicodeString& text, // no date pattern, try parsing as time fDateTimeFormatter->applyPattern(fTimePattern); fDateTimeFormatter->parse(text,cal,pos); - } else if (fTimePattern.isEmpty() || fCombinedFormat == NULL) { + } else if (fTimePattern.isEmpty() || fCombinedFormat == nullptr) { // no time pattern or way to combine, try parsing as date // first check whether text matches a relativeDayString UBool matchedRelative = false; for (int n=0; n < fDatesLen && !matchedRelative; n++) { - if (fDates[n].string != NULL && + if (fDates[n].string != nullptr && text.compare(startIndex, fDates[n].len, fDates[n].string) == 0) { // it matched, handle the relative day string UErrorCode status = U_ZERO_ERROR; @@ -280,7 +280,7 @@ void RelativeDateFormat::parse( const UnicodeString& text, UErrorCode status = U_ZERO_ERROR; for (int n=0; n < fDatesLen; n++) { int32_t relativeStringOffset; - if (fDates[n].string != NULL && + if (fDates[n].string != nullptr && (relativeStringOffset = modifiedText.indexOf(fDates[n].string, fDates[n].len, startIndex)) >= startIndex) { // it matched, replace the relative date with a real one for parsing UnicodeString dateString; @@ -349,18 +349,18 @@ RelativeDateFormat::parse(const UnicodeString& text, UErrorCode& status) const const UChar *RelativeDateFormat::getStringForDay(int32_t day, int32_t &len, UErrorCode &status) const { if(U_FAILURE(status)) { - return NULL; + return nullptr; } // Is it inside the resource bundle's range? int n = day + UDAT_DIRECTION_THIS; if (n >= 0 && n < fDatesLen) { - if (fDates[n].offset == day && fDates[n].string != NULL) { + if (fDates[n].offset == day && fDates[n].string != nullptr) { len = fDates[n].len; return fDates[n].string; } } - return NULL; // not found. + return nullptr; // not found. } UnicodeString& @@ -370,7 +370,7 @@ RelativeDateFormat::toPattern(UnicodeString& result, UErrorCode& status) const result.remove(); if (fDatePattern.isEmpty()) { result.setTo(fTimePattern); - } else if (fTimePattern.isEmpty() || fCombinedFormat == NULL) { + } else if (fTimePattern.isEmpty() || fCombinedFormat == nullptr) { result.setTo(fDatePattern); } else { fCombinedFormat->format(fTimePattern, fDatePattern, result, status); @@ -427,14 +427,14 @@ RelativeDateFormat::setContext(UDisplayContext value, UErrorCode& status) fCapitalizationInfoSet = true; } #if !UCONFIG_NO_BREAK_ITERATION - if ( fCapitalizationBrkIter == NULL && (value==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || + if ( fCapitalizationBrkIter == nullptr && (value==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || (value==UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU && fCapitalizationOfRelativeUnitsForUIListMenu) || (value==UDISPCTX_CAPITALIZATION_FOR_STANDALONE && fCapitalizationOfRelativeUnitsForStandAlone)) ) { status = U_ZERO_ERROR; fCapitalizationBrkIter = BreakIterator::createSentenceInstance(fLocale, status); if (U_FAILURE(status)) { delete fCapitalizationBrkIter; - fCapitalizationBrkIter = NULL; + fCapitalizationBrkIter = nullptr; } } #endif @@ -445,17 +445,17 @@ void RelativeDateFormat::initCapitalizationContextInfo(const Locale& thelocale) { #if !UCONFIG_NO_BREAK_ITERATION - const char * localeID = (thelocale != NULL)? thelocale.getBaseName(): NULL; + const char * localeID = (thelocale != nullptr)? thelocale.getBaseName(): nullptr; UErrorCode status = U_ZERO_ERROR; - LocalUResourceBundlePointer rb(ures_open(NULL, localeID, &status)); + LocalUResourceBundlePointer rb(ures_open(nullptr, localeID, &status)); ures_getByKeyWithFallback(rb.getAlias(), "contextTransforms/relative", rb.getAlias(), &status); - if (U_SUCCESS(status) && rb != NULL) { + if (U_SUCCESS(status) && rb != nullptr) { int32_t len = 0; const int32_t * intVector = ures_getIntVector(rb.getAlias(), &len, &status); - if (U_SUCCESS(status) && intVector != NULL && len >= 2) { + if (U_SUCCESS(status) && intVector != nullptr && len >= 2) { fCapitalizationOfRelativeUnitsForUIListMenu = static_cast(intVector[0]); fCapitalizationOfRelativeUnitsForStandAlone = static_cast(intVector[1]); } @@ -477,7 +477,7 @@ struct RelDateFmtDataSink : public ResourceSink { RelDateFmtDataSink(URelativeString* fDates, int32_t len) : fDatesPtr(fDates), fDatesLen(len) { for (int32_t i = 0; i < fDatesLen; ++i) { fDatesPtr[i].offset = 0; - fDatesPtr[i].string = NULL; + fDatesPtr[i].string = nullptr; fDatesPtr[i].len = -1; } } @@ -495,7 +495,7 @@ struct RelDateFmtDataSink : public ResourceSink { // Put in the proper spot, but don't override existing data. n = offset + UDAT_DIRECTION_THIS; // Converts to index in UDAT_R - if (n < fDatesLen && fDatesPtr[n].string == NULL) { + if (n < fDatesLen && fDatesPtr[n].string == nullptr) { // Not found and n is an empty slot. fDatesPtr[n].offset = offset; fDatesPtr[n].string = value.getString(len, errorCode); @@ -516,11 +516,11 @@ static const UChar patItem1[] = {0x7B,0x31,0x7D}; // "{1}" static const int32_t patItem1Len = 3; void RelativeDateFormat::loadDates(UErrorCode &status) { - UResourceBundle *rb = ures_open(NULL, fLocale.getBaseName(), &status); + UResourceBundle *rb = ures_open(nullptr, fLocale.getBaseName(), &status); LocalUResourceBundlePointer dateTimePatterns( ures_getByKeyWithFallback(rb, "calendar/gregorian/DateTimePatterns", - (UResourceBundle*)NULL, &status)); + (UResourceBundle*)nullptr, &status)); if(U_SUCCESS(status)) { int32_t patternsSize = ures_getSize(dateTimePatterns.getAlias()); if (patternsSize > kDateTime) { @@ -567,7 +567,7 @@ RelativeDateFormat::initializeCalendar(TimeZone* adoptZone, const Locale& locale if(!U_FAILURE(status)) { fCalendar = Calendar::createInstance(adoptZone?adoptZone:TimeZone::createDefault(), locale, status); } - if (U_SUCCESS(status) && fCalendar == NULL) { + if (U_SUCCESS(status) && fCalendar == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } return fCalendar; diff --git a/icu4c/source/i18n/reldtfmt.h b/icu4c/source/i18n/reldtfmt.h index 98b333a02be..63ae8eb2381 100644 --- a/icu4c/source/i18n/reldtfmt.h +++ b/icu4c/source/i18n/reldtfmt.h @@ -273,7 +273,7 @@ private: * Get the string at a specific offset. * @param day day offset ( -1, 0, 1, etc.. ) * @param len on output, length of string. - * @return the string, or NULL if none at that location. + * @return the string, or nullptr if none at that location. */ const UChar *getStringForDay(int32_t day, int32_t &len, UErrorCode &status) const; @@ -294,7 +294,7 @@ private: /** * initializes fCalendar from parameters. Returns fCalendar as a convenience. - * @param adoptZone Zone to be adopted, or NULL for TimeZone::createDefault(). + * @param adoptZone Zone to be adopted, or nullptr for TimeZone::createDefault(). * @param locale Locale of the calendar * @param status Error code * @return the newly constructed fCalendar diff --git a/icu4c/source/i18n/rematch.cpp b/icu4c/source/i18n/rematch.cpp index e74ca3a659f..2e558a24574 100644 --- a/icu4c/source/i18n/rematch.cpp +++ b/icu4c/source/i18n/rematch.cpp @@ -73,7 +73,7 @@ RegexMatcher::RegexMatcher(const RegexPattern *pat) { if (U_FAILURE(fDeferredStatus)) { return; } - if (pat==NULL) { + if (pat==nullptr) { fDeferredStatus = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -157,12 +157,12 @@ RegexMatcher::~RegexMatcher() { delete fStack; if (fData != fSmallData) { uprv_free(fData); - fData = NULL; + fData = nullptr; } if (fPatternOwned) { delete fPatternOwned; - fPatternOwned = NULL; - fPattern = NULL; + fPatternOwned = nullptr; + fPattern = nullptr; } if (fInput) { @@ -189,8 +189,8 @@ RegexMatcher::~RegexMatcher() { // to run safely. // void RegexMatcher::init(UErrorCode &status) { - fPattern = NULL; - fPatternOwned = NULL; + fPattern = nullptr; + fPatternOwned = nullptr; fFrameSize = 0; fRegionStart = 0; fRegionLimit = 0; @@ -209,26 +209,26 @@ void RegexMatcher::init(UErrorCode &status) { fAppendPosition = 0; fHitEnd = false; fRequireEnd = false; - fStack = NULL; - fFrame = NULL; + fStack = nullptr; + fFrame = nullptr; fTimeLimit = 0; fTime = 0; fTickCounter = 0; fStackLimit = DEFAULT_BACKTRACK_STACK_CAPACITY; - fCallbackFn = NULL; - fCallbackContext = NULL; - fFindProgressCallbackFn = NULL; - fFindProgressCallbackContext = NULL; + fCallbackFn = nullptr; + fCallbackContext = nullptr; + fFindProgressCallbackFn = nullptr; + fFindProgressCallbackContext = nullptr; fTraceDebug = false; fDeferredStatus = status; fData = fSmallData; - fWordBreakItr = NULL; - fGCBreakItr = NULL; + fWordBreakItr = nullptr; + fGCBreakItr = nullptr; - fStack = NULL; - fInputText = NULL; - fAltInputText = NULL; - fInput = NULL; + fStack = nullptr; + fInputText = nullptr; + fAltInputText = nullptr; + fInput = nullptr; fInputLength = 0; fInputUniStrMaybeMutable = false; } @@ -245,14 +245,14 @@ void RegexMatcher::init2(UText *input, UErrorCode &status) { if (fPattern->fDataSize > UPRV_LENGTHOF(fSmallData)) { fData = (int64_t *)uprv_malloc(fPattern->fDataSize * sizeof(int64_t)); - if (fData == NULL) { + if (fData == nullptr) { status = fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; return; } } fStack = new UVector64(status); - if (fStack == NULL) { + if (fStack == nullptr) { status = fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; return; } @@ -326,10 +326,10 @@ RegexMatcher &RegexMatcher::appendReplacement(UText *dest, len16 = (int32_t)(fMatchStart-fAppendPosition); } else { UErrorCode lengthStatus = U_ZERO_ERROR; - len16 = utext_extract(fInputText, fAppendPosition, fMatchStart, NULL, 0, &lengthStatus); + len16 = utext_extract(fInputText, fAppendPosition, fMatchStart, nullptr, 0, &lengthStatus); } UChar *inputChars = (UChar *)uprv_malloc(sizeof(UChar)*(len16+1)); - if (inputChars == NULL) { + if (inputChars == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return *this; } @@ -524,12 +524,12 @@ UText *RegexMatcher::appendTail(UText *dest, UErrorCode &status) { if (UTEXT_USES_U16(fInputText)) { len16 = (int32_t)(fInputLength-fAppendPosition); } else { - len16 = utext_extract(fInputText, fAppendPosition, fInputLength, NULL, 0, &status); + len16 = utext_extract(fInputText, fAppendPosition, fInputLength, nullptr, 0, &status); status = U_ZERO_ERROR; // buffer overflow } UChar *inputChars = (UChar *)uprv_malloc(sizeof(UChar)*(len16)); - if (inputChars == NULL) { + if (inputChars == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; } else { utext_extract(fInputText, fAppendPosition, fInputLength, inputChars, len16, &status); // unterminated @@ -1220,14 +1220,14 @@ UnicodeString RegexMatcher::group(int32_t groupNum, UErrorCode &status) const { // Get the group length using a utext_extract preflight. // UText is actually pretty efficient at this when underlying encoding is UTF-16. - int32_t length = utext_extract(fInputText, groupStart, groupEnd, NULL, 0, &status); + int32_t length = utext_extract(fInputText, groupStart, groupEnd, nullptr, 0, &status); if (status != U_BUFFER_OVERFLOW_ERROR) { return result; } status = U_ZERO_ERROR; UChar *buf = result.getBuffer(length); - if (buf == NULL) { + if (buf == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; } else { int32_t extractLength = utext_extract(fInputText, groupStart, groupEnd, buf, length, &status); @@ -1257,11 +1257,11 @@ int64_t RegexMatcher::appendGroup(int32_t groupNum, UText *dest, UErrorCode &sta if (fMatch == false) { status = U_REGEX_INVALID_STATE; - return utext_replace(dest, destLen, destLen, NULL, 0, &status); + return utext_replace(dest, destLen, destLen, nullptr, 0, &status); } if (groupNum < 0 || groupNum > fPattern->fGroupMap->size()) { status = U_INDEX_OUTOFBOUNDS_ERROR; - return utext_replace(dest, destLen, destLen, NULL, 0, &status); + return utext_replace(dest, destLen, destLen, nullptr, 0, &status); } int64_t s, e; @@ -1278,7 +1278,7 @@ int64_t RegexMatcher::appendGroup(int32_t groupNum, UText *dest, UErrorCode &sta if (s < 0) { // A capture group wasn't part of the match - return utext_replace(dest, destLen, destLen, NULL, 0, &status); + return utext_replace(dest, destLen, destLen, nullptr, 0, &status); } U_ASSERT(s <= e); @@ -1292,10 +1292,10 @@ int64_t RegexMatcher::appendGroup(int32_t groupNum, UText *dest, UErrorCode &sta len16 = (int32_t)(e-s); } else { UErrorCode lengthStatus = U_ZERO_ERROR; - len16 = utext_extract(fInputText, s, e, NULL, 0, &lengthStatus); + len16 = utext_extract(fInputText, s, e, nullptr, 0, &lengthStatus); } UChar *groupChars = (UChar *)uprv_malloc(sizeof(UChar)*(len16+1)); - if (groupChars == NULL) { + if (groupChars == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } @@ -1361,7 +1361,7 @@ const UnicodeString &RegexMatcher::input() const { if (UTEXT_USES_U16(fInputText)) { len16 = (int32_t)fInputLength; } else { - len16 = utext_extract(fInputText, 0, fInputLength, NULL, 0, &status); + len16 = utext_extract(fInputText, 0, fInputLength, nullptr, 0, &status); status = U_ZERO_ERROR; // overflow, length status } UnicodeString *result = new UnicodeString(len16, 0, 0); @@ -1409,10 +1409,10 @@ UText *RegexMatcher::getInput (UText *dest, UErrorCode &status) const { input16Len = (int32_t)fInputLength; } else { UErrorCode lengthStatus = U_ZERO_ERROR; - input16Len = utext_extract(fInputText, 0, fInputLength, NULL, 0, &lengthStatus); // buffer overflow error + input16Len = utext_extract(fInputText, 0, fInputLength, nullptr, 0, &lengthStatus); // buffer overflow error } UChar *inputChars = (UChar *)uprv_malloc(sizeof(UChar)*(input16Len)); - if (inputChars == NULL) { + if (inputChars == nullptr) { return dest; } @@ -1425,7 +1425,7 @@ UText *RegexMatcher::getInput (UText *dest, UErrorCode &status) const { } return dest; } else { - return utext_clone(NULL, fInputText, false, true, &status); + return utext_clone(nullptr, fInputText, false, true, &status); } } @@ -1726,12 +1726,12 @@ UText *RegexMatcher::replaceAll(UText *replacement, UText *dest, UErrorCode &sta return dest; } - if (dest == NULL) { + if (dest == nullptr) { UnicodeString emptyString; UText empty = UTEXT_INITIALIZER; utext_openUnicodeString(&empty, &emptyString, &status); - dest = utext_clone(NULL, &empty, true, false, &status); + dest = utext_clone(nullptr, &empty, true, false, &status); utext_close(&empty); } @@ -1788,12 +1788,12 @@ UText *RegexMatcher::replaceFirst(UText *replacement, UText *dest, UErrorCode &s return getInput(dest, status); } - if (dest == NULL) { + if (dest == nullptr) { UnicodeString emptyString; UText empty = UTEXT_INITIALIZER; utext_openUnicodeString(&empty, &emptyString, &status); - dest = utext_clone(NULL, &empty, true, false, &status); + dest = utext_clone(nullptr, &empty, true, false, &status); utext_close(&empty); } @@ -1860,7 +1860,7 @@ RegexMatcher &RegexMatcher::reset(const UnicodeString &input) { reset(); delete fInput; - fInput = NULL; + fInput = nullptr; // Do the following for any UnicodeString. // This is for compatibility for those clients who modify the input string "live" during regex operations. @@ -1889,7 +1889,7 @@ RegexMatcher &RegexMatcher::reset(UText *input) { fInputLength = utext_nativeLength(fInputText); delete fInput; - fInput = NULL; + fInput = nullptr; #if UCONFIG_NO_BREAK_ITERATION==0 if (fWordBreakItr) { @@ -1935,7 +1935,7 @@ RegexMatcher &RegexMatcher::refreshInputText(UText *input, UErrorCode &status) { if (U_FAILURE(status)) { return *this; } - if (input == NULL) { + if (input == nullptr) { status = U_ILLEGAL_ARGUMENT_ERROR; return *this; } @@ -1951,7 +1951,7 @@ RegexMatcher &RegexMatcher::refreshInputText(UText *input, UErrorCode &status) { } utext_setNativeIndex(fInputText, pos); - if (fAltInputText != NULL) { + if (fAltInputText != nullptr) { pos = utext_getNativeIndex(fAltInputText); fAltInputText = utext_clone(fAltInputText, input, false, true, &status); if (U_FAILURE(status)) { @@ -1980,7 +1980,7 @@ void RegexMatcher::setTrace(UBool state) { * * @param src The source UText * @param dest The destination UText. Must be writable. - * May be NULL, in which case a new UText will be allocated. + * May be nullptr, in which case a new UText will be allocated. * @param start Start index of source substring. * @param limit Limit index of source substring. * @param status An error code. @@ -1991,13 +1991,13 @@ static UText *utext_extract_replace(UText *src, UText *dest, int64_t start, int6 } if (start == limit) { if (dest) { - utext_replace(dest, 0, utext_nativeLength(dest), NULL, 0, status); + utext_replace(dest, 0, utext_nativeLength(dest), nullptr, 0, status); return dest; } else { - return utext_openUChars(NULL, NULL, 0, status); + return utext_openUChars(nullptr, nullptr, 0, status); } } - int32_t length = utext_extract(src, start, limit, NULL, 0, status); + int32_t length = utext_extract(src, start, limit, nullptr, 0, status); if (*status != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(*status)) { return dest; } @@ -2005,7 +2005,7 @@ static UText *utext_extract_replace(UText *src, UText *dest, int64_t start, int6 MaybeStackArray buffer; if (length >= buffer.getCapacity()) { UChar *newBuf = buffer.resize(length+1); // Leave space for terminating Nul. - if (newBuf == NULL) { + if (newBuf == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; } } @@ -2018,18 +2018,18 @@ static UText *utext_extract_replace(UText *src, UText *dest, int64_t start, int6 // Caller did not provide a preexisting UText. // Open a new one, and have it adopt the text buffer storage. if (U_FAILURE(*status)) { - return NULL; + return nullptr; } int32_t ownedLength = 0; UChar *ownedBuf = buffer.orphanOrClone(length+1, ownedLength); - if (ownedBuf == NULL) { + if (ownedBuf == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - UText *result = utext_openUChars(NULL, ownedBuf, length, status); + UText *result = utext_openUChars(nullptr, ownedBuf, length, status); if (U_FAILURE(*status)) { uprv_free(ownedBuf); - return NULL; + return nullptr; } result->providerProperties |= (1 << UTEXT_PROVIDER_OWNS_TEXT); return result; @@ -2053,13 +2053,13 @@ int32_t RegexMatcher::split(const UnicodeString &input, } UText **destText = (UText **)uprv_malloc(sizeof(UText*)*destCapacity); - if (destText == NULL) { + if (destText == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; return 0; } int32_t i; for (i = 0; i < destCapacity; i++) { - destText[i] = utext_openUnicodeString(NULL, &dest[i], &status); + destText[i] = utext_openUnicodeString(nullptr, &dest[i], &status); } int32_t fieldCount = split(&inputText, destText, destCapacity, status); @@ -2126,15 +2126,15 @@ int32_t RegexMatcher::split(UText *input, UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, input->chunkContents+nextOutputStringStart, fActiveLimit-nextOutputStringStart, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } } else { UErrorCode lengthStatus = U_ZERO_ERROR; int32_t remaining16Length = - utext_extract(input, nextOutputStringStart, fActiveLimit, NULL, 0, &lengthStatus); + utext_extract(input, nextOutputStringStart, fActiveLimit, nullptr, 0, &lengthStatus); UChar *remainingChars = (UChar *)uprv_malloc(sizeof(UChar)*(remaining16Length+1)); - if (remainingChars == NULL) { + if (remainingChars == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -2145,7 +2145,7 @@ int32_t RegexMatcher::split(UText *input, } else { UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, remainingChars, remaining16Length, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } @@ -2166,14 +2166,14 @@ int32_t RegexMatcher::split(UText *input, UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, input->chunkContents+nextOutputStringStart, fMatchStart-nextOutputStringStart, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } } else { UErrorCode lengthStatus = U_ZERO_ERROR; - int32_t remaining16Length = utext_extract(input, nextOutputStringStart, fMatchStart, NULL, 0, &lengthStatus); + int32_t remaining16Length = utext_extract(input, nextOutputStringStart, fMatchStart, nullptr, 0, &lengthStatus); UChar *remainingChars = (UChar *)uprv_malloc(sizeof(UChar)*(remaining16Length+1)); - if (remainingChars == NULL) { + if (remainingChars == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -2183,7 +2183,7 @@ int32_t RegexMatcher::split(UText *input, } else { UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, remainingChars, remaining16Length, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } @@ -2212,8 +2212,8 @@ int32_t RegexMatcher::split(UText *input, // the delimiter at the end of input. if (i+1 < destCapacity) { ++i; - if (dest[i] == NULL) { - dest[i] = utext_openUChars(NULL, NULL, 0, &status); + if (dest[i] == nullptr) { + dest[i] = utext_openUChars(nullptr, nullptr, 0, &status); } else { static const UChar emptyString[] = {(UChar)0}; utext_replace(dest[i], 0, utext_nativeLength(dest[i]), emptyString, 0, &status); @@ -2236,14 +2236,14 @@ int32_t RegexMatcher::split(UText *input, UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, input->chunkContents+nextOutputStringStart, fActiveLimit-nextOutputStringStart, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } } else { UErrorCode lengthStatus = U_ZERO_ERROR; - int32_t remaining16Length = utext_extract(input, nextOutputStringStart, fActiveLimit, NULL, 0, &lengthStatus); + int32_t remaining16Length = utext_extract(input, nextOutputStringStart, fActiveLimit, nullptr, 0, &lengthStatus); UChar *remainingChars = (UChar *)uprv_malloc(sizeof(UChar)*(remaining16Length+1)); - if (remainingChars == NULL) { + if (remainingChars == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; break; } @@ -2254,7 +2254,7 @@ int32_t RegexMatcher::split(UText *input, } else { UText remainingText = UTEXT_INITIALIZER; utext_openUChars(&remainingText, remainingChars, remaining16Length, &status); - dest[i] = utext_clone(NULL, &remainingText, true, false, &status); + dest[i] = utext_clone(nullptr, &remainingText, true, false, &status); utext_close(&remainingText); } @@ -2516,7 +2516,7 @@ REStackFrame *RegexMatcher::resetStack() { REStackFrame *iFrame = (REStackFrame *)fStack->reserveBlock(fPattern->fFrameSize, fDeferredStatus); if(U_FAILURE(fDeferredStatus)) { - return NULL; + return nullptr; } int32_t i; @@ -2696,7 +2696,7 @@ int64_t RegexMatcher::followingGCBoundary(int64_t pos, UErrorCode &status) { void RegexMatcher::IncrementTime(UErrorCode &status) { fTickCounter = TIMER_INITIAL_VALUE; fTime++; - if (fCallbackFn != NULL) { + if (fCallbackFn != nullptr) { if ((*fCallbackFn)(fCallbackContext, fTime) == false) { status = U_REGEX_STOPPED_BY_CALLER; return; diff --git a/icu4c/source/i18n/remtrans.cpp b/icu4c/source/i18n/remtrans.cpp index 957ac480fbf..1dea638d8c6 100644 --- a/icu4c/source/i18n/remtrans.cpp +++ b/icu4c/source/i18n/remtrans.cpp @@ -50,7 +50,7 @@ RemoveTransliterator::~RemoveTransliterator() {} RemoveTransliterator* RemoveTransliterator::clone() const { RemoveTransliterator* result = new RemoveTransliterator(); - if (result != NULL && getFilter() != 0) { + if (result != nullptr && getFilter() != 0) { result->adoptFilter(getFilter()->clone()); } return result; diff --git a/icu4c/source/i18n/repattrn.cpp b/icu4c/source/i18n/repattrn.cpp index 0ef85bdf6ce..587a4d8b9c9 100644 --- a/icu4c/source/i18n/repattrn.cpp +++ b/icu4c/source/i18n/repattrn.cpp @@ -77,15 +77,15 @@ RegexPattern &RegexPattern::operator = (const RegexPattern &other) { return *this; } - if (other.fPatternString == NULL) { - fPatternString = NULL; + if (other.fPatternString == nullptr) { + fPatternString = nullptr; fPattern = utext_clone(fPattern, other.fPattern, false, true, &fDeferredStatus); } else { fPatternString = new UnicodeString(*(other.fPatternString)); - if (fPatternString == NULL) { + if (fPatternString == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; } else { - fPattern = utext_openConstUnicodeString(NULL, fPatternString, &fDeferredStatus); + fPattern = utext_openConstUnicodeString(nullptr, fPatternString, &fDeferredStatus); } } if (U_FAILURE(fDeferredStatus)) { @@ -117,7 +117,7 @@ RegexPattern &RegexPattern::operator = (const RegexPattern &other) { int32_t i; int32_t numSets = other.fSets->size(); fSets8 = new Regex8BitSet[numSets]; - if (fSets8 == NULL) { + if (fSets8 == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; return *this; } @@ -127,7 +127,7 @@ RegexPattern &RegexPattern::operator = (const RegexPattern &other) { } UnicodeSet *sourceSet = (UnicodeSet *)other.fSets->elementAt(i); UnicodeSet *newSet = new UnicodeSet(*sourceSet); - if (newSet == NULL) { + if (newSet == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; break; } @@ -145,7 +145,7 @@ RegexPattern &RegexPattern::operator = (const RegexPattern &other) { const UnicodeString *name = (const UnicodeString *)hashEl->key.pointer; UnicodeString *key = new UnicodeString(*name); int32_t val = hashEl->value.integer; - if (key == NULL) { + if (key == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; } else { uhash_puti(fNamedCaptureMap, key, val, &fDeferredStatus); @@ -166,24 +166,24 @@ void RegexPattern::init() { fFlags = 0; fCompiledPat = 0; fLiteralText.remove(); - fSets = NULL; - fSets8 = NULL; + fSets = nullptr; + fSets8 = nullptr; fDeferredStatus = U_ZERO_ERROR; fMinMatchLen = 0; fFrameSize = 0; fDataSize = 0; - fGroupMap = NULL; + fGroupMap = nullptr; fStartType = START_NO_INFO; fInitialStringIdx = 0; fInitialStringLen = 0; - fInitialChars = NULL; + fInitialChars = nullptr; fInitialChar = 0; - fInitialChars8 = NULL; + fInitialChars8 = nullptr; fNeedsAltInput = false; - fNamedCaptureMap = NULL; + fNamedCaptureMap = nullptr; - fPattern = NULL; // will be set later - fPatternString = NULL; // may be set later + fPattern = nullptr; // will be set later + fPatternString = nullptr; // may be set later fCompiledPat = new UVector64(fDeferredStatus); fGroupMap = new UVector32(fDeferredStatus); fSets = new UVector(fDeferredStatus); @@ -192,8 +192,8 @@ void RegexPattern::init() { if (U_FAILURE(fDeferredStatus)) { return; } - if (fCompiledPat == NULL || fGroupMap == NULL || fSets == NULL || - fInitialChars == NULL || fInitialChars8 == NULL) { + if (fCompiledPat == nullptr || fGroupMap == nullptr || fSets == nullptr || + fInitialChars == nullptr || fInitialChars8 == nullptr) { fDeferredStatus = U_MEMORY_ALLOCATION_ERROR; return; } @@ -228,36 +228,36 @@ bool RegexPattern::initNamedCaptureMap() { //-------------------------------------------------------------------------- void RegexPattern::zap() { delete fCompiledPat; - fCompiledPat = NULL; + fCompiledPat = nullptr; int i; for (i=1; isize(); i++) { UnicodeSet *s; s = (UnicodeSet *)fSets->elementAt(i); - if (s != NULL) { + if (s != nullptr) { delete s; } } delete fSets; - fSets = NULL; + fSets = nullptr; delete[] fSets8; - fSets8 = NULL; + fSets8 = nullptr; delete fGroupMap; - fGroupMap = NULL; + fGroupMap = nullptr; delete fInitialChars; - fInitialChars = NULL; + fInitialChars = nullptr; delete fInitialChars8; - fInitialChars8 = NULL; - if (fPattern != NULL) { + fInitialChars8 = nullptr; + if (fPattern != nullptr) { utext_close(fPattern); - fPattern = NULL; + fPattern = nullptr; } - if (fPatternString != NULL) { + if (fPatternString != nullptr) { delete fPatternString; - fPatternString = NULL; + fPatternString = nullptr; } - if (fNamedCaptureMap != NULL) { + if (fNamedCaptureMap != nullptr) { uhash_close(fNamedCaptureMap); - fNamedCaptureMap = NULL; + fNamedCaptureMap = nullptr; } } @@ -293,13 +293,13 @@ RegexPattern *RegexPattern::clone() const { //-------------------------------------------------------------------------- bool RegexPattern::operator ==(const RegexPattern &other) const { if (this->fFlags == other.fFlags && this->fDeferredStatus == other.fDeferredStatus) { - if (this->fPatternString != NULL && other.fPatternString != NULL) { + if (this->fPatternString != nullptr && other.fPatternString != nullptr) { return *(this->fPatternString) == *(other.fPatternString); - } else if (this->fPattern == NULL) { - if (other.fPattern == NULL) { + } else if (this->fPattern == nullptr) { + if (other.fPattern == nullptr) { return true; } - } else if (other.fPattern != NULL) { + } else if (other.fPattern != nullptr) { UTEXT_SETNATIVEINDEX(this->fPattern, 0); UTEXT_SETNATIVEINDEX(other.fPattern, 0); return utext_equals(this->fPattern, other.fPattern); @@ -320,7 +320,7 @@ RegexPattern::compile(const UnicodeString ®ex, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } const uint32_t allFlags = UREGEX_CANON_EQ | UREGEX_CASE_INSENSITIVE | UREGEX_COMMENTS | @@ -329,23 +329,23 @@ RegexPattern::compile(const UnicodeString ®ex, if ((flags & ~allFlags) != 0) { status = U_REGEX_INVALID_FLAG; - return NULL; + return nullptr; } if ((flags & UREGEX_CANON_EQ) != 0) { status = U_REGEX_UNIMPLEMENTED; - return NULL; + return nullptr; } RegexPattern *This = new RegexPattern; - if (This == NULL) { + if (This == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } if (U_FAILURE(This->fDeferredStatus)) { status = This->fDeferredStatus; delete This; - return NULL; + return nullptr; } This->fFlags = flags; @@ -354,7 +354,7 @@ RegexPattern::compile(const UnicodeString ®ex, if (U_FAILURE(status)) { delete This; - This = NULL; + This = nullptr; } return This; @@ -371,7 +371,7 @@ RegexPattern::compile(UText *regex, UErrorCode &status) { if (U_FAILURE(status)) { - return NULL; + return nullptr; } const uint32_t allFlags = UREGEX_CANON_EQ | UREGEX_CASE_INSENSITIVE | UREGEX_COMMENTS | @@ -380,23 +380,23 @@ RegexPattern::compile(UText *regex, if ((flags & ~allFlags) != 0) { status = U_REGEX_INVALID_FLAG; - return NULL; + return nullptr; } if ((flags & UREGEX_CANON_EQ) != 0) { status = U_REGEX_UNIMPLEMENTED; - return NULL; + return nullptr; } RegexPattern *This = new RegexPattern; - if (This == NULL) { + if (This == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } if (U_FAILURE(This->fDeferredStatus)) { status = This->fDeferredStatus; delete This; - return NULL; + return nullptr; } This->fFlags = flags; @@ -405,7 +405,7 @@ RegexPattern::compile(UText *regex, if (U_FAILURE(status)) { delete This; - This = NULL; + This = nullptr; } return This; @@ -479,7 +479,7 @@ uint32_t RegexPattern::flags() const { RegexMatcher *RegexPattern::matcher(const UnicodeString &input, UErrorCode &status) const { RegexMatcher *retMatcher = matcher(status); - if (retMatcher != NULL) { + if (retMatcher != nullptr) { retMatcher->fDeferredStatus = status; retMatcher->reset(input); } @@ -493,20 +493,20 @@ RegexMatcher *RegexPattern::matcher(const UnicodeString &input, // //--------------------------------------------------------------------- RegexMatcher *RegexPattern::matcher(UErrorCode &status) const { - RegexMatcher *retMatcher = NULL; + RegexMatcher *retMatcher = nullptr; if (U_FAILURE(status)) { - return NULL; + return nullptr; } if (U_FAILURE(fDeferredStatus)) { status = fDeferredStatus; - return NULL; + return nullptr; } retMatcher = new RegexMatcher(this); - if (retMatcher == NULL) { + if (retMatcher == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } return retMatcher; } @@ -527,8 +527,8 @@ UBool U_EXPORT2 RegexPattern::matches(const UnicodeString ®ex, if (U_FAILURE(status)) {return false;} UBool retVal; - RegexPattern *pat = NULL; - RegexMatcher *matcher = NULL; + RegexPattern *pat = nullptr; + RegexMatcher *matcher = nullptr; pat = RegexPattern::compile(regex, 0, pe, status); matcher = pat->matcher(input, status); @@ -551,8 +551,8 @@ UBool U_EXPORT2 RegexPattern::matches(UText *regex, if (U_FAILURE(status)) {return false;} UBool retVal = false; - RegexPattern *pat = NULL; - RegexMatcher *matcher = NULL; + RegexPattern *pat = nullptr; + RegexMatcher *matcher = nullptr; pat = RegexPattern::compile(regex, 0, pe, status); matcher = pat->matcher(status); @@ -576,14 +576,14 @@ UBool U_EXPORT2 RegexPattern::matches(UText *regex, // //--------------------------------------------------------------------- UnicodeString RegexPattern::pattern() const { - if (fPatternString != NULL) { + if (fPatternString != nullptr) { return *fPatternString; - } else if (fPattern == NULL) { + } else if (fPattern == nullptr) { return UnicodeString(); } else { UErrorCode status = U_ZERO_ERROR; int64_t nativeLen = utext_nativeLength(fPattern); - int32_t len16 = utext_extract(fPattern, 0, nativeLen, NULL, 0, &status); // buffer overflow error + int32_t len16 = utext_extract(fPattern, 0, nativeLen, nullptr, 0, &status); // buffer overflow error UnicodeString result; status = U_ZERO_ERROR; @@ -604,10 +604,10 @@ UnicodeString RegexPattern::pattern() const { // //--------------------------------------------------------------------- UText *RegexPattern::patternText(UErrorCode &status) const { - if (U_FAILURE(status)) {return NULL;} + if (U_FAILURE(status)) {return nullptr;} status = U_ZERO_ERROR; - if (fPattern != NULL) { + if (fPattern != nullptr) { return fPattern; } else { RegexStaticSets::initGlobals(&status); @@ -850,7 +850,7 @@ void RegexPattern::dumpPattern() const { printf(" None\n"); } else { int32_t pos = UHASH_FIRST; - const UHashElement *el = NULL; + const UHashElement *el = nullptr; while ((el = uhash_nextElement(fNamedCaptureMap, &pos))) { const UnicodeString *name = (const UnicodeString *)el->key.pointer; int32_t number = el->value.integer; diff --git a/icu4c/source/i18n/rulebasedcollator.cpp b/icu4c/source/i18n/rulebasedcollator.cpp index a240295b679..319d30db5b3 100644 --- a/icu4c/source/i18n/rulebasedcollator.cpp +++ b/icu4c/source/i18n/rulebasedcollator.cpp @@ -74,7 +74,7 @@ FixedSortKeyByteSink::~FixedSortKeyByteSink() {} void FixedSortKeyByteSink::AppendBeyondCapacity(const char *bytes, int32_t /*n*/, int32_t length) { - // buffer_ != NULL && bytes != NULL && n > 0 && appended_ > capacity_ + // buffer_ != nullptr && bytes != nullptr && n > 0 && appended_ > capacity_ // Fill the buffer completely. int32_t available = capacity_ - length; if (available > 0) { @@ -108,7 +108,7 @@ CollationKeyByteSink::~CollationKeyByteSink() {} void CollationKeyByteSink::AppendBeyondCapacity(const char *bytes, int32_t n, int32_t length) { - // buffer_ != NULL && bytes != NULL && n > 0 && appended_ > capacity_ + // buffer_ != nullptr && bytes != nullptr && n > 0 && appended_ > capacity_ if (Resize(n, length)) { uprv_memcpy(buffer_ + length, bytes, n); } @@ -116,7 +116,7 @@ CollationKeyByteSink::AppendBeyondCapacity(const char *bytes, int32_t n, int32_t UBool CollationKeyByteSink::Resize(int32_t appendCapacity, int32_t length) { - if (buffer_ == NULL) { + if (buffer_ == nullptr) { return false; // allocation failed before already } int32_t newCapacity = 2 * capacity_; @@ -128,7 +128,7 @@ CollationKeyByteSink::Resize(int32_t appendCapacity, int32_t length) { newCapacity = 200; } uint8_t *newBuffer = key_.reallocate(newCapacity, length); - if (newBuffer == NULL) { + if (newBuffer == nullptr) { SetNotOk(); return false; } @@ -152,15 +152,15 @@ RuleBasedCollator::RuleBasedCollator(const RuleBasedCollator &other) RuleBasedCollator::RuleBasedCollator(const uint8_t *bin, int32_t length, const RuleBasedCollator *base, UErrorCode &errorCode) - : data(NULL), - settings(NULL), - tailoring(NULL), - cacheEntry(NULL), + : data(nullptr), + settings(nullptr), + tailoring(nullptr), + cacheEntry(nullptr), validLocale(""), explicitlySetAttributes(0), actualLocaleIsSameAsValid(false) { if(U_FAILURE(errorCode)) { return; } - if(bin == NULL || length == 0 || base == NULL) { + if(bin == nullptr || length == 0 || base == nullptr) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -204,9 +204,9 @@ RuleBasedCollator::adoptTailoring(CollationTailoring *t, UErrorCode &errorCode) t->deleteIfZeroRefCount(); return; } - U_ASSERT(settings == NULL && data == NULL && tailoring == NULL && cacheEntry == NULL); + U_ASSERT(settings == nullptr && data == nullptr && tailoring == nullptr && cacheEntry == nullptr); cacheEntry = new CollationCacheEntry(t->actualLocale, t); - if(cacheEntry == NULL) { + if(cacheEntry == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; t->deleteIfZeroRefCount(); return; @@ -246,8 +246,8 @@ RuleBasedCollator::operator==(const Collator& other) const { const RuleBasedCollator &o = static_cast(other); if(*settings != *o.settings) { return false; } if(data == o.data) { return true; } - UBool thisIsRoot = data->base == NULL; - UBool otherIsRoot = o.data->base == NULL; + UBool thisIsRoot = data->base == nullptr; + UBool otherIsRoot = o.data->base == nullptr; U_ASSERT(!thisIsRoot || !otherIsRoot); // otherwise their data pointers should be == if(thisIsRoot != otherIsRoot) { return false; } if((thisIsRoot || !tailoring->rules.isEmpty()) && @@ -274,7 +274,7 @@ RuleBasedCollator::operator==(const Collator& other) const { int32_t RuleBasedCollator::hashCode() const { int32_t h = settings->hashCode(); - if(data->base == NULL) { return h; } // root collator + if(data->base == nullptr) { return h; } // root collator // Do not rely on the rule string, see comments in operator==(). UErrorCode errorCode = U_ZERO_ERROR; LocalPointer set(getTailoredSet(errorCode)); @@ -321,7 +321,7 @@ RuleBasedCollator::getLocale(ULocDataLocaleType type, UErrorCode& errorCode) con const char * RuleBasedCollator::internalGetLocaleID(ULocDataLocaleType type, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { - return NULL; + return nullptr; } const Locale *result; switch(type) { @@ -334,9 +334,9 @@ RuleBasedCollator::internalGetLocaleID(ULocDataLocaleType type, UErrorCode &erro case ULOC_REQUESTED_LOCALE: default: errorCode = U_ILLEGAL_ARGUMENT_ERROR; - return NULL; + return nullptr; } - if(result->isBogus()) { return NULL; } + if(result->isBogus()) { return nullptr; } const char *id = result->getName(); return id[0] == 0 ? "root" : id; } @@ -366,17 +366,17 @@ RuleBasedCollator::getVersion(UVersionInfo version) const { UnicodeSet * RuleBasedCollator::getTailoredSet(UErrorCode &errorCode) const { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return nullptr; } UnicodeSet *tailored = new UnicodeSet(); - if(tailored == NULL) { + if(tailored == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - if(data->base != NULL) { + if(data->base != nullptr) { TailoredSet(tailored).forData(data, errorCode); if(U_FAILURE(errorCode)) { delete tailored; - return NULL; + return nullptr; } } return tailored; @@ -387,19 +387,19 @@ RuleBasedCollator::internalGetContractionsAndExpansions( UnicodeSet *contractions, UnicodeSet *expansions, UBool addPrefixes, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return; } - if(contractions != NULL) { + if(contractions != nullptr) { contractions->clear(); } - if(expansions != NULL) { + if(expansions != nullptr) { expansions->clear(); } - ContractionsAndExpansions(contractions, expansions, NULL, addPrefixes).forData(data, errorCode); + ContractionsAndExpansions(contractions, expansions, nullptr, addPrefixes).forData(data, errorCode); } void RuleBasedCollator::internalAddContractions(UChar32 c, UnicodeSet &set, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return; } - ContractionsAndExpansions(&set, NULL, NULL, false).forCodePoint(data, c, errorCode); + ContractionsAndExpansions(&set, nullptr, nullptr, false).forCodePoint(data, c, errorCode); } const CollationSettings & @@ -457,7 +457,7 @@ RuleBasedCollator::setAttribute(UColAttribute attr, UColAttributeValue value, } } CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings); - if(ownedSettings == NULL) { + if(ownedSettings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -532,7 +532,7 @@ RuleBasedCollator::setMaxVariable(UColReorderCode group, UErrorCode &errorCode) } } CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings); - if(ownedSettings == NULL) { + if(ownedSettings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return *this; } @@ -568,7 +568,7 @@ RuleBasedCollator::getVariableTop(UErrorCode & /*errorCode*/) const { uint32_t RuleBasedCollator::setVariableTop(const UChar *varTop, int32_t len, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return 0; } - if(varTop == NULL && len !=0) { + if(varTop == nullptr && len !=0) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -617,7 +617,7 @@ RuleBasedCollator::setVariableTop(uint32_t varTop, UErrorCode &errorCode) { varTop = v; if(varTop != settings->variableTop) { CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings); - if(ownedSettings == NULL) { + if(ownedSettings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -639,7 +639,7 @@ int32_t RuleBasedCollator::getReorderCodes(int32_t *dest, int32_t capacity, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return 0; } - if(capacity < 0 || (dest == NULL && capacity > 0)) { + if(capacity < 0 || (dest == nullptr && capacity > 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -657,7 +657,7 @@ void RuleBasedCollator::setReorderCodes(const int32_t *reorderCodes, int32_t length, UErrorCode &errorCode) { if(U_FAILURE(errorCode)) { return; } - if(length < 0 || (reorderCodes == NULL && length > 0)) { + if(length < 0 || (reorderCodes == nullptr && length > 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } @@ -672,7 +672,7 @@ RuleBasedCollator::setReorderCodes(const int32_t *reorderCodes, int32_t length, if(length == 1 && reorderCodes[0] == UCOL_REORDER_CODE_DEFAULT) { if(settings != &defaultSettings) { CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings); - if(ownedSettings == NULL) { + if(ownedSettings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -682,7 +682,7 @@ RuleBasedCollator::setReorderCodes(const int32_t *reorderCodes, int32_t length, return; } CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings); - if(ownedSettings == NULL) { + if(ownedSettings == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return; } @@ -726,7 +726,7 @@ RuleBasedCollator::compare(const UChar *left, int32_t leftLength, const UChar *right, int32_t rightLength, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return UCOL_EQUAL; } - if((left == NULL && leftLength != 0) || (right == NULL && rightLength != 0)) { + if((left == nullptr && leftLength != 0) || (right == nullptr && rightLength != 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return UCOL_EQUAL; } @@ -746,7 +746,7 @@ RuleBasedCollator::compareUTF8(const StringPiece &left, const StringPiece &right if(U_FAILURE(errorCode)) { return UCOL_EQUAL; } const uint8_t *leftBytes = reinterpret_cast(left.data()); const uint8_t *rightBytes = reinterpret_cast(right.data()); - if((leftBytes == NULL && !left.empty()) || (rightBytes == NULL && !right.empty())) { + if((leftBytes == nullptr && !left.empty()) || (rightBytes == nullptr && !right.empty())) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return UCOL_EQUAL; } @@ -758,7 +758,7 @@ RuleBasedCollator::internalCompareUTF8(const char *left, int32_t leftLength, const char *right, int32_t rightLength, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return UCOL_EQUAL; } - if((left == NULL && leftLength != 0) || (right == NULL && rightLength != 0)) { + if((left == nullptr && leftLength != 0) || (right == nullptr && rightLength != 0)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return UCOL_EQUAL; } @@ -809,7 +809,7 @@ public: UChar32 nextDecomposedCodePoint(const Normalizer2Impl &nfcImpl, UChar32 c) { if(index >= 0) { return c; } decomp = nfcImpl.getDecomposition(c, buffer, length); - if(decomp == NULL) { return c; } + if(decomp == nullptr) { return c; } index = 0; U16_NEXT_UNSAFE(decomp, index, c); return c; @@ -834,8 +834,8 @@ protected: virtual UChar32 nextRawCodePoint() override { if(s == limit) { return U_SENTINEL; } UChar32 c = *s++; - if(limit == NULL && c == 0) { - s = NULL; + if(limit == nullptr && c == 0) { + s = nullptr; return U_SENTINEL; } UChar trail; @@ -853,11 +853,11 @@ protected: class FCDUTF16NFDIterator : public UTF16NFDIterator { public: FCDUTF16NFDIterator(const Normalizer2Impl &nfcImpl, const UChar *text, const UChar *textLimit) - : UTF16NFDIterator(NULL, NULL) { + : UTF16NFDIterator(nullptr, nullptr) { UErrorCode errorCode = U_ZERO_ERROR; - const UChar *spanLimit = nfcImpl.makeFCD(text, textLimit, NULL, errorCode); + const UChar *spanLimit = nfcImpl.makeFCD(text, textLimit, nullptr, errorCode); if(U_FAILURE(errorCode)) { return; } - if(spanLimit == textLimit || (textLimit == NULL && *spanLimit == 0)) { + if(spanLimit == textLimit || (textLimit == nullptr && *spanLimit == 0)) { s = text; limit = spanLimit; } else { @@ -979,8 +979,8 @@ RuleBasedCollator::doCompare(const UChar *left, int32_t leftLength, const UChar *rightLimit; int32_t equalPrefixLength = 0; if(leftLength < 0) { - leftLimit = NULL; - rightLimit = NULL; + leftLimit = nullptr; + rightLimit = nullptr; UChar c; while((c = left[equalPrefixLength]) == right[equalPrefixLength]) { if(c == 0) { return UCOL_EQUAL; } @@ -1288,7 +1288,7 @@ RuleBasedCollator::getCollationKey(const UChar *s, int32_t length, CollationKey& if(U_FAILURE(errorCode)) { return key.setToBogus(); } - if(s == NULL && length != 0) { + if(s == nullptr && length != 0) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return key.setToBogus(); } @@ -1314,11 +1314,11 @@ RuleBasedCollator::getSortKey(const UnicodeString &s, int32_t RuleBasedCollator::getSortKey(const UChar *s, int32_t length, uint8_t *dest, int32_t capacity) const { - if((s == NULL && length != 0) || capacity < 0 || (dest == NULL && capacity > 0)) { + if((s == nullptr && length != 0) || capacity < 0 || (dest == nullptr && capacity > 0)) { return 0; } uint8_t noDest[1] = { 0 }; - if(dest == NULL) { + if(dest == nullptr) { // Distinguish pure preflighting from an allocation error. dest = noDest; capacity = 0; @@ -1333,7 +1333,7 @@ void RuleBasedCollator::writeSortKey(const UChar *s, int32_t length, SortKeyByteSink &sink, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return; } - const UChar *limit = (length >= 0) ? s + length : NULL; + const UChar *limit = (length >= 0) ? s + length : nullptr; UBool numeric = settings->isNumeric(); CollationKeys::LevelCallback callback; if(settings->dontCheckFCD()) { @@ -1358,7 +1358,7 @@ void RuleBasedCollator::writeIdenticalLevel(const UChar *s, const UChar *limit, SortKeyByteSink &sink, UErrorCode &errorCode) const { // NFD quick check - const UChar *nfdQCYesLimit = data->nfcImpl.decompose(s, limit, NULL, errorCode); + const UChar *nfdQCYesLimit = data->nfcImpl.decompose(s, limit, nullptr, errorCode); if(U_FAILURE(errorCode)) { return; } sink.Append(Collation::LEVEL_SEPARATOR_BYTE); UChar32 prev = 0; @@ -1367,7 +1367,7 @@ RuleBasedCollator::writeIdenticalLevel(const UChar *s, const UChar *limit, } // Is there non-NFD text? int32_t destLengthEstimate; - if(limit != NULL) { + if(limit != nullptr) { if(nfdQCYesLimit == limit) { return; } destLengthEstimate = (int32_t)(limit - nfdQCYesLimit); } else { @@ -1424,7 +1424,7 @@ int32_t RuleBasedCollator::internalNextSortKeyPart(UCharIterator *iter, uint32_t state[2], uint8_t *dest, int32_t count, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return 0; } - if(iter == NULL || state == NULL || count < 0 || (count > 0 && dest == NULL)) { + if(iter == nullptr || state == nullptr || count < 0 || (count > 0 && dest == nullptr)) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } @@ -1542,18 +1542,18 @@ RuleBasedCollator::internalGetShortDefinitionString(const char *locale, char *buffer, int32_t capacity, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return 0; } - if(buffer == NULL ? capacity != 0 : capacity < 0) { + if(buffer == nullptr ? capacity != 0 : capacity < 0) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return 0; } - if(locale == NULL) { + if(locale == nullptr) { locale = internalGetLocaleID(ULOC_VALID_LOCALE, errorCode); } char resultLocale[ULOC_FULLNAME_CAPACITY + 1]; int32_t length = ucol_getFunctionalEquivalent(resultLocale, ULOC_FULLNAME_CAPACITY, "collation", locale, - NULL, &errorCode); + nullptr, &errorCode); if(U_FAILURE(errorCode)) { return 0; } resultLocale[length] = 0; @@ -1623,11 +1623,11 @@ RuleBasedCollator::initMaxExpansions(UErrorCode &errorCode) const { CollationElementIterator * RuleBasedCollator::createCollationElementIterator(const UnicodeString& source) const { UErrorCode errorCode = U_ZERO_ERROR; - if(!initMaxExpansions(errorCode)) { return NULL; } + if(!initMaxExpansions(errorCode)) { return nullptr; } CollationElementIterator *cei = new CollationElementIterator(source, this, errorCode); if(U_FAILURE(errorCode)) { delete cei; - return NULL; + return nullptr; } return cei; } @@ -1635,11 +1635,11 @@ RuleBasedCollator::createCollationElementIterator(const UnicodeString& source) c CollationElementIterator * RuleBasedCollator::createCollationElementIterator(const CharacterIterator& source) const { UErrorCode errorCode = U_ZERO_ERROR; - if(!initMaxExpansions(errorCode)) { return NULL; } + if(!initMaxExpansions(errorCode)) { return nullptr; } CollationElementIterator *cei = new CollationElementIterator(source, this, errorCode); if(U_FAILURE(errorCode)) { delete cei; - return NULL; + return nullptr; } return cei; } diff --git a/icu4c/source/i18n/scientificnumberformatter.cpp b/icu4c/source/i18n/scientificnumberformatter.cpp index 99b990708ab..a9a3105bdb2 100644 --- a/icu4c/source/i18n/scientificnumberformatter.cpp +++ b/icu4c/source/i18n/scientificnumberformatter.cpp @@ -101,22 +101,22 @@ ScientificNumberFormatter *ScientificNumberFormatter::createInstance( LocalPointer fmt(fmtToAdopt); LocalPointer