diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:21:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:35 +0100 |
| commit | 26f05d59bc1c25b8a0d19be7f4738fd12e557001 (patch) | |
| tree | 560cccfaacf4b63385aa52ac4b3912248e87cbef /sal | |
| parent | 5bbdb9423e15b68438bb8397c15635e044129e28 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I1bc6c87fcd6e5e96362623be94c59be216a3b2b8
Diffstat (limited to 'sal')
99 files changed, 5979 insertions, 5979 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index 5fbd9c09be7d..13491bd3889f 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -109,14 +109,14 @@ static void* allocate ( for (;;) { void * p = rtl_allocateMemory (sal_Size(n)); - if (p != 0) + if (p != nullptr) return rTraits.init (p); std::new_handler d = default_handler, f = std::set_new_handler (d); if (f != d) std::set_new_handler (f); - if (f == 0) + if (f == nullptr) throw std::bad_alloc(); (*f)(); } @@ -131,7 +131,7 @@ static void* allocate_nothrow ( } catch (std::bad_alloc const &) { - return 0; + return nullptr; } } diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 95eecbe6baf2..34911e27e62c 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -414,10 +414,10 @@ SAL_IMPLEMENT_MAIN() std::exit(EXIT_FAILURE); } #endif - CppUnit::Protector *protector = fn == 0 - ? 0 + CppUnit::Protector *protector = fn == nullptr + ? nullptr : (*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))(); - if (protector == 0) { + if (protector == nullptr) { std::cerr << "Failure instantiating protector \"" << convertLazy(lib) << "\", \"" << convertLazy(sym) << '"' << std::endl; diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 0f233f8b637b..c0f0a63c0ccf 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -35,7 +35,7 @@ struct StaticDebugBaseAddressFilter : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> { OStringVec operator()() const { OStringVec vec; - rtl_uString * pStr = 0; + rtl_uString * pStr = nullptr; rtl::OUString const name( "OSL_DEBUGBASE_STORE_ADDRESSES" ); if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) { diff --git a/sal/osl/all/filepath.cxx b/sal/osl/all/filepath.cxx index 5390c9af8c35..c6d12caf11f5 100644 --- a/sal/osl/all/filepath.cxx +++ b/sal/osl/all/filepath.cxx @@ -28,8 +28,8 @@ static sal_uInt32 SAL_CALL osl_defCalcTextWidth( rtl_uString *ustrText ) oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrCompacted, sal_uInt32 uMaxWidth, oslCalcTextWidthFunc pfnCalcWidth ) { oslFileError error = osl_File_E_None; - rtl_uString *ustrPath = NULL; - rtl_uString *ustrFile = NULL; + rtl_uString *ustrPath = nullptr; + rtl_uString *ustrFile = nullptr; sal_uInt32 uPathWidth, uFileWidth; if ( !pfnCalcWidth ) diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx index a3dc71efe50b..ef3df35edc66 100644 --- a/sal/osl/all/loadmodulerelative.cxx +++ b/sal/osl/all/loadmodulerelative.cxx @@ -41,7 +41,7 @@ oslModule SAL_CALL osl_loadModuleRelative( rtl::OUString base; if (!osl::Module::getUrlFromAddress(baseModule, base)) { SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed"); - return NULL; + return nullptr; } rtl::OUString abs; try { @@ -51,7 +51,7 @@ oslModule SAL_CALL osl_loadModuleRelative( SAL_INFO("sal.osl", "rtl::MalformedUriException <" << e.getMessage() << ">"); //TODO: let some OSL_TRACE variant take care of text conversion? - return NULL; + return nullptr; } return osl_loadModule(abs.pData, mode); } diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 58e24a2d4787..994169aa58b0 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -88,11 +88,11 @@ char const * getEnvironmentVariable() { char const * getEnvironmentVariable_() { char const * p1 = std::getenv("SAL_LOG"); - if (p1 == 0) { - return 0; + if (p1 == nullptr) { + return nullptr; } char const * p2 = strdup(p1); // leaked - if (p2 == 0) { + if (p2 == nullptr) { std::abort(); // cannot do much here } return p2; @@ -108,9 +108,9 @@ char const * getEnvironmentVariable() { bool report(sal_detail_LogLevel level, char const * area) { if (level == SAL_DETAIL_LOG_LEVEL_DEBUG) return true; - assert(area != 0); + assert(area != nullptr); char const * env = getEnvironmentVariable(); - if (env == 0) { + if (env == nullptr) { env = "+WARN"; } std::size_t areaLen = std::strlen(area); diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 7ff6b6a05c8a..13f2814cf49c 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -42,9 +42,9 @@ oslCondition SAL_CALL osl_createCondition() pCond = static_cast<oslConditionImpl*>(malloc(sizeof(oslConditionImpl))); - if ( pCond == 0 ) + if ( pCond == nullptr ) { - return 0; + return nullptr; } pCond->m_State = false; @@ -56,7 +56,7 @@ oslCondition SAL_CALL osl_createCondition() SAL_WARN( "sal.osl.condition", "pthread_cond_init failed: " << strerror(nRet) ); free(pCond); - return 0; + return nullptr; } nRet = pthread_mutex_init(&pCond->m_Lock, PTHREAD_MUTEXATTR_DEFAULT); @@ -68,7 +68,7 @@ oslCondition SAL_CALL osl_createCondition() SAL_WARN_IF( nRet != 0, "sal.osl.condition", "pthread_cond_destroy failed: " << strerror(nRet) ); free(pCond); - pCond = 0; + pCond = nullptr; } SAL_INFO( "sal.osl.condition", "osl_createCondition(): " << pCond ); @@ -190,7 +190,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time struct timeval tp; struct timespec to; - gettimeofday(&tp, NULL); + gettimeofday(&tp, nullptr); SET_TIMESPEC( to, tp.tv_sec + pTimeout->Seconds, tp.tv_usec * 1000 + pTimeout->Nanosec ); diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 908373cacf09..0824011fdcc2 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -188,49 +188,49 @@ FileHandle_Impl::Allocator::get() } FileHandle_Impl::Allocator::Allocator() - : m_cache (0), + : m_cache (nullptr), m_bufsiz (0) { size_t const pagesize = FileHandle_Impl::getpagesize(); if (size_t(-1) != pagesize) { m_cache = rtl_cache_create ( - "osl_file_buffer_cache", pagesize, 0, 0, 0, 0, 0, 0, 0); - if (0 != m_cache) + "osl_file_buffer_cache", pagesize, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0); + if (nullptr != m_cache) m_bufsiz = pagesize; } } FileHandle_Impl::Allocator::~Allocator() { - rtl_cache_destroy (m_cache), m_cache = 0; + rtl_cache_destroy (m_cache), m_cache = nullptr; } void FileHandle_Impl::Allocator::allocate (sal_uInt8 ** ppBuffer, size_t * pnSize) { - OSL_PRECOND((0 != ppBuffer) && (0 != pnSize), "FileHandle_Impl::Allocator::allocate(): contract violation"); - if ((0 != ppBuffer) && (0 != pnSize)) + OSL_PRECOND((nullptr != ppBuffer) && (nullptr != pnSize), "FileHandle_Impl::Allocator::allocate(): contract violation"); + if ((nullptr != ppBuffer) && (nullptr != pnSize)) *ppBuffer = static_cast< sal_uInt8* >(rtl_cache_alloc(m_cache)), *pnSize = m_bufsiz; } void FileHandle_Impl::Allocator::deallocate (sal_uInt8 * pBuffer) { - if (0 != pBuffer) + if (nullptr != pBuffer) rtl_cache_free (m_cache, pBuffer); } FileHandle_Impl::Guard::Guard(pthread_mutex_t * pMutex) : m_mutex (pMutex) { - assert(m_mutex != 0); + assert(m_mutex != nullptr); (void) pthread_mutex_lock (m_mutex); // ignoring EINVAL ... } FileHandle_Impl::Guard::~Guard() { - assert(m_mutex != 0); + assert(m_mutex != nullptr); (void) pthread_mutex_unlock (m_mutex); } FileHandle_Impl::FileHandle_Impl (int fd, enum Kind kind, char const * path) - : m_strFilePath (0), + : m_strFilePath (nullptr), m_fd (fd), m_kind (kind), m_state (STATE_SEEKABLE | STATE_READABLE), @@ -240,21 +240,21 @@ FileHandle_Impl::FileHandle_Impl (int fd, enum Kind kind, char const * path) m_bufptr (-1), m_buflen (0), m_bufsiz (0), - m_buffer (0) + m_buffer (nullptr) { - (void) pthread_mutex_init(&m_mutex, 0); + (void) pthread_mutex_init(&m_mutex, nullptr); rtl_string_newFromStr (&m_strFilePath, path); if (m_kind == KIND_FD) { Allocator::get().allocate (&m_buffer, &m_bufsiz); - if (0 != m_buffer) + if (nullptr != m_buffer) memset (m_buffer, 0, m_bufsiz); } } FileHandle_Impl::~FileHandle_Impl() { if (m_kind == KIND_FD) - Allocator::get().deallocate (m_buffer), m_buffer = 0; - rtl_string_release (m_strFilePath), m_strFilePath = 0; + Allocator::get().deallocate (m_buffer), m_buffer = nullptr; + rtl_string_release (m_strFilePath), m_strFilePath = nullptr; (void) pthread_mutex_destroy(&m_mutex); // ignoring EBUSY ... } @@ -422,7 +422,7 @@ oslFileError FileHandle_Impl::readFileAt ( *pBytesRead = nBytes; return osl_File_E_None; } - else if (m_kind == KIND_MEM || 0 == m_buffer) + else if (m_kind == KIND_MEM || nullptr == m_buffer) { // not buffered return readAt (nOffset, pBuffer, nBytesRequested, pBytesRead); @@ -493,7 +493,7 @@ oslFileError FileHandle_Impl::writeFileAt ( *pBytesWritten = nBytes; return osl_File_E_None; } - else if (0 == m_buffer) + else if (nullptr == m_buffer) { // not buffered return writeAt (nOffset, pBuffer, nBytesToWrite, pBytesWritten); @@ -654,7 +654,7 @@ oslFileError FileHandle_Impl::readLineAt ( } } - result = writeSequence_Impl (ppSequence, &dstpos, 0, 0); + result = writeSequence_Impl (ppSequence, &dstpos, nullptr, 0); if (result != osl_File_E_None) return result; if (0 < dstpos) @@ -681,12 +681,12 @@ oslFileError FileHandle_Impl::writeSequence_Impl ( /* resize sequence */ rtl_byte_sequence_realloc(ppSequence, nElements); } - if (*ppSequence != 0 && nBytes != 0) + if (*ppSequence != nullptr && nBytes != 0) { /* fill sequence */ memcpy(&((*ppSequence)->elements[*pnOffset]), pBuffer, nBytes), *pnOffset += nBytes; } - return (*ppSequence != 0) ? osl_File_E_None : osl_File_E_NOMEM; + return (*ppSequence != nullptr) ? osl_File_E_None : osl_File_E_NOMEM; } oslFileError FileHandle_Impl::syncFile() @@ -708,15 +708,15 @@ oslFileError FileHandle_Impl::syncFile() oslFileHandle osl::detail::createFileHandleFromFD( int fd ) { if (-1 == fd) - return 0; // EINVAL + return nullptr; // EINVAL struct stat aFileStat; if (-1 == fstat (fd, &aFileStat)) - return 0; // EBADF + return nullptr; // EBADF FileHandle_Impl * pImpl = new FileHandle_Impl (fd); - if (0 == pImpl) - return 0; // ENOMEM + if (nullptr == pImpl) + return nullptr; // ENOMEM // assume writeable pImpl->m_state |= FileHandle_Impl::STATE_WRITEABLE; @@ -772,7 +772,7 @@ static bool osl_file_queryLocking (sal_uInt32 uFlags) && ((uFlags & osl_File_OpenFlag_Write) || (uFlags & osl_File_OpenFlag_Create))) { - static bool enabled = getenv("SAL_ENABLE_FILE_LOCKING") != 0; + static bool enabled = getenv("SAL_ENABLE_FILE_LOCKING") != nullptr; // getenv is not thread safe, so minimize use of result return enabled; } @@ -1023,7 +1023,7 @@ SAL_CALL openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 { oslFileError eRet; - if ((ustrFileURL == 0) || (ustrFileURL->length == 0) || (pHandle == 0)) + if ((ustrFileURL == nullptr) || (ustrFileURL->length == 0) || (pHandle == nullptr)) return osl_File_E_INVAL; /* convert file URL to system path */ @@ -1045,7 +1045,7 @@ SAL_CALL osl_closeFile( oslFileHandle Handle ) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if (pImpl == 0) + if (pImpl == nullptr) return osl_File_E_INVAL; SAL_INFO("sal.file", "osl_closeFile(" << rtl::OString(pImpl->m_strFilePath) << ":" << pImpl->m_fd << ")"); @@ -1088,7 +1088,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd))) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd))) return osl_File_E_INVAL; if (pImpl->m_kind == FileHandle_Impl::KIND_MEM) @@ -1119,9 +1119,9 @@ SAL_CALL osl_mapFile ( { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == ppAddr)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == ppAddr)) return osl_File_E_INVAL; - *ppAddr = 0; + *ppAddr = nullptr; if (uLength > SAL_MAX_SIZE) return osl_File_E_OVERFLOW; @@ -1139,7 +1139,7 @@ SAL_CALL osl_mapFile ( off_t const nOffset = sal::static_int_cast< off_t >(uOffset); - void* p = mmap(NULL, nLength, PROT_READ, MAP_SHARED, pImpl->m_fd, nOffset); + void* p = mmap(nullptr, nLength, PROT_READ, MAP_SHARED, pImpl->m_fd, nOffset); if (MAP_FAILED == p) return oslTranslateFileError(OSL_FET_ERROR, errno); *ppAddr = p; @@ -1199,7 +1199,7 @@ static oslFileError unmapFile (void* pAddr, sal_uInt64 uLength) { - if (0 == pAddr) + if (nullptr == pAddr) return osl_File_E_INVAL; if (uLength > SAL_MAX_SIZE) @@ -1232,7 +1232,7 @@ SAL_CALL osl_unmapMappedFile (oslFileHandle Handle, void* pAddr, sal_uInt64 uLen { FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); - if (pImpl == 0) + if (pImpl == nullptr) return osl_File_E_INVAL; if (pImpl->m_kind == FileHandle_Impl::KIND_FD) @@ -1250,7 +1250,7 @@ SAL_CALL osl_readLine ( { FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == ppSequence)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == ppSequence)) return osl_File_E_INVAL; sal_uInt64 uBytesRead = 0; @@ -1272,7 +1272,7 @@ SAL_CALL osl_readFile ( { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == pBuffer) || (0 == pBytesRead)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == pBuffer) || (nullptr == pBytesRead)) return osl_File_E_INVAL; static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max(); @@ -1298,7 +1298,7 @@ SAL_CALL osl_writeFile ( { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesWritten)) + if ((nullptr == pImpl) || (-1 == pImpl->m_fd) || (nullptr == pBuffer) || (nullptr == pBytesWritten)) return osl_File_E_INVAL; if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE)) return osl_File_E_BADF; @@ -1327,7 +1327,7 @@ SAL_CALL osl_readFileAt ( { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == pBuffer) || (0 == pBytesRead)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == pBuffer) || (nullptr == pBytesRead)) return osl_File_E_INVAL; if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE)) return osl_File_E_SPIPE; @@ -1357,7 +1357,7 @@ SAL_CALL osl_writeFileAt ( { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesWritten)) + if ((nullptr == pImpl) || (-1 == pImpl->m_fd) || (nullptr == pBuffer) || (nullptr == pBytesWritten)) return osl_File_E_INVAL; if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE)) return osl_File_E_SPIPE; @@ -1384,7 +1384,7 @@ SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF ) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == pIsEOF)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == pIsEOF)) return osl_File_E_INVAL; FileHandle_Impl::Guard lock (&(pImpl->m_mutex)); @@ -1397,7 +1397,7 @@ SAL_CALL osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos ) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == pPos)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == pPos)) return osl_File_E_INVAL; FileHandle_Impl::Guard lock (&(pImpl->m_mutex)); @@ -1410,7 +1410,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd))) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd))) return osl_File_E_INVAL; sal_Int64 const limit_off_t = MAX_OFF_T; @@ -1454,7 +1454,7 @@ SAL_CALL osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize ) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (0 == pSize)) + if ((nullptr == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)) || (nullptr == pSize)) return osl_File_E_INVAL; FileHandle_Impl::Guard lock (&(pImpl->m_mutex)); @@ -1467,7 +1467,7 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize ) { FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - if ((0 == pImpl) || (-1 == pImpl->m_fd)) + if ((nullptr == pImpl) || (-1 == pImpl->m_fd)) return osl_File_E_INVAL; if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE)) return osl_File_E_BADF; diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 2330f29b1822..5bc76e472696 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -79,12 +79,12 @@ DirectoryItem_Impl::DirectoryItem_Impl( m_ustrFilePath (ustrFilePath), m_DType (DType) { - if (m_ustrFilePath != 0) + if (m_ustrFilePath != nullptr) rtl_uString_acquire(m_ustrFilePath); } DirectoryItem_Impl::~DirectoryItem_Impl() { - if (m_ustrFilePath != 0) + if (m_ustrFilePath != nullptr) rtl_uString_release(m_ustrFilePath); } @@ -138,12 +138,12 @@ static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath); oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory) { - rtl_uString* ustrSystemPath = NULL; + rtl_uString* ustrSystemPath = nullptr; oslFileError eRet; char path[PATH_MAX]; - if ((0 == ustrDirectoryURL) || (0 == ustrDirectoryURL->length) || (0 == pDirectory)) + if ((nullptr == ustrDirectoryURL) || (0 == ustrDirectoryURL->length) || (nullptr == pDirectory)) return osl_File_E_INVAL; /* convert file URL to system path */ @@ -234,7 +234,7 @@ oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory ) OSL_ASSERT( Directory ); - if( NULL == pDirImpl ) + if( nullptr == pDirImpl ) return osl_File_E_INVAL; #ifdef ANDROID @@ -269,7 +269,7 @@ static struct dirent* osl_readdir_impl_(DIR* pdir, bool bFilterLocalAndParentDir { struct dirent* pdirent; - while ((pdirent = readdir(pdir)) != NULL) + while ((pdirent = readdir(pdir)) != nullptr) { if (bFilterLocalAndParentDir && ((0 == strcmp(pdirent->d_name, ".")) || (0 == strcmp(pdirent->d_name, "..")))) @@ -284,14 +284,14 @@ static struct dirent* osl_readdir_impl_(DIR* pdir, bool bFilterLocalAndParentDir oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, SAL_UNUSED_PARAMETER sal_uInt32 /*uHint*/) { oslDirectoryImpl* pDirImpl = static_cast<oslDirectoryImpl*>(Directory); - rtl_uString* ustrFileName = NULL; - rtl_uString* ustrFilePath = NULL; + rtl_uString* ustrFileName = nullptr; + rtl_uString* ustrFilePath = nullptr; struct dirent* pEntry; OSL_ASSERT(Directory); OSL_ASSERT(pItem); - if ((NULL == Directory) || (NULL == pItem)) + if ((nullptr == Directory) || (nullptr == pItem)) return osl_File_E_INVAL; #ifdef ANDROID @@ -305,7 +305,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect pEntry = osl_readdir_impl_(pDirImpl->pDirStruct, true); } - if (NULL == pEntry) + if (nullptr == pEntry) return osl_File_E_NOENT; #if defined(MACOSX) @@ -324,7 +324,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect /* convert file name to unicode */ rtl_string2UString( &ustrFileName, pEntry->d_name, strlen( pEntry->d_name ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(ustrFileName != 0); + OSL_ASSERT(ustrFileName != nullptr); #endif @@ -332,9 +332,9 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect rtl_uString_release( ustrFileName ); DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(*pItem); - if (0 != pImpl) + if (nullptr != pImpl) { - pImpl->release(), pImpl = 0; + pImpl->release(), pImpl = nullptr; } #ifdef _DIRENT_HAVE_D_TYPE pImpl = new DirectoryItem_Impl(ustrFilePath, pEntry->d_type); @@ -349,11 +349,11 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem ) { - rtl_uString* ustrSystemPath = NULL; + rtl_uString* ustrSystemPath = nullptr; oslFileError osl_error = osl_File_E_INVAL; - OSL_ASSERT((0 != ustrFileURL) && (0 != pItem)); - if ((0 == ustrFileURL) || (0 == ustrFileURL->length) || (0 == pItem)) + OSL_ASSERT((nullptr != ustrFileURL) && (nullptr != pItem)); + if ((nullptr == ustrFileURL) || (0 == ustrFileURL->length) || (nullptr == pItem)) return osl_File_E_INVAL; osl_error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &ustrSystemPath); @@ -378,7 +378,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item ) { DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item); - if (0 == pImpl) + if (nullptr == pImpl) return osl_File_E_INVAL; pImpl->acquire(); @@ -388,7 +388,7 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item ) oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item ) { DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item); - if (0 == pImpl) + if (nullptr == pImpl) return osl_File_E_INVAL; pImpl->release(); @@ -555,7 +555,7 @@ oslFileError SAL_CALL osl_createDirectoryPath( oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, void* pData) { - if (aDirectoryUrl == NULL) + if (aDirectoryUrl == nullptr) return osl_File_E_INVAL; rtl::OUString sys_path; @@ -938,7 +938,7 @@ static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszD static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode) { - oslFileHandle SourceFileFH=0; + oslFileHandle SourceFileFH=nullptr; int DestFileFD=0; int nRet=0; diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index 7f9e2fb8a692..ec8eeb5666ce 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -40,8 +40,8 @@ inline const rtl::OUString FPH_PARENT_DIR_ENTRY() void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) { - OSL_PRECOND(0 != pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter"); - if (0 != pustrPath) + OSL_PRECOND(nullptr != pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter"); + if (nullptr != pustrPath) { // maybe there are more than one separator at end // so we run in a loop @@ -60,8 +60,8 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) { - OSL_PRECOND((0 != ppustrPath) && (0 != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); - if ((0 != ppustrPath) && (0 != *ppustrPath)) + OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); + if ((nullptr != ppustrPath) && (nullptr != *ppustrPath)) { rtl::OUString path(*ppustrPath); sal_Int32 lp = path.getLength(); @@ -81,8 +81,8 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath) { - OSL_PRECOND(0 != pustrPath, "osl_systemPathIsRelativePath: Invalid parameter"); - return ((0 == pustrPath) || (0 == pustrPath->length) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR)); + OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsRelativePath: Invalid parameter"); + return ((nullptr == pustrPath) || (0 == pustrPath->length) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR)); } void SAL_CALL osl_systemPathMakeAbsolutePath( @@ -127,8 +127,8 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( const rtl_uString* pustrPath) { - OSL_PRECOND(0 != pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter"); - if ((0 == pustrPath) || (0 == pustrPath->length)) + OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter"); + if ((nullptr == pustrPath) || (0 == pustrPath->length)) return false; rtl::OUString fdp; diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index 72d64f145501..5fdd663eac93 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -185,7 +185,7 @@ namespace inline oslFileError setup_osl_getFileStatus( DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path) { - if ((NULL == pImpl) || (NULL == pStat)) + if ((nullptr == pImpl) || (nullptr == pStat)) return osl_File_E_INVAL; file_path = rtl::OUString(pImpl->m_ustrFilePath); @@ -350,7 +350,7 @@ static oslFileError osl_psz_setFileTime ( fprintf(stderr,"Modification is '%s'\n",ctime(&aTimeBuffer.modtime)); #endif - if ( pLastAccessTime != 0 ) + if ( pLastAccessTime != nullptr ) { aTimeBuffer.actime=pLastAccessTime->Seconds; } @@ -359,7 +359,7 @@ static oslFileError osl_psz_setFileTime ( aTimeBuffer.actime=aFileStat.st_atime; } - if ( pLastWriteTime != 0 ) + if ( pLastWriteTime != nullptr ) { aTimeBuffer.modtime=pLastWriteTime->Seconds; } diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index c0cbe5bc4741..839eae27e6e9 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -216,7 +216,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, { static const sal_Unicode pDoubleSlash[2] = { '/', '/' }; - rtl_uString *pTmp = NULL; + rtl_uString *pTmp = nullptr; sal_Int32 nIndex; if( 0 == ustrSystemPath->length ) @@ -280,7 +280,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, sal_Int32 nDeleted = 0; /* if pTmp is not already allocated, copy ustrSystemPath for modification */ - if( NULL == pTmp ) + if( nullptr == pTmp ) rtl_uString_newFromString( &pTmp, ustrSystemPath ); /* adapt index to pTmp */ @@ -299,7 +299,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, pTmp->length -= nDeleted; } - if( NULL == pTmp ) + if( nullptr == pTmp ) rtl_uString_assign( &pTmp, ustrSystemPath ); /* file URLs must be URI encoded */ @@ -310,7 +310,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, /* absolute urls should start with 'file://' */ if( '/' == (*pustrFileURL)->buffer[0] ) { - rtl_uString *pProtocol = NULL; + rtl_uString *pProtocol = nullptr; rtl_uString_newFromAscii( &pProtocol, "file://" ); rtl_uString_newConcat( pustrFileURL, pProtocol, *pustrFileURL ); @@ -326,7 +326,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, oslFileError osl_getSystemPathFromFileURL_Ex( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath) { - rtl_uString* temp = 0; + rtl_uString* temp = nullptr; oslFileError osl_error = osl_getSystemPathFromFileURL(ustrFileURL, &temp); if (osl_File_E_None == osl_error) @@ -703,7 +703,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL) { - rtl_uString* ustrSystemPath = NULL; + rtl_uString* ustrSystemPath = nullptr; oslFileError osl_error = osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath); if(osl_File_E_None != osl_error) @@ -745,9 +745,9 @@ namespace sal_Unicode const * pSrcBuf, sal_Size nSrcChars, sal_Char * pDstBuf, sal_Size nDstBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtChars) { - OSL_ASSERT(m_converter != 0); + OSL_ASSERT(m_converter != nullptr); return rtl_convertUnicodeToText ( - m_converter, 0, pSrcBuf, nSrcChars, pDstBuf, nDstBytes, nFlags, pInfo, pSrcCvtChars); + m_converter, nullptr, pSrcBuf, nSrcChars, pDstBuf, nDstBytes, nFlags, pInfo, pSrcCvtChars); } }; } @@ -798,9 +798,9 @@ namespace sal_Char const * pSrcBuf, sal_Size nSrcBytes, sal_Unicode * pDstBuf, sal_Size nDstChars, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes) { - OSL_ASSERT(m_converter != 0); + OSL_ASSERT(m_converter != nullptr); return rtl_convertTextToUnicode ( - m_converter, 0, pSrcBuf, nSrcBytes, pDstBuf, nDstChars, nFlags, pInfo, pSrcCvtBytes); + m_converter, nullptr, pSrcBuf, nSrcBytes, pDstBuf, nDstChars, nFlags, pInfo, pSrcCvtBytes); } }; } diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index 7b07955111dd..37d0025d66bd 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -347,7 +347,7 @@ static rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ust rtl_str_getLength( pszStr ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); - OSL_ASSERT(*ustrValid != 0); + OSL_ASSERT(*ustrValid != nullptr); return *ustrValid; } @@ -359,7 +359,7 @@ oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uSt Buffer[0] = '\0'; - if ( pItem == 0 || pstrPath == 0 ) + if ( pItem == nullptr || pstrPath == nullptr ) { return osl_File_E_INVAL; } @@ -388,7 +388,7 @@ oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handl { oslVolumeDeviceHandleImpl* pItem =static_cast<oslVolumeDeviceHandleImpl*>(Handle); - if ( pItem == 0 ) + if ( pItem == nullptr ) { return osl_File_E_INVAL; } @@ -411,7 +411,7 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle ) { oslVolumeDeviceHandleImpl* pItem =static_cast<oslVolumeDeviceHandleImpl*>(Handle); - if ( pItem == 0 ) + if ( pItem == nullptr ) { return osl_File_E_INVAL; } diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx index e9fb9a885533..c016baa97a00 100644 --- a/sal/osl/unx/memory.cxx +++ b/sal/osl/unx/memory.cxx @@ -18,7 +18,7 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) { if (size == 0) { - return NULL; + return nullptr; } else { @@ -27,7 +27,7 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) #else void* ptr; int err = posix_memalign(&ptr, align, size); - return err ? NULL : ptr; + return err ? nullptr : ptr; #endif } } diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index 65e00570f4a1..df0086140baa 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -114,10 +114,10 @@ static bool getModulePathFromAddress(void * address, rtl_String ** path) { oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMode) { - oslModule pModule=0; - rtl_uString* ustrTmp = NULL; + oslModule pModule=nullptr; + rtl_uString* ustrTmp = nullptr; - SAL_WARN_IF(ustrModuleName == 0, "sal.osl", "string is not valid"); + SAL_WARN_IF(ustrModuleName == nullptr, "sal.osl", "string is not valid"); /* ensure ustrTmp hold valid string */ if (osl_File_E_None != osl_getSystemPathFromFileURL(ustrModuleName, &ustrTmp)) @@ -157,13 +157,13 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR void* pLib = dlopen(pModuleName, rtld_mode); SAL_INFO_IF( - pLib == 0, "sal.osl", + pLib == nullptr, "sal.osl", "dlopen(" << pModuleName << ", " << rtld_mode << "): " << dlerror()); #endif return pLib; } - return NULL; + return nullptr; } oslModule osl_loadModuleRelativeAscii( @@ -173,13 +173,13 @@ oslModule osl_loadModuleRelativeAscii( if (relativePath[0] == '/') { return osl_loadModuleAscii(relativePath, mode); } else { - rtl_String * path = NULL; - rtl_String * suffix = NULL; + rtl_String * path = nullptr; + rtl_String * suffix = nullptr; oslModule module; if (!getModulePathFromAddress( reinterpret_cast< void * >(baseModule), &path)) { - return NULL; + return nullptr; } rtl_string_newFromStr_WithLength( &path, path->buffer, @@ -303,10 +303,10 @@ osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName) sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl) { bool result = false; - rtl_String * path = NULL; + rtl_String * path = nullptr; if (getModulePathFromAddress(addr, &path)) { - rtl_uString * workDir = NULL; + rtl_uString * workDir = nullptr; osl_getProcessWorkingDir(&workDir); if (workDir) { @@ -319,7 +319,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr OSTRING_TO_OUSTRING_CVTFLAGS); SAL_WARN_IF( - *ppLibraryUrl == 0, "sal.osl", "rtl_string2UString failed"); + *ppLibraryUrl == nullptr, "sal.osl", "rtl_string2UString failed"); osl_getFileURLFromSystemPath(*ppLibraryUrl, ppLibraryUrl); osl_getAbsoluteFileURL(workDir, *ppLibraryUrl, ppLibraryUrl); diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx index bc51fbac498f..b37e36b3df24 100644 --- a/sal/osl/unx/mutex.cxx +++ b/sal/osl/unx/mutex.cxx @@ -45,9 +45,9 @@ oslMutex SAL_CALL osl_createMutex() SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex"); - if ( pMutex == 0 ) + if ( pMutex == nullptr ) { - return 0; + return nullptr; } pthread_mutexattr_init(&aMutexAttr); @@ -60,7 +60,7 @@ oslMutex SAL_CALL osl_createMutex() SAL_WARN("sal.osl.mutex", "pthread_muxex_init failed: " << strerror(nRet)); free(pMutex); - pMutex = 0; + pMutex = nullptr; } pthread_mutexattr_destroy(&aMutexAttr); @@ -72,7 +72,7 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex) { SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex"); - if ( pMutex != 0 ) + if ( pMutex != nullptr ) { int nRet=0; @@ -92,7 +92,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex) { SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex"); - if ( pMutex != 0 ) + if ( pMutex != nullptr ) { int nRet=0; diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index 6a322d8ec708..74bce30b6b3d 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -67,8 +67,8 @@ _pair_search (const char *key, const _pair *base, unsigned int member ) unsigned int upper = member; /* check for validity of input */ - if ( (key == NULL) || (base == NULL) || (member == 0) ) - return NULL; + if ( (key == nullptr) || (base == nullptr) || (member == 0) ) + return nullptr; /* binary search */ while ( lower < upper ) @@ -83,7 +83,7 @@ _pair_search (const char *key, const _pair *base, unsigned int member ) return base + current; } - return NULL; + return nullptr; } /***************************************************************************** @@ -100,7 +100,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n ) /* convert language code to ascii */ { - rtl_String *pLanguage = NULL; + rtl_String *pLanguage = nullptr; rtl_uString2String( &pLanguage, pLocale->Language->buffer, pLocale->Language->length, @@ -118,7 +118,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n ) /* convert country code to ascii */ if( pLocale->Country && (pLocale->Country->length == 2) ) { - rtl_String *pCountry = NULL; + rtl_String *pCountry = nullptr; rtl_uString2String( &pCountry, pLocale->Country->buffer, pLocale->Country->length, @@ -138,7 +138,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n ) if( pLocale->Variant && pLocale->Variant->length && ( sal::static_int_cast<sal_uInt32>(pLocale->Variant->length) < n - 6 ) ) { - rtl_String *pVariant = NULL; + rtl_String *pVariant = nullptr; rtl_uString2String( &pVariant, pLocale->Variant->buffer, pLocale->Variant->length, @@ -155,7 +155,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n ) return buffer; } - return NULL; + return nullptr; } /***************************************************************************** @@ -173,9 +173,9 @@ static rtl_Locale * _parse_locale( const char * locale ) if( len >= 2 ) { - rtl_uString * pLanguage = NULL; - rtl_uString * pCountry = NULL; - rtl_uString * pVariant = NULL; + rtl_uString * pLanguage = nullptr; + rtl_uString * pCountry = nullptr; + rtl_uString * pVariant = nullptr; size_t offset = 2; @@ -187,20 +187,20 @@ static rtl_Locale * _parse_locale( const char * locale ) /* convert language code to unicode */ rtl_string2UString( &pLanguage, locale, offset, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(pLanguage != NULL); + OSL_ASSERT(pLanguage != nullptr); /* convert country code to unicode */ if( len >= offset+3 && '_' == locale[offset] ) { rtl_string2UString( &pCountry, locale + offset + 1, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(pCountry != NULL); + OSL_ASSERT(pCountry != nullptr); offset += 3; } /* convert variant code to unicode - do not rely on "." as delimiter */ if( len > offset ) { rtl_string2UString( &pVariant, locale + offset, len - offset, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(pVariant != NULL); + OSL_ASSERT(pVariant != nullptr); } ret = rtl_locale_register( pLanguage->buffer, pCountry ? pCountry->buffer : c_locale + 1, pVariant ? pVariant->buffer : c_locale + 1 ); @@ -215,7 +215,7 @@ static rtl_Locale * _parse_locale( const char * locale ) return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 ); } - return NULL; + return nullptr; } #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ @@ -564,16 +564,16 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) { - const _pair *language=0; + const _pair *language=nullptr; char locale_buf[64] = ""; char codeset_buf[64]; - char *ctype_locale = 0; - char *codeset = 0; + char *ctype_locale = nullptr; + char *codeset = nullptr; /* default to process locale if pLocale == NULL */ - if( NULL == pLocale ) + if( nullptr == pLocale ) osl_getProcessLocale( &pLocale ); /* convert rtl_Locale to locale string */ @@ -583,10 +583,10 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) pthread_mutex_lock( &aLocalMutex ); /* remember the charset as indicated by the LC_CTYPE locale */ - ctype_locale = setlocale( LC_CTYPE, NULL ); + ctype_locale = setlocale( LC_CTYPE, nullptr ); /* set the desired LC_CTYPE locale */ - if( NULL == setlocale( LC_CTYPE, locale_buf ) ) + if( nullptr == setlocale( LC_CTYPE, locale_buf ) ) { pthread_mutex_unlock(&aLocalMutex); return RTL_TEXTENCODING_DONTKNOW; @@ -599,7 +599,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) codeset = nl_langinfo( CODESET ); #endif - if ( codeset != NULL ) + if ( codeset != nullptr ) { /* get codeset into mt save memory */ strncpy( codeset_buf, codeset, sizeof(codeset_buf) ); @@ -608,13 +608,13 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) } /* restore the original value of locale */ - if ( ctype_locale != NULL ) + if ( ctype_locale != nullptr ) setlocale( LC_CTYPE, ctype_locale ); pthread_mutex_unlock( &aLocalMutex ); /* search the codeset in our language list */ - if ( codeset != NULL ) + if ( codeset != nullptr ) { language = _pair_search (codeset, _nl_language_list, SAL_N_ELEMENTS( _nl_language_list ) ); } @@ -623,7 +623,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) /* a matching item in our list provides a mapping from codeset to * rtl-codeset */ - if ( language != NULL ) + if ( language != nullptr ) return language->value; return RTL_TEXTENCODING_DONTKNOW; @@ -644,8 +644,8 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) locale = setlocale( LC_CTYPE, "" ); /* fallback to the current locale */ - if( NULL == locale ) - locale = setlocale( LC_CTYPE, NULL ); + if( nullptr == locale ) + locale = setlocale( LC_CTYPE, nullptr ); /* return the LC_CTYPE locale */ *ppLocale = _parse_locale( locale ); @@ -669,7 +669,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale ) pthread_mutex_lock( &aLocalMutex ); /* try to set LC_ALL locale */ - if( NULL == setlocale( LC_ALL, locale_buf ) ) + if( nullptr == setlocale( LC_ALL, locale_buf ) ) ret = -1; pthread_mutex_unlock( &aLocalMutex ); diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 2bfe5f0a0170..b598ddc1f727 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -78,8 +78,8 @@ oslPipe __osl_createPipeImpl() oslPipe pPipeImpl; pPipeImpl = static_cast<oslPipe>(calloc(1, sizeof(struct oslPipeImpl))); - if (pPipeImpl == NULL) - return NULL; + if (pPipeImpl == nullptr) + return nullptr; pPipeImpl->m_nRefCount =1; pPipeImpl->m_bClosed = false; #if defined(LINUX) @@ -91,16 +91,16 @@ oslPipe __osl_createPipeImpl() void __osl_destroyPipeImpl(oslPipe pImpl) { - if (pImpl != NULL) + if (pImpl != nullptr) free(pImpl); } oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options, oslSecurity Security) { - oslPipe pPipe=0; - rtl_String* strPipeName=0; + oslPipe pPipe=nullptr; + rtl_String* strPipeName=nullptr; - if ( ustrPipeName != 0 ) + if ( ustrPipeName != nullptr ) { rtl_uString2String( &strPipeName, rtl_uString_getStr(ustrPipeName), @@ -110,7 +110,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Option sal_Char* pszPipeName = rtl_string_getStr(strPipeName); pPipe = osl_psz_createPipe(pszPipeName, Options, Security); - if ( strPipeName != 0 ) + if ( strPipeName != nullptr ) { rtl_string_release(strPipeName); } @@ -124,15 +124,15 @@ static bool cpyBootstrapSocketPath(sal_Char *name, size_t len) { bool bRet = false; - rtl_uString *pName = 0, *pValue = 0; + rtl_uString *pName = nullptr, *pValue = nullptr; rtl_uString_newFromAscii(&pName, "OSL_SOCKET_PATH"); - if (rtl_bootstrap_get(pName, &pValue, NULL)) + if (rtl_bootstrap_get(pName, &pValue, nullptr)) { if (pValue && pValue->length > 0) { - rtl_String *pStrValue = 0; + rtl_String *pStrValue = nullptr; rtl_uString2String(&pStrValue, pValue->buffer, pValue->length, RTL_TEXTENCODING_UTF8, @@ -176,7 +176,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions } else if (!cpyBootstrapSocketPath (name, sizeof (name))) { - return NULL; + return nullptr; } name[sizeof(name) - 1] = '\0'; // ensure the string is NULL-terminated nNameLength = strlen(name); @@ -210,14 +210,14 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions if (bNameTooLong) { SAL_WARN("sal.osl.pipe", "osl_createPipe: pipe name too long"); - return NULL; + return nullptr; } /* alloc memory */ pPipe = __osl_createPipeImpl(); - if (pPipe == NULL) - return NULL; + if (pPipe == nullptr) + return nullptr; /* create socket */ pPipe->m_Socket = socket(AF_UNIX, SOCK_STREAM, 0); @@ -225,7 +225,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions { SAL_WARN("sal.osl.pipe", "socket() failed: " << strerror(errno)); __osl_destroyPipeImpl(pPipe); - return NULL; + return nullptr; } /* set close-on-exec flag */ @@ -262,7 +262,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions { close (pPipe->m_Socket); __osl_destroyPipeImpl(pPipe); - return NULL; + return nullptr; } unlink(name); @@ -274,7 +274,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions SAL_WARN("sal.osl.pipe", "bind() failed: " << strerror(errno)); close (pPipe->m_Socket); __osl_destroyPipeImpl(pPipe); - return NULL; + return nullptr; } /* Only give access to all if no security handle was specified, otherwise security @@ -295,7 +295,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions unlink(name); /* remove filesystem entry */ close (pPipe->m_Socket); __osl_destroyPipeImpl(pPipe); - return NULL; + return nullptr; } return pPipe; @@ -314,7 +314,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions close (pPipe->m_Socket); __osl_destroyPipeImpl(pPipe); - return NULL; + return nullptr; } } @@ -326,7 +326,7 @@ void SAL_CALL osl_acquirePipe( oslPipe pPipe ) void SAL_CALL osl_releasePipe( oslPipe pPipe ) { - if( 0 == pPipe ) + if( nullptr == pPipe ) return; if( 0 == osl_atomic_decrement( &(pPipe->m_nRefCount) ) ) @@ -414,9 +414,9 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) oslPipe pAcceptedPipe; OSL_ASSERT(pPipe); - if ( pPipe == 0 ) + if ( pPipe == nullptr ) { - return NULL; + return nullptr; } OSL_ASSERT(strlen(pPipe->m_Name) > 0); @@ -425,7 +425,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) pPipe->m_bIsAccepting = true; #endif - s = accept(pPipe->m_Socket, NULL, NULL); + s = accept(pPipe->m_Socket, nullptr, nullptr); #if defined(LINUX) pPipe->m_bIsAccepting = false; @@ -434,14 +434,14 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) if (s < 0) { SAL_WARN("sal.osl.pipe", "accept() failed: " << strerror(errno)); - return NULL; + return nullptr; } #if defined(LINUX) if ( pPipe->m_bIsInShutdown ) { close(s); - return NULL; + return nullptr; } #endif /* LINUX */ else @@ -450,10 +450,10 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) pAcceptedPipe = __osl_createPipeImpl(); OSL_ASSERT(pAcceptedPipe); - if(pAcceptedPipe==NULL) + if(pAcceptedPipe==nullptr) { close(s); - return NULL; + return nullptr; } /* set close-on-exec flag */ @@ -481,7 +481,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe, OSL_ASSERT(pPipe); - if ( pPipe == 0 ) + if ( pPipe == nullptr ) { SAL_WARN("sal.osl.pipe", "osl_receivePipe: Invalid socket"); errno=EINVAL; @@ -508,7 +508,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe, OSL_ASSERT(pPipe); - if ( pPipe == 0 ) + if ( pPipe == nullptr ) { SAL_WARN("sal.osl.pipe", "osl_sendPipe: Invalid socket"); errno=EINVAL; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index da7ef0cef756..391b1604a79a 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -193,9 +193,9 @@ static void ChildStatusProc(void *pData) if (chstatus == 0 && ((data.m_uid == (uid_t)-1) || ((data.m_uid == getuid()) && (data.m_gid == getgid())))) { int i; - for (i = 0; data.m_pszEnv[i] != NULL; i++) + for (i = 0; data.m_pszEnv[i] != nullptr; i++) { - if (strchr(data.m_pszEnv[i], '=') == NULL) + if (strchr(data.m_pszEnv[i], '=') == nullptr) { unsetenv(data.m_pszEnv[i]); /*TODO: check error return*/ } @@ -327,7 +327,7 @@ static void ChildStatusProc(void *pData) pChild = ChildList; /* check if it is one of our child processes */ - while (pChild != NULL) + while (pChild != nullptr) { if (pChild->m_pid == child_pid) { @@ -354,13 +354,13 @@ static void ChildStatusProc(void *pData) /* Close pipe ends */ if ( pdata->m_pInputWrite ) - *pdata->m_pInputWrite = NULL; + *pdata->m_pInputWrite = nullptr; if ( pdata->m_pOutputRead ) - *pdata->m_pOutputRead = NULL; + *pdata->m_pOutputRead = nullptr; if ( pdata->m_pErrorRead ) - *pdata->m_pErrorRead = NULL; + *pdata->m_pErrorRead = nullptr; if (stdInput[1] != -1) close( stdInput[1] ); if (stdOutput[0] != -1) close( stdOutput[0] ); @@ -435,9 +435,9 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( } oslProcessError Error; - sal_Char* pszWorkDir=0; - sal_Char** pArguments=0; - sal_Char** pEnvironment=0; + sal_Char* pszWorkDir=nullptr; + sal_Char** pArguments=nullptr; + sal_Char** pEnvironment=nullptr; unsigned int idx; char szImagePath[PATH_MAX] = ""; @@ -453,7 +453,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( } char szWorkDir[PATH_MAX] = ""; - if ( ustrWorkDir != 0 && ustrWorkDir->length ) + if ( ustrWorkDir != nullptr && ustrWorkDir->length ) { oslFileError e = FileURLToPath( szWorkDir, PATH_MAX, ustrWorkDir ); if (e != osl_File_E_None) @@ -467,14 +467,14 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( pszWorkDir = szWorkDir; } - if ( pArguments == 0 && nArguments > 0 ) + if ( pArguments == nullptr && nArguments > 0 ) { pArguments = static_cast<sal_Char**>(malloc( ( nArguments + 2 ) * sizeof(sal_Char*) )); } for ( idx = 0 ; idx < nArguments ; ++idx ) { - rtl_String* strArg =0; + rtl_String* strArg =nullptr; rtl_uString2String( &strArg, rtl_uString_getStr(ustrArguments[idx]), @@ -484,14 +484,14 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( pArguments[idx]=strdup(rtl_string_getStr(strArg)); rtl_string_release(strArg); - pArguments[idx+1]=0; + pArguments[idx+1]=nullptr; } for ( idx = 0 ; idx < nEnvironmentVars ; ++idx ) { - rtl_String* strEnv=0; + rtl_String* strEnv=nullptr; - if ( pEnvironment == 0 ) + if ( pEnvironment == nullptr ) { pEnvironment = static_cast<sal_Char**>(malloc( ( nEnvironmentVars + 2 ) * sizeof(sal_Char*) )); } @@ -504,7 +504,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( pEnvironment[idx]=strdup(rtl_string_getStr(strEnv)); rtl_string_release(strEnv); - pEnvironment[idx+1]=0; + pEnvironment[idx+1]=nullptr; } Error = osl_psz_executeProcess(szImagePath, @@ -519,11 +519,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( pErrorRead ); - if ( pArguments != 0 ) + if ( pArguments != nullptr ) { for ( idx = 0 ; idx < nArguments ; ++idx ) { - if ( pArguments[idx] != 0 ) + if ( pArguments[idx] != nullptr ) { free(pArguments[idx]); } @@ -531,11 +531,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( free(pArguments); } - if ( pEnvironment != 0 ) + if ( pEnvironment != nullptr ) { for ( idx = 0 ; idx < nEnvironmentVars ; ++idx ) { - if ( pEnvironment[idx] != 0 ) + if ( pEnvironment[idx] != nullptr ) { free(pEnvironment[idx]); } @@ -568,9 +568,9 @@ oslProcessError SAL_CALL osl_executeProcess( ustrEnvironment, nEnvironmentVars, pProcess, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr ); } @@ -595,36 +595,36 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, Data.m_pOutputRead = pOutputRead; Data.m_pErrorRead = pErrorRead; - OSL_ASSERT(pszImageName != NULL); + OSL_ASSERT(pszImageName != nullptr); - if ( pszImageName == 0 ) + if ( pszImageName == nullptr ) { return osl_Process_E_NotFound; } Data.m_pszArgs[0] = strdup(pszImageName); - Data.m_pszArgs[1] = 0; + Data.m_pszArgs[1] = nullptr; - if ( pszArguments != 0 ) + if ( pszArguments != nullptr ) { - for (i = 0; ((i + 2) < MAX_ARGS) && (pszArguments[i] != NULL); i++) + for (i = 0; ((i + 2) < MAX_ARGS) && (pszArguments[i] != nullptr); i++) Data.m_pszArgs[i+1] = strdup(pszArguments[i]); - Data.m_pszArgs[i+2] = NULL; + Data.m_pszArgs[i+2] = nullptr; } Data.m_options = Options; - Data.m_pszDir = (pszDirectory != NULL) ? strdup(pszDirectory) : NULL; + Data.m_pszDir = (pszDirectory != nullptr) ? strdup(pszDirectory) : nullptr; - if (pszEnvironments != NULL) + if (pszEnvironments != nullptr) { - for (i = 0; ((i + 1) < MAX_ENVS) && (pszEnvironments[i] != NULL); i++) + for (i = 0; ((i + 1) < MAX_ENVS) && (pszEnvironments[i] != nullptr); i++) Data.m_pszEnv[i] = strdup(pszEnvironments[i]); - Data.m_pszEnv[i+1] = NULL; + Data.m_pszEnv[i+1] = nullptr; } else - Data.m_pszEnv[0] = NULL; + Data.m_pszEnv[0] = nullptr; - if (Security != NULL) + if (Security != nullptr) { Data.m_uid = static_cast<oslSecurityImpl*>(Security)->m_pPasswd.pw_uid; Data.m_gid = static_cast<oslSecurityImpl*>(Security)->m_pPasswd.pw_gid; @@ -636,28 +636,28 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, Data.m_pProcImpl = static_cast<oslProcessImpl*>(malloc(sizeof(oslProcessImpl))); Data.m_pProcImpl->m_pid = 0; Data.m_pProcImpl->m_terminated = osl_createCondition(); - Data.m_pProcImpl->m_pnext = NULL; + Data.m_pProcImpl->m_pnext = nullptr; - if (ChildListMutex == NULL) + if (ChildListMutex == nullptr) ChildListMutex = osl_createMutex(); Data.m_started = osl_createCondition(); hThread = osl_createThread(ChildStatusProc, &Data); - if (hThread != 0) + if (hThread != nullptr) { - osl_waitCondition(Data.m_started, NULL); + osl_waitCondition(Data.m_started, nullptr); } osl_destroyCondition(Data.m_started); - for (i = 0; Data.m_pszArgs[i] != NULL; i++) + for (i = 0; Data.m_pszArgs[i] != nullptr; i++) free(const_cast<char *>(Data.m_pszArgs[i])); - for (i = 0; Data.m_pszEnv[i] != NULL; i++) + for (i = 0; Data.m_pszEnv[i] != nullptr; i++) free(Data.m_pszEnv[i]); - if ( Data.m_pszDir != 0 ) + if ( Data.m_pszDir != nullptr ) { free(const_cast<char *>(Data.m_pszDir)); } @@ -666,7 +666,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, if (Data.m_pProcImpl->m_pid != 0) { - assert(hThread != 0); + assert(hThread != nullptr); *pProcess = Data.m_pProcImpl; @@ -690,7 +690,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process) { - if (Process == NULL) + if (Process == nullptr) return osl_Process_E_Unknown; if (kill(static_cast<oslProcessImpl*>(Process)->m_pid, SIGKILL) != 0) @@ -719,7 +719,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) { oslProcessImpl* pChild; - if (ChildListMutex == NULL) + if (ChildListMutex == nullptr) ChildListMutex = osl_createMutex(); osl_acquireMutex(ChildListMutex); @@ -727,7 +727,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) pChild = ChildList; /* check if it is one of our child processes */ - while (pChild != NULL) + while (pChild != nullptr) { if (Ident == (sal_uInt32) pChild->m_pid) break; @@ -739,7 +739,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) pProcImpl->m_pid = Ident; pProcImpl->m_terminated = osl_createCondition(); - if (pChild != NULL) + if (pChild != nullptr) { /* process is a child so insert into list */ pProcImpl->m_pnext = pChild->m_pnext; @@ -751,25 +751,25 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident) osl_setCondition(pProcImpl->m_terminated); } else - pProcImpl->m_pnext = NULL; + pProcImpl->m_pnext = nullptr; osl_releaseMutex(ChildListMutex); } else - pProcImpl = NULL; + pProcImpl = nullptr; return pProcImpl; } void SAL_CALL osl_freeProcessHandle(oslProcess Process) { - if (Process != NULL) + if (Process != nullptr) { - oslProcessImpl *pChild, *pPrev = NULL; + oslProcessImpl *pChild, *pPrev = nullptr; - OSL_ASSERT(ChildListMutex != NULL); + OSL_ASSERT(ChildListMutex != nullptr); - if ( ChildListMutex == 0 ) + if ( ChildListMutex == nullptr ) { return; } @@ -779,11 +779,11 @@ void SAL_CALL osl_freeProcessHandle(oslProcess Process) pChild = ChildList; /* remove process from child list */ - while (pChild != NULL) + while (pChild != nullptr) { if (pChild == static_cast<oslProcessImpl*>(Process)) { - if (pPrev != NULL) + if (pPrev != nullptr) pPrev->m_pnext = pChild->m_pnext; else ChildList = pChild->m_pnext; @@ -873,7 +873,7 @@ bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat) if ((fd = open(name,O_RDONLY)) >=0 ) { - char* tmp=0; + char* tmp=nullptr; char prstatbuf[512]; memset(prstatbuf,0,512); bRet = safeRead(fd, prstatbuf, 511); @@ -930,7 +930,7 @@ bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat) if ((fd = open(name,O_RDONLY)) >=0 ) { - char* tmp=0; + char* tmp=nullptr; char prstatusbuf[512]; memset(prstatusbuf,0,512); bRet = safeRead(fd, prstatusbuf, 511); @@ -989,7 +989,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F { pid_t pid; - if (Process == NULL) + if (Process == nullptr) pid = getpid(); else pid = static_cast<oslProcessImpl*>(Process)->m_pid; @@ -1007,7 +1007,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F if (Fields & osl_Process_EXITCODE) { - if ((Process != NULL) && + if ((Process != nullptr) && osl_checkCondition(static_cast<oslProcessImpl*>(Process)->m_terminated)) { pInfo->Code = static_cast<oslProcessImpl*>(Process)->m_status; @@ -1123,7 +1123,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F static bool is_timeout(const struct timeval* tend) { struct timeval tcurrent; - gettimeofday(&tcurrent, NULL); + gettimeofday(&tcurrent, nullptr); return (tcurrent.tv_sec >= tend->tv_sec); } @@ -1151,13 +1151,13 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti OSL_PRECOND(Process, "osl_joinProcess: Invalid parameter"); OSL_ASSERT(ChildListMutex); - if (NULL == Process || 0 == ChildListMutex) + if (nullptr == Process || nullptr == ChildListMutex) return osl_Process_E_Unknown; osl_acquireMutex(ChildListMutex); /* check if process is a child of ours */ - while (pChild != NULL) + while (pChild != nullptr) { if (pChild == static_cast<oslProcessImpl*>(Process)) break; @@ -1167,7 +1167,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti osl_releaseMutex(ChildListMutex); - if (pChild != NULL) + if (pChild != nullptr) { oslConditionResult cond_res = osl_waitCondition(pChild->m_terminated, pTimeout); @@ -1186,7 +1186,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti bool timeout = false; struct timeval tend; - gettimeofday(&tend, NULL); + gettimeofday(&tend, nullptr); tend.tv_sec += pTimeout->Seconds; @@ -1207,7 +1207,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti oslProcessError SAL_CALL osl_joinProcess(oslProcess Process) { - return osl_joinProcessWithTimeout(Process, NULL); + return osl_joinProcessWithTimeout(Process, nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 20cda833bf12..f5d81dbb9cbf 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -102,7 +102,7 @@ oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) /* Determine address of "main()" function. */ void * addr = dlsym (RTLD_DEFAULT, "main"); #endif - if (addr != 0) + if (addr != nullptr) { /* Determine module URL. */ if (osl_getModuleURLFromAddress (addr, ppFileURL)) @@ -133,7 +133,7 @@ static struct CommandArgs_Impl g_command_args = { PTHREAD_MUTEX_INITIALIZER, 0, - 0 + nullptr }; /*************************************** @@ -202,7 +202,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) if (g_command_args.m_nCount == 0) { rtl_uString** ppArgs = static_cast<rtl_uString**>(rtl_allocateZeroMemory (argc * sizeof(rtl_uString*))); - if (ppArgs != 0) + if (ppArgs != nullptr) { rtl_TextEncoding encoding = osl_getThreadTextEncoding(); for (int i = 0; i < argc; i++) @@ -212,7 +212,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) argv[i], rtl_str_getLength (argv[i]), encoding, OSTRING_TO_OUSTRING_CVTFLAGS); } - if (ppArgs[0] != 0) + if (ppArgs[0] != nullptr) { #if !defined(ANDROID) && !defined(IOS) // No use searching PATH on Android or iOS /* see @ osl_getExecutableFile(). */ @@ -220,11 +220,11 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { const rtl::OUString PATH ("PATH"); - rtl_uString * pSearchPath = 0; + rtl_uString * pSearchPath = nullptr; osl_getEnvironment (PATH.pData, &pSearchPath); if (pSearchPath) { - rtl_uString * pSearchResult = 0; + rtl_uString * pSearchResult = nullptr; osl_searchPath (ppArgs[0], pSearchPath, &pSearchResult); if (pSearchResult) { @@ -235,7 +235,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) } } #endif - rtl_uString * pArg0 = 0; + rtl_uString * pArg0 = nullptr; if (realpath_u (ppArgs[0], &pArg0)) { osl_getFileURLFromSystemPath (pArg0, &(ppArgs[0])); @@ -256,7 +256,7 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin { oslProcessError result = osl_Process_E_NotFound; rtl_TextEncoding encoding = osl_getThreadTextEncoding(); - rtl_String* pstr_env_var = 0; + rtl_String* pstr_env_var = nullptr; OSL_PRECOND(pustrEnvVar, "osl_getEnvironment(): Invalid parameter"); OSL_PRECOND(ppustrValue, "osl_getEnvironment(): Invalid parameter"); @@ -265,16 +265,16 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin &pstr_env_var, rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding, OUSTRING_TO_OSTRING_CVTFLAGS); - if (pstr_env_var != 0) + if (pstr_env_var != nullptr) { const char* p_env_var = getenv (rtl_string_getStr (pstr_env_var)); - if (p_env_var != 0) + if (p_env_var != nullptr) { rtl_string2UString( ppustrValue, p_env_var, strlen(p_env_var), encoding, OSTRING_TO_OUSTRING_CVTFLAGS); - OSL_ASSERT(*ppustrValue != NULL); + OSL_ASSERT(*ppustrValue != nullptr); result = osl_Process_E_None; } @@ -291,8 +291,8 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin { oslProcessError result = osl_Process_E_Unknown; rtl_TextEncoding encoding = osl_getThreadTextEncoding(); - rtl_String* pstr_env_var = 0; - rtl_String* pstr_val = 0; + rtl_String* pstr_env_var = nullptr; + rtl_String* pstr_val = nullptr; OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter"); OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter"); @@ -307,7 +307,7 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding, OUSTRING_TO_OSTRING_CVTFLAGS); - if (pstr_env_var != 0 && pstr_val != 0) + if (pstr_env_var != nullptr && pstr_val != nullptr) { #if defined (SOLARIS) rtl_String * pBuffer = NULL; @@ -334,7 +334,7 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uStrin if (pstr_val) rtl_string_release(pstr_val); - if (pstr_env_var != 0) + if (pstr_env_var != nullptr) rtl_string_release(pstr_env_var); return result; @@ -347,7 +347,7 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar) { oslProcessError result = osl_Process_E_Unknown; rtl_TextEncoding encoding = osl_getThreadTextEncoding(); - rtl_String* pstr_env_var = 0; + rtl_String* pstr_env_var = nullptr; OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter"); @@ -397,15 +397,15 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir OSL_PRECOND(ppustrWorkingDir, "osl_getProcessWorkingDir(): Invalid parameter"); - if (getcwd (buffer, sizeof(buffer)) != 0) + if (getcwd (buffer, sizeof(buffer)) != nullptr) { - rtl_uString* ustrTmp = 0; + rtl_uString* ustrTmp = nullptr; rtl_string2UString( &ustrTmp, buffer, strlen(buffer), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS); - if (ustrTmp != 0) + if (ustrTmp != nullptr) { if (osl_getFileURLFromSystemPath (ustrTmp, ppustrWorkingDir) == osl_File_E_None) result = osl_Process_E_None; @@ -431,7 +431,7 @@ struct ProcessLocale_Impl static struct ProcessLocale_Impl g_process_locale = { PTHREAD_MUTEX_INITIALIZER, - 0 + nullptr }; /********************************************** @@ -445,7 +445,7 @@ oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale ) { pthread_mutex_lock(&(g_process_locale.m_mutex)); - if (g_process_locale.m_pLocale == 0) + if (g_process_locale.m_pLocale == nullptr) _imp_getProcessLocale (&(g_process_locale.m_pLocale)); *ppLocale = g_process_locale.m_pLocale; result = osl_Process_E_None; diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 38ccda3c67c6..8cad96512bfb 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -150,17 +150,17 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o osl_TProfileImpl* pProfile; bool bRet = false; - if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL ) + if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == nullptr ) { - return NULL; + return nullptr; } pProfile = static_cast<osl_TProfileImpl*>(calloc(1, sizeof(osl_TProfileImpl))); - if ( pProfile == 0 ) + if ( pProfile == nullptr ) { closeFileImpl(pFile, Flags); - return 0; + return nullptr; } pProfile->m_Flags = Flags & FLG_USER; @@ -175,10 +175,10 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o pProfile->m_Stamp = OslProfile_getFileStamp(pFile); bRet=loadProfile(pFile, pProfile); - bRet &= realpath(pszProfileName, pProfile->m_FileName) != NULL; + bRet &= realpath(pszProfileName, pProfile->m_FileName) != nullptr; SAL_WARN_IF(!bRet, "sal.osl", "realpath(pszProfileName, pProfile->m_FileName) != NULL ==> false"); - if (pProfile->m_pFile == NULL) + if (pProfile->m_pFile == nullptr) closeFileImpl(pFile,pProfile->m_Flags); return pProfile; @@ -189,7 +189,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) osl_TProfileImpl* pProfile = static_cast<osl_TProfileImpl*>(Profile); osl_TProfileImpl* pTmpProfile; - if ( Profile == 0 ) + if ( Profile == nullptr ) { return sal_False; } @@ -210,7 +210,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) { pTmpProfile = acquireProfile(Profile, true); - if ( pTmpProfile != 0 ) + if ( pTmpProfile != nullptr ) { bool bRet = storeProfile(pTmpProfile, true); SAL_WARN_IF(!bRet, "sal.osl", "storeProfile(pTmpProfile, true) ==> false"); @@ -222,7 +222,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) pTmpProfile = acquireProfile(Profile, false); } - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { pthread_mutex_unlock(&(pProfile->m_AccessLock)); @@ -232,42 +232,42 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) pProfile = pTmpProfile; - if (pProfile->m_pFile != NULL) + if (pProfile->m_pFile != nullptr) closeFileImpl(pProfile->m_pFile,pProfile->m_Flags); - pProfile->m_pFile = NULL; + pProfile->m_pFile = nullptr; pProfile->m_FileName[0] = '\0'; /* release whole profile data types memory */ if ( pProfile->m_NoLines > 0) { unsigned int idx=0; - if ( pProfile->m_Lines != 0 ) + if ( pProfile->m_Lines != nullptr ) { for ( idx = 0 ; idx < pProfile->m_NoLines ; ++idx) { - if ( pProfile->m_Lines[idx] != 0 ) + if ( pProfile->m_Lines[idx] != nullptr ) { free(pProfile->m_Lines[idx]); - pProfile->m_Lines[idx]=0; + pProfile->m_Lines[idx]=nullptr; } } free(pProfile->m_Lines); - pProfile->m_Lines=0; + pProfile->m_Lines=nullptr; } - if ( pProfile->m_Sections != 0 ) + if ( pProfile->m_Sections != nullptr ) { /*osl_TProfileSection* pSections=pProfile->m_Sections;*/ for ( idx = 0 ; idx < pProfile->m_NoSections ; ++idx ) { - if ( pProfile->m_Sections[idx].m_Entries != 0 ) + if ( pProfile->m_Sections[idx].m_Entries != nullptr ) { free(pProfile->m_Sections[idx].m_Entries); - pProfile->m_Sections[idx].m_Entries=0; + pProfile->m_Sections[idx].m_Entries=nullptr; } } free(pProfile->m_Sections); - pProfile->m_Sections=0; + pProfile->m_Sections=nullptr; } } @@ -286,7 +286,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) osl_TFile* pFile; bool bRet = false; - if ( pProfile == 0 ) + if ( pProfile == nullptr ) { return sal_False; } @@ -301,7 +301,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) } pFile = pProfile->m_pFile; - if ( !( pFile != 0 && pFile->m_Handle >= 0 ) ) + if ( !( pFile != nullptr && pFile->m_Handle >= 0 ) ) { pthread_mutex_unlock(&(pProfile->m_AccessLock)); @@ -324,7 +324,7 @@ static bool writeProfileImpl(osl_TFile* pFile) unsigned int nLen=0; #endif - if ( !( pFile != 0 && pFile->m_Handle >= 0 ) || ( pFile->m_pWriteBuf == 0 ) ) + if ( !( pFile != nullptr && pFile->m_Handle >= 0 ) || ( pFile->m_pWriteBuf == nullptr ) ) { return false; } @@ -341,7 +341,7 @@ static bool writeProfileImpl(osl_TFile* pFile) } free(pFile->m_pWriteBuf); - pFile->m_pWriteBuf=0; + pFile->m_pWriteBuf=nullptr; pFile->m_nWriteBufLen=0; pFile->m_nWriteBufFree=0; @@ -356,14 +356,14 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, const sal_Char* pszDefault) { sal_uInt32 NoEntry; - sal_Char* pStr=0; - osl_TProfileImpl* pProfile=0; - osl_TProfileImpl* pTmpProfile=0; + sal_Char* pStr=nullptr; + osl_TProfileImpl* pProfile=nullptr; + osl_TProfileImpl* pTmpProfile=nullptr; bool bRet = false; pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { return sal_False; } @@ -379,7 +379,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, pProfile = acquireProfile(Profile, false); - if ( pProfile == NULL ) + if ( pProfile == nullptr ) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -389,10 +389,10 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { osl_TProfileSection* pSec; - if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) && + if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != nullptr) && (NoEntry < pSec->m_NoEntries) && ((pStr = strchr(pProfile->m_Lines[pSec->m_Entries[NoEntry].m_Line], - '=')) != NULL)) + '=')) != nullptr)) { pStr++; } @@ -401,9 +401,9 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, pStr=const_cast<sal_Char*>(pszDefault); } - if ( pStr != 0 ) + if ( pStr != nullptr ) { - pStr = stripBlanks(pStr, NULL); + pStr = stripBlanks(pStr, nullptr); MaxLen = (MaxLen - 1 < strlen(pStr)) ? (MaxLen - 1) : strlen(pStr); pStr = stripBlanks(pStr, &MaxLen); strncpy(pszString, pStr, MaxLen); @@ -417,7 +417,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, SAL_WARN_IF(!bRet, "sal.osl", "releaseProfile(pProfile) ==> false"); (void)bRet; - if ( pStr == 0 ) + if ( pStr == nullptr ) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -467,7 +467,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) { i = 0; - while (Strings[i] != NULL) + while (Strings[i] != nullptr) { if (strcasecmp(Line, Strings[i]) == 0) { @@ -490,14 +490,14 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, bool bRet = false; sal_uInt32 NoEntry; sal_Char* pStr; - sal_Char* Line = 0; + sal_Char* Line = nullptr; osl_TProfileSection* pSec; - osl_TProfileImpl* pProfile = 0; - osl_TProfileImpl* pTmpProfile = 0; + osl_TProfileImpl* pProfile = nullptr; + osl_TProfileImpl* pTmpProfile = nullptr; pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { return sal_False; } @@ -514,7 +514,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, pProfile=acquireProfile(Profile, true); - if (pProfile == NULL) + if (pProfile == nullptr) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -525,7 +525,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { - if ((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) == NULL) + if ((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) == nullptr) { Line[0] = '\0'; addLine(pProfile, Line); @@ -535,7 +535,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, Line[1 + strlen(pszSection)] = ']'; Line[2 + strlen(pszSection)] = '\0'; - if (((pStr = addLine(pProfile, Line)) == NULL) || + if (((pStr = addLine(pProfile, Line)) == nullptr) || (! addSection(pProfile, pProfile->m_NoLines - 1, &pStr[1], strlen(pszSection)))) { bRet=releaseProfile(pProfile); @@ -563,7 +563,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, else i = pSec->m_Line + 1; - if (((pStr = insertLine(pProfile, Line, i)) == NULL) || + if (((pStr = insertLine(pProfile, Line, i)) == nullptr) || (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry)))) { bRet=releaseProfile(pProfile); @@ -595,7 +595,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, SAL_WARN_IF(!bRet, "sal.osl", "releaseProfile(pProfile) ==> false"); pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); - if ( Line!= 0 ) + if ( Line!= nullptr ) { free(Line); } @@ -628,7 +628,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, int i, n = 0; bool bRet = false; - while (Strings[n] != NULL) + while (Strings[n] != nullptr) ++n; if ((i = Value - FirstId) >= n) @@ -644,13 +644,13 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, const sal_Char *pszEntry) { sal_uInt32 NoEntry; - osl_TProfileImpl* pProfile = 0; - osl_TProfileImpl* pTmpProfile = 0; + osl_TProfileImpl* pProfile = nullptr; + osl_TProfileImpl* pTmpProfile = nullptr; bool bRet = false; pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { return sal_False; } @@ -666,7 +666,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, pProfile = acquireProfile(Profile, true); - if (pProfile == NULL) + if (pProfile == nullptr) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -676,7 +676,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { osl_TProfileSection* pSec; - if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) && + if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != nullptr) && (NoEntry < pSec->m_NoEntries)) { removeLine(pProfile, pSec->m_Entries[NoEntry].m_Line); @@ -713,13 +713,13 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, { sal_uInt32 i, n = 0; sal_uInt32 NoEntry; - osl_TProfileImpl* pProfile = 0; - osl_TProfileImpl* pTmpProfile = 0; + osl_TProfileImpl* pProfile = nullptr; + osl_TProfileImpl* pTmpProfile = nullptr; bool bRet = false; pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { return 0; @@ -738,7 +738,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, pProfile = acquireProfile(Profile, false); - if (pProfile == NULL) + if (pProfile == nullptr) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -748,7 +748,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { osl_TProfileSection* pSec; - if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != NULL) + if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != nullptr) { if (MaxLen != 0) { @@ -797,13 +797,13 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_uInt32 MaxLen) { sal_uInt32 i, n = 0; - osl_TProfileImpl* pProfile = 0; - osl_TProfileImpl* pTmpProfile = 0; + osl_TProfileImpl* pProfile = nullptr; + osl_TProfileImpl* pTmpProfile = nullptr; bool bRet = false; pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); - if ( pTmpProfile == 0 ) + if ( pTmpProfile == nullptr ) { return 0; } @@ -820,7 +820,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, pProfile = acquireProfile(Profile, false); - if (pProfile == NULL) + if (pProfile == nullptr) { pthread_mutex_unlock(&(pTmpProfile->m_AccessLock)); @@ -892,7 +892,7 @@ static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) sal_Char* pEnvValue; pEnvValue = getenv( "STAR_PROFILE_LOCKING_DISABLED" ); - if ( pEnvValue == 0 ) + if ( pEnvValue == nullptr ) { bLockingDisabled = false; @@ -971,7 +971,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro ((pFile->m_Handle = open(pszFilename, O_RDWR)) < 0)) { free(pFile); - return NULL; + return nullptr; } } @@ -985,7 +985,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption Pro "fcntl to set FD_CLOEXEC failed for " << pszFilename); } - pFile->m_pWriteBuf=0; + pFile->m_pWriteBuf=nullptr; pFile->m_nWriteBufFree=0; pFile->m_nWriteBufLen=0; @@ -1001,7 +1001,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) { osl_TStamp stamp = 0; - if ( pFile == 0 ) + if ( pFile == nullptr ) { return stamp; } @@ -1053,16 +1053,16 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile) { int Max, Free, nLineBytes = 0; sal_Char* pChr; - sal_Char* pLine = NULL; + sal_Char* pLine = nullptr; sal_Char* pNewLine; - if ( pFile == 0 ) + if ( pFile == nullptr ) { - return 0; + return nullptr; } if (pFile->m_Handle < 0) - return NULL; + return nullptr; do { @@ -1082,7 +1082,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile) if( pLine ) rtl_freeMemory( pLine ); - pLine = NULL; + pLine = nullptr; break; } @@ -1141,12 +1141,12 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) { unsigned int Len = strlen(pszLine); - if ( pFile == 0 || pFile->m_Handle < 0 ) + if ( pFile == nullptr || pFile->m_Handle < 0 ) { return false; } - if ( pFile->m_pWriteBuf == 0 ) + if ( pFile->m_pWriteBuf == nullptr ) { pFile->m_pWriteBuf = static_cast<sal_Char*>(malloc(Len+3)); pFile->m_nWriteBufLen = Len+3; @@ -1159,7 +1159,7 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) sal_Char* pTmp; pTmp=static_cast<sal_Char*>(realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) )); - if ( pTmp == 0 ) + if ( pTmp == nullptr ) { return false; } @@ -1181,7 +1181,7 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen) { - if ( ( pLen != NULL ) && ( *pLen != 0 ) ) + if ( ( pLen != nullptr ) && ( *pLen != 0 ) ) { while ((String[*pLen - 1] == ' ') || (String[*pLen - 1] == '\t')) (*pLen)--; @@ -1203,7 +1203,7 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { - if (pProfile->m_Lines == NULL) + if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); @@ -1218,18 +1218,18 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) pProfile->m_MaxLines * sizeof(sal_Char *))); for ( idx = oldmax ; idx < pProfile->m_MaxLines ; ++idx ) { - pProfile->m_Lines[idx]=0; + pProfile->m_Lines[idx]=nullptr; } } } - if (pProfile->m_Lines == NULL) + if (pProfile->m_Lines == nullptr) { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return NULL; + return nullptr; } - if ( pProfile->m_Lines[pProfile->m_NoLines] != 0 ) + if ( pProfile->m_Lines[pProfile->m_NoLines] != nullptr ) { free(pProfile->m_Lines[pProfile->m_NoLines]); } @@ -1242,7 +1242,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { - if (pProfile->m_Lines == NULL) + if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); @@ -1258,11 +1258,11 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa (pProfile->m_MaxLines - pProfile->m_NoLines - 1) * sizeof(sal_Char*)); } - if (pProfile->m_Lines == NULL) + if (pProfile->m_Lines == nullptr) { pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; - return NULL; + return nullptr; } } @@ -1301,7 +1301,7 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) if (LineNo < pProfile->m_NoLines) { free(pProfile->m_Lines[LineNo]); - pProfile->m_Lines[LineNo]=0; + pProfile->m_Lines[LineNo]=nullptr; if (pProfile->m_NoLines - LineNo > 1) { sal_uInt32 i, n; @@ -1328,7 +1328,7 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) } else { - pProfile->m_Lines[LineNo] = 0; + pProfile->m_Lines[LineNo] = nullptr; } pProfile->m_NoLines--; @@ -1354,11 +1354,11 @@ static bool addEntry(osl_TProfileImpl* pProfile, int Line, sal_Char* Entry, sal_uInt32 Len) { - if (pSection != NULL) + if (pSection != nullptr) { if (pSection->m_NoEntries >= pSection->m_MaxEntries) { - if (pSection->m_Entries == NULL) + if (pSection->m_Entries == nullptr) { pSection->m_MaxEntries = ENTRIES_INI; pSection->m_Entries = static_cast<osl_TProfileEntry *>(malloc( @@ -1371,7 +1371,7 @@ static bool addEntry(osl_TProfileImpl* pProfile, pSection->m_MaxEntries * sizeof(osl_TProfileEntry))); } - if (pSection->m_Entries == NULL) + if (pSection->m_Entries == nullptr) { pSection->m_NoEntries = 0; pSection->m_MaxEntries = 0; @@ -1415,7 +1415,7 @@ static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Sec { if (pProfile->m_NoSections >= pProfile->m_MaxSections) { - if (pProfile->m_Sections == NULL) + if (pProfile->m_Sections == nullptr) { pProfile->m_MaxSections = SECTIONS_INI; pProfile->m_Sections = static_cast<osl_TProfileSection *>(calloc(pProfile->m_MaxSections, sizeof(osl_TProfileSection))); @@ -1430,11 +1430,11 @@ static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Sec pProfile->m_MaxSections * sizeof(osl_TProfileSection))); for ( idx = oldmax ; idx < pProfile->m_MaxSections ; ++idx ) { - pProfile->m_Sections[idx].m_Entries=0; + pProfile->m_Sections[idx].m_Entries=nullptr; } } - if (pProfile->m_Sections == NULL) + if (pProfile->m_Sections == nullptr) { pProfile->m_NoSections = 0; pProfile->m_MaxSections = 0; @@ -1444,11 +1444,11 @@ static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Sec pProfile->m_NoSections++; - if ( pProfile->m_Sections[(pProfile->m_NoSections) - 1].m_Entries != 0 ) + if ( pProfile->m_Sections[(pProfile->m_NoSections) - 1].m_Entries != nullptr ) { free(pProfile->m_Sections[(pProfile->m_NoSections) - 1].m_Entries); } - pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries = NULL; + pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries = nullptr; pProfile->m_Sections[pProfile->m_NoSections - 1].m_NoEntries = 0; pProfile->m_Sections[pProfile->m_NoSections - 1].m_MaxEntries = 0; @@ -1466,7 +1466,7 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect if ((Section = pSection - pProfile->m_Sections) < pProfile->m_NoSections) { free (pSection->m_Entries); - pSection->m_Entries=0; + pSection->m_Entries=nullptr; if (pProfile->m_NoSections - Section > 1) { memmove(&pProfile->m_Sections[Section], &pProfile->m_Sections[Section + 1], @@ -1475,11 +1475,11 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect memset(&pProfile->m_Sections[pProfile->m_NoSections - 1], 0, (pProfile->m_MaxSections - pProfile->m_NoSections) * sizeof(osl_TProfileSection)); - pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries = 0; + pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries = nullptr; } else { - pSection->m_Entries = 0; + pSection->m_Entries = nullptr; } pProfile->m_NoSections--; @@ -1496,7 +1496,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, static sal_uInt32 Sect = 0; sal_uInt32 i, n; sal_uInt32 Len; - osl_TProfileSection* pSec=0; + osl_TProfileSection* pSec=nullptr; Len = strlen(Section); @@ -1535,7 +1535,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, } } else - pSec = NULL; + pSec = nullptr; return pSec; } @@ -1563,7 +1563,7 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) OSL_VERIFY(OslProfile_rewindFile(pFile, false)); - while ( ( pLine=OslProfile_getLine(pFile) ) != 0 ) + while ( ( pLine=OslProfile_getLine(pFile) ) != nullptr ) { sal_Char* bWasAdded = addLine( pProfile, pLine ); rtl_freeMemory( pLine ); @@ -1574,12 +1574,12 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) for (i = 0; i < pProfile->m_NoLines; i++) { - pStr = stripBlanks(pProfile->m_Lines[i], NULL); + pStr = stripBlanks(pProfile->m_Lines[i], nullptr); if ((*pStr == '\0') || (*pStr == ';')) continue; - if ((*pStr != '[') || ((pChar = strrchr(pStr, ']')) == NULL) || + if ((*pStr != '[') || ((pChar = strrchr(pStr, ']')) == nullptr) || ((pChar - pStr) <= 2)) { /* insert entry */ @@ -1587,7 +1587,7 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) if (pProfile->m_NoSections < 1) continue; - if ((pChar = strchr(pStr, '=')) == NULL) + if ((pChar = strchr(pStr, '=')) == nullptr) pChar = pStr + strlen(pStr); if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1], @@ -1616,7 +1616,7 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) { - if (pProfile->m_Lines != NULL) + if (pProfile->m_Lines != nullptr) { if (pProfile->m_Flags & FLG_MODIFIED) { @@ -1624,7 +1624,7 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) osl_TFile* pTmpFile = osl_openTmpProfileImpl(pProfile); - if ( pTmpFile == 0 ) + if ( pTmpFile == nullptr ) { return false; } @@ -1638,12 +1638,12 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) if ( ! writeProfileImpl(pTmpFile) ) { - if ( pTmpFile->m_pWriteBuf != 0 ) + if ( pTmpFile->m_pWriteBuf != nullptr ) { free(pTmpFile->m_pWriteBuf); } - pTmpFile->m_pWriteBuf=0; + pTmpFile->m_pWriteBuf=nullptr; pTmpFile->m_nWriteBufLen=0; pTmpFile->m_nWriteBufFree=0; @@ -1669,7 +1669,7 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) removeLine(pProfile, pProfile->m_NoLines - 1); free(pProfile->m_Lines); - pProfile->m_Lines = NULL; + pProfile->m_Lines = nullptr; pProfile->m_NoLines = 0; pProfile->m_MaxLines = 0; @@ -1677,7 +1677,7 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) removeSection(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1]); free(pProfile->m_Sections); - pProfile->m_Sections = NULL; + pProfile->m_Sections = nullptr; pProfile->m_NoSections = 0; pProfile->m_MaxSections = 0; } @@ -1688,7 +1688,7 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) { - osl_TFile* pFile=0; + osl_TFile* pFile=nullptr; sal_Char const * pszExtension = "tmp"; sal_Char pszTmpName[PATH_MAX]; oslProfileOption PFlags=0; @@ -1700,7 +1700,7 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) if ( pszTmpName[0] == 0 ) { - return 0; + return nullptr; } if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) ) @@ -1791,9 +1791,9 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) PFlags = osl_Profile_DEFAULT; } - if (pProfile == NULL) + if (pProfile == nullptr) { - if ( ( pProfile = static_cast<osl_TProfileImpl*>(osl_openProfile(0, PFlags )) ) != NULL ) + if ( ( pProfile = static_cast<osl_TProfileImpl*>(osl_openProfile(nullptr, PFlags )) ) != nullptr ) { pProfile->m_Flags |= FLG_AUTOOPEN; } @@ -1807,7 +1807,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) osl_TStamp Stamp; if (! (pProfile->m_pFile = openFileImpl(pProfile->m_FileName, pProfile->m_Flags | PFlags ))) - return NULL; + return nullptr; Stamp = OslProfile_getFileStamp(pProfile->m_pFile); @@ -1824,7 +1824,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) /* A readlock file could not be written */ if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable) { - return NULL; + return nullptr; } } } @@ -1835,7 +1835,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) static bool releaseProfile(osl_TProfileImpl* pProfile) { - if ( pProfile == 0 ) + if ( pProfile == nullptr ) { return false; } @@ -1856,7 +1856,7 @@ static bool releaseProfile(osl_TProfileImpl* pProfile) } closeFileImpl(pProfile->m_pFile,pProfile->m_Flags); - pProfile->m_pFile = NULL; + pProfile->m_pFile = nullptr; } } diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 64ca6e67118e..da7ede593404 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -74,7 +74,7 @@ void sal_detail_initialize(int argc, char ** argv) { sal_initGlobalTimer(); #if HAVE_SYSLOG_H const char *use_syslog = getenv("SAL_LOG_SYSLOG"); - sal_use_syslog = use_syslog != NULL && !strcmp(use_syslog, "1"); + sal_use_syslog = use_syslog != nullptr && !strcmp(use_syslog, "1"); if (sal_use_syslog) openlog("libreoffice", 0, LOG_USER); #endif diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index 5ee9adf3945d..16a5f74cba36 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -81,8 +81,8 @@ static oslSecurityImpl * growSecurityImpl( oslSecurityImpl * impl, std::size_t * bufSize) { std::size_t n = 0; - oslSecurityImpl * p = NULL; - if (impl == NULL) { + oslSecurityImpl * p = nullptr; + if (impl == nullptr) { if (!sysconf_SC_GETPW_R_SIZE_MAX(&n)) { /* choose something sensible (the callers of growSecurityImpl will detect it if the allocated buffer is too small: */ @@ -105,7 +105,7 @@ static oslSecurityImpl * growSecurityImpl( p = static_cast<oslSecurityImpl *>(realloc(impl, n)); memset (p, 0, n); } - if (p == NULL) { + if (p == nullptr) { free(impl); } return p; @@ -118,24 +118,24 @@ static void deleteSecurityImpl(oslSecurityImpl * impl) { oslSecurity SAL_CALL osl_getCurrentSecurity() { std::size_t n = 0; - oslSecurityImpl * p = NULL; + oslSecurityImpl * p = nullptr; for (;;) { struct passwd * found; p = growSecurityImpl(p, &n); - if (p == NULL) { - return NULL; + if (p == nullptr) { + return nullptr; } switch (getpwuid_r(getuid(), &p->m_pPasswd, p->m_buffer, n, &found)) { case ERANGE: break; case 0: - if (found != NULL) { + if (found != nullptr) { return p; } /* fall through */ default: deleteSecurityImpl(p); - return NULL; + return nullptr; } } } @@ -147,12 +147,12 @@ oslSecurityError SAL_CALL osl_loginUser( ) { oslSecurityError Error; - rtl_String* strUserName=0; - rtl_String* strPassword=0; - sal_Char* pszUserName=0; - sal_Char* pszPassword=0; + rtl_String* strUserName=nullptr; + rtl_String* strPassword=nullptr; + sal_Char* pszUserName=nullptr; + sal_Char* pszPassword=nullptr; - if ( ustrUserName != 0 ) + if ( ustrUserName != nullptr ) { rtl_uString2String( &strUserName, rtl_uString_getStr(ustrUserName), @@ -162,7 +162,7 @@ oslSecurityError SAL_CALL osl_loginUser( pszUserName = rtl_string_getStr(strUserName); } - if ( ustrPassword != 0 ) + if ( ustrPassword != nullptr ) { rtl_uString2String( &strPassword, rtl_uString_getStr(ustrPassword), @@ -174,7 +174,7 @@ oslSecurityError SAL_CALL osl_loginUser( Error=osl_psz_loginUser(pszUserName,pszPassword,pSecurity); - if ( strUserName != 0 ) + if ( strUserName != nullptr ) { rtl_string_release(strUserName); } @@ -222,7 +222,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent bRet = osl_psz_getUserIdent(Security,pszIdent,sizeof(pszIdent)); rtl_string2UString( ustrIdent, pszIdent, rtl_str_getLength( pszIdent ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); - SAL_WARN_IF(*ustrIdent == NULL, "sal.osl", "*ustrIdent == NULL"); + SAL_WARN_IF(*ustrIdent == nullptr, "sal.osl", "*ustrIdent == NULL"); return bRet; } @@ -234,7 +234,7 @@ bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); - if (pSecImpl == NULL) + if (pSecImpl == nullptr) return false; nChr = snprintf(buffer, sizeof(buffer), "%u", pSecImpl->m_pPasswd.pw_uid); @@ -256,7 +256,7 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName) bRet = osl_psz_getUserName(Security,pszName,sizeof(pszName)); rtl_string2UString( ustrName, pszName, rtl_str_getLength( pszName ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); - SAL_WARN_IF(*ustrName == NULL, "sal.osl", "ustrName == NULL"); + SAL_WARN_IF(*ustrName == nullptr, "sal.osl", "ustrName == NULL"); return bRet; } @@ -265,7 +265,7 @@ static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName { oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); - if (pSecImpl == NULL || pSecImpl->m_pPasswd.pw_name == NULL) + if (pSecImpl == nullptr || pSecImpl->m_pPasswd.pw_name == nullptr) return false; strncpy(pszName, pSecImpl->m_pPasswd.pw_name, nMax); @@ -285,7 +285,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect if ( bRet ) { rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); - SAL_WARN_IF(*pustrDirectory == NULL, "sal.osl", "*pustrDirectory == NULL"); + SAL_WARN_IF(*pustrDirectory == nullptr, "sal.osl", "*pustrDirectory == NULL"); osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory ); } @@ -296,7 +296,7 @@ static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirec { oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); - if (pSecImpl == NULL) + if (pSecImpl == nullptr) return false; #ifdef ANDROID @@ -346,7 +346,7 @@ static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirec /* if current user, check also environment for HOME */ if (getuid() == pSecImpl->m_pPasswd.pw_uid) { - sal_Char *pStr = NULL; + sal_Char *pStr = nullptr; #ifdef SOLARIS char buffer[8192]; @@ -366,14 +366,14 @@ static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirec pStr = getenv("HOME"); #endif - if (pStr != NULL && strlen(pStr) > 0 && access(pStr, 0) == 0) + if (pStr != nullptr && strlen(pStr) > 0 && access(pStr, 0) == 0) strncpy(pszDirectory, pStr, nMax); - else if (pSecImpl->m_pPasswd.pw_dir != NULL) + else if (pSecImpl->m_pPasswd.pw_dir != nullptr) strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax); else return false; } - else if (pSecImpl->m_pPasswd.pw_dir != NULL) + else if (pSecImpl->m_pPasswd.pw_dir != nullptr) strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax); else return false; @@ -393,7 +393,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire if ( bRet ) { rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS ); - SAL_WARN_IF(*pustrDirectory == NULL, "sal.osl", "*pustrDirectory == NULL"); + SAL_WARN_IF(*pustrDirectory == nullptr, "sal.osl", "*pustrDirectory == NULL"); osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory ); } @@ -408,7 +408,7 @@ static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDir { sal_Char *pStr = getenv("XDG_CONFIG_HOME"); - if (pStr == NULL || strlen(pStr) == 0 || access(pStr, 0) != 0) + if (pStr == nullptr || strlen(pStr) == 0 || access(pStr, 0) != 0) { std::size_t n = 0; @@ -497,7 +497,7 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security) { oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); - if (pSecImpl == NULL) + if (pSecImpl == nullptr) return sal_False; if (pSecImpl->m_pPasswd.pw_uid != 0) diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 76ee7905a1f9..4701e7bfbbb3 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -85,56 +85,56 @@ static struct SignalAction void (*Handler)(int); } Signals[] = { - { SIGHUP, ACT_HIDE, NULL }, /* hangup */ - { SIGINT, ACT_EXIT, NULL }, /* interrupt (rubout) */ - { SIGQUIT, ACT_EXIT, NULL }, /* quit (ASCII FS) */ - { SIGILL, ACT_SYSTEM, NULL }, /* illegal instruction (not reset when caught) */ + { SIGHUP, ACT_HIDE, nullptr }, /* hangup */ + { SIGINT, ACT_EXIT, nullptr }, /* interrupt (rubout) */ + { SIGQUIT, ACT_EXIT, nullptr }, /* quit (ASCII FS) */ + { SIGILL, ACT_SYSTEM, nullptr }, /* illegal instruction (not reset when caught) */ /* changed from ACT_ABOUT to ACT_SYSTEM to try and get collector to run*/ - { SIGTRAP, ACT_ABORT, NULL }, /* trace trap (not reset when caught) */ + { SIGTRAP, ACT_ABORT, nullptr }, /* trace trap (not reset when caught) */ #if ( SIGIOT != SIGABRT ) { SIGIOT, ACT_ABORT, NULL }, /* IOT instruction */ #endif - { SIGABRT, ACT_ABORT, NULL }, /* used by abort, replace SIGIOT in the future */ + { SIGABRT, ACT_ABORT, nullptr }, /* used by abort, replace SIGIOT in the future */ #ifdef SIGEMT { SIGEMT, ACT_SYSTEM, NULL }, /* EMT instruction */ /* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/ /* SIGEMT may also be used by the profiler - so it is probably not a good plan to have the new handler use this signal*/ #endif - { SIGFPE, ACT_ABORT, NULL }, /* floating point exception */ - { SIGKILL, ACT_SYSTEM, NULL }, /* kill (cannot be caught or ignored) */ - { SIGBUS, ACT_ABORT, NULL }, /* bus error */ - { SIGSEGV, ACT_ABORT, NULL }, /* segmentation violation */ + { SIGFPE, ACT_ABORT, nullptr }, /* floating point exception */ + { SIGKILL, ACT_SYSTEM, nullptr }, /* kill (cannot be caught or ignored) */ + { SIGBUS, ACT_ABORT, nullptr }, /* bus error */ + { SIGSEGV, ACT_ABORT, nullptr }, /* segmentation violation */ #ifdef SIGSYS - { SIGSYS, ACT_ABORT, NULL }, /* bad argument to system call */ + { SIGSYS, ACT_ABORT, nullptr }, /* bad argument to system call */ #endif - { SIGPIPE, ACT_HIDE, NULL }, /* write on a pipe with no one to read it */ - { SIGALRM, ACT_EXIT, NULL }, /* alarm clock */ - { SIGTERM, ACT_EXIT, NULL }, /* software termination signal from kill */ - { SIGUSR1, ACT_SYSTEM, NULL }, /* user defined signal 1 */ - { SIGUSR2, ACT_SYSTEM, NULL }, /* user defined signal 2 */ - { SIGCHLD, ACT_SYSTEM, NULL }, /* child status change */ + { SIGPIPE, ACT_HIDE, nullptr }, /* write on a pipe with no one to read it */ + { SIGALRM, ACT_EXIT, nullptr }, /* alarm clock */ + { SIGTERM, ACT_EXIT, nullptr }, /* software termination signal from kill */ + { SIGUSR1, ACT_SYSTEM, nullptr }, /* user defined signal 1 */ + { SIGUSR2, ACT_SYSTEM, nullptr }, /* user defined signal 2 */ + { SIGCHLD, ACT_SYSTEM, nullptr }, /* child status change */ #ifdef SIGPWR - { SIGPWR, ACT_IGNORE, NULL }, /* power-fail restart */ + { SIGPWR, ACT_IGNORE, nullptr }, /* power-fail restart */ #endif - { SIGWINCH, ACT_IGNORE, NULL }, /* window size change */ - { SIGURG, ACT_EXIT, NULL }, /* urgent socket condition */ + { SIGWINCH, ACT_IGNORE, nullptr }, /* window size change */ + { SIGURG, ACT_EXIT, nullptr }, /* urgent socket condition */ #ifdef SIGPOLL - { SIGPOLL, ACT_EXIT, NULL }, /* pollable event occurred */ + { SIGPOLL, ACT_EXIT, nullptr }, /* pollable event occurred */ #endif - { SIGSTOP, ACT_SYSTEM, NULL }, /* stop (cannot be caught or ignored) */ - { SIGTSTP, ACT_SYSTEM, NULL }, /* user stop requested from tty */ - { SIGCONT, ACT_SYSTEM, NULL }, /* stopped process has been continued */ - { SIGTTIN, ACT_SYSTEM, NULL }, /* background tty read attempted */ - { SIGTTOU, ACT_SYSTEM, NULL }, /* background tty write attempted */ - { SIGVTALRM, ACT_EXIT, NULL }, /* virtual timer expired */ - { SIGPROF, ACT_SYSTEM, NULL }, /* profiling timer expired */ + { SIGSTOP, ACT_SYSTEM, nullptr }, /* stop (cannot be caught or ignored) */ + { SIGTSTP, ACT_SYSTEM, nullptr }, /* user stop requested from tty */ + { SIGCONT, ACT_SYSTEM, nullptr }, /* stopped process has been continued */ + { SIGTTIN, ACT_SYSTEM, nullptr }, /* background tty read attempted */ + { SIGTTOU, ACT_SYSTEM, nullptr }, /* background tty write attempted */ + { SIGVTALRM, ACT_EXIT, nullptr }, /* virtual timer expired */ + { SIGPROF, ACT_SYSTEM, nullptr }, /* profiling timer expired */ /*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do not get taken by the new handler - the new handler does not pass on context information which causes 'collect' to crash. This is a way of avoiding what looks like a bug in the new handler*/ - { SIGXCPU, ACT_ABORT, NULL }, /* exceeded cpu limit */ - { SIGXFSZ, ACT_ABORT, NULL } /* exceeded file size limit */ + { SIGXCPU, ACT_ABORT, nullptr }, /* exceeded cpu limit */ + { SIGXFSZ, ACT_ABORT, nullptr } /* exceeded file size limit */ }; const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction); @@ -150,13 +150,13 @@ static void SignalHandlerFunction(int); static void getExecutableName_Impl (rtl_String ** ppstrProgName) { - rtl_uString * ustrProgFile = 0; + rtl_uString * ustrProgFile = nullptr; osl_getExecutableFile (&ustrProgFile); if (ustrProgFile) { - rtl_uString * ustrProgName = 0; + rtl_uString * ustrProgName = nullptr; osl_systemPathGetFileNameOrLastDirectoryPart (ustrProgFile, &ustrProgName); - if (ustrProgName != 0) + if (ustrProgName != nullptr) { rtl_uString2String ( ppstrProgName, @@ -172,7 +172,7 @@ static void getExecutableName_Impl (rtl_String ** ppstrProgName) static bool is_soffice_Impl() { sal_Int32 idx = -1; - rtl_String * strProgName = 0; + rtl_String * strProgName = nullptr; getExecutableName_Impl (&strProgName); if (strProgName) @@ -264,7 +264,7 @@ static bool InitSignal() second soffice would have the guilty signal blocked and would freeze upon encountering a similar crash again): */ if (sigemptyset(&unset) < 0 || - pthread_sigmask(SIG_SETMASK, &unset, NULL) < 0) + pthread_sigmask(SIG_SETMASK, &unset, nullptr) < 0) { OSL_TRACE("sigemptyset or pthread_sigmask failed"); } @@ -286,7 +286,7 @@ static bool DeInitSignal() { act.sa_handler = Signals[i].Handler; - sigaction(Signals[i].Signal, &act, NULL); + sigaction(Signals[i].Signal, &act, nullptr); } osl_destroyMutex(SignalListMutex); @@ -321,7 +321,7 @@ static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo) oslSignalHandlerImpl* pHandler = SignalList; oslSignalAction Action = osl_Signal_ActCallNextHdl; - while (pHandler != NULL) + while (pHandler != nullptr) { if ((Action = pHandler->Handler(pHandler->pData, pInfo)) != osl_Signal_ActCallNextHdl) @@ -346,7 +346,7 @@ void CallSystemHandler(int Signal) if (i < NoSignals) { - if ((Signals[i].Handler == NULL) || + if ((Signals[i].Handler == nullptr) || (Signals[i].Handler == SIG_DFL) || (Signals[i].Handler == SIG_IGN) || (Signals[i].Handler == SIG_ERR)) @@ -362,7 +362,7 @@ void CallSystemHandler(int Signal) act.sa_handler = SIG_DFL; act.sa_flags = 0; sigemptyset(&(act.sa_mask)); - sigaction(SIGABRT, &act, NULL); + sigaction(SIGABRT, &act, nullptr); PrintStack( Signal ); abort(); break; @@ -405,7 +405,7 @@ void SignalHandlerFunction(int Signal) struct sigaction act; Info.UserSignal = Signal; - Info.UserData = NULL; + Info.UserData = nullptr; switch (Signal) { @@ -456,7 +456,7 @@ void SignalHandlerFunction(int Signal) act.sa_handler = SIG_DFL; act.sa_flags = 0; sigemptyset(&(act.sa_mask)); - sigaction(SIGABRT, &act, NULL); + sigaction(SIGABRT, &act, nullptr); PrintStack( Signal ); abort(); break; @@ -474,10 +474,10 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, { oslSignalHandlerImpl* pHandler; - OSL_ASSERT(Handler != NULL); - if ( Handler == 0 ) + OSL_ASSERT(Handler != nullptr); + if ( Handler == nullptr ) { - return 0; + return nullptr; } if (! bInitSignal) @@ -485,7 +485,7 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, pHandler = static_cast<oslSignalHandlerImpl*>(calloc(1, sizeof(oslSignalHandlerImpl))); - if (pHandler != NULL) + if (pHandler != nullptr) { pHandler->Handler = Handler; pHandler->pData = pData; @@ -500,14 +500,14 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, return (pHandler); } - return NULL; + return nullptr; } sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) { - oslSignalHandlerImpl *pHandler, *pPrevious = NULL; + oslSignalHandlerImpl *pHandler, *pPrevious = nullptr; - OSL_ASSERT(Handler != NULL); + OSL_ASSERT(Handler != nullptr); if (! bInitSignal) bInitSignal = InitSignal(); @@ -516,7 +516,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) pHandler = SignalList; - while (pHandler != NULL) + while (pHandler != nullptr) { if (pHandler == Handler) { @@ -527,7 +527,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler) osl_releaseMutex(SignalListMutex); - if (SignalList == NULL) + if (SignalList == nullptr) bInitSignal = DeInitSignal(); free(pHandler); diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 63b079fd9cc2..190e7c3bc2bb 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -459,7 +459,7 @@ oslSocket __osl_createSocketImpl(int Socket) void __osl_destroySocketImpl(oslSocket Socket) { - if ( Socket != NULL) + if ( Socket != nullptr) free(Socket); #if OSL_DEBUG_LEVEL > 1 g_nSocketImpl --; @@ -517,7 +517,7 @@ static void __osl_destroySocketAddr( oslSocketAddr addr ) oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family) { - oslSocketAddr pAddr = 0; + oslSocketAddr pAddr = nullptr; /* is it an internet-Addr? */ if (Family == osl_Socket_FamilyInet) @@ -534,7 +534,7 @@ oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family) oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr) { - oslSocketAddr pCopy = 0; + oslSocketAddr pCopy = nullptr; if (Addr) { pCopy = __osl_createSocketAddr(); @@ -549,8 +549,8 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr ( oslSocketAddr Addr1, oslSocketAddr Addr2) { - struct sockaddr* pAddr1 = NULL; - struct sockaddr* pAddr2 = NULL; + struct sockaddr* pAddr1 = nullptr; + struct sockaddr* pAddr2 = nullptr; assert(Addr1 && Addr2); pAddr1 = &(Addr1->m_sockaddr); @@ -596,7 +596,7 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( if (strDottedAddr && strDottedAddr->length) { /* Dotted host address for limited broadcast */ - rtl_String *pDottedAddr = NULL; + rtl_String *pDottedAddr = nullptr; rtl_uString2String ( &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length, @@ -641,11 +641,11 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( rtl_uString *ustrDottedAddr, sal_Int32 Port) { - rtl_String* strDottedAddr=0; + rtl_String* strDottedAddr=nullptr; oslSocketAddr Addr; - sal_Char* pszDottedAddr=0; + sal_Char* pszDottedAddr=nullptr; - if ( ustrDottedAddr != 0 ) + if ( ustrDottedAddr != nullptr ) { rtl_uString2String( &strDottedAddr, rtl_uString_getStr(ustrDottedAddr), @@ -655,9 +655,9 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( pszDottedAddr = rtl_string_getStr(strDottedAddr); } - Addr = pszDottedAddr ? osl_psz_createInetSocketAddr(pszDottedAddr, Port) : 0; + Addr = pszDottedAddr ? osl_psz_createInetSocketAddr(pszDottedAddr, Port) : nullptr; - if ( strDottedAddr != 0 ) + if ( strDottedAddr != nullptr ) { rtl_string_release(strDottedAddr); } @@ -669,7 +669,7 @@ oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr ( const sal_Char* pszDottedAddr, sal_Int32 Port) { - oslSocketAddr pAddr = 0; + oslSocketAddr pAddr = nullptr; sal_Int32 Addr = inet_addr(pszDottedAddr); if(Addr != -1) { @@ -733,7 +733,7 @@ static struct hostent* _osl_gethostbyname_r ( int __error; __error = gethostbyname_r (name, result, buffer, buflen, &__result, h_errnop); - return __error ? NULL : __result ; + return __error ? nullptr : __result ; #elif defined(AIX) *h_errnop = gethostbyname_r (name, result, (struct hostent_data *)buffer); (void)buflen; @@ -748,14 +748,14 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName) struct hostent aHostByName; struct hostent *pHostByName; sal_Char pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ]; - sal_Char *pFullQualifiedName = NULL; + sal_Char *pFullQualifiedName = nullptr; int nErrorNo; pHostByName = _osl_gethostbyname_r ( pHostName, &aHostByName, pQualifiedHostBuffer, sizeof(pQualifiedHostBuffer), &nErrorNo ); - if (pHostByName != NULL) + if (pHostByName != nullptr) { pFullQualifiedName = strdup(pHostByName->h_name); } @@ -768,7 +768,7 @@ static bool _osl_isFullQualifiedDomainName (const sal_Char *pHostName) * is a name which contains a dot '.' in it ( would * match as well for 'hostname.' but is good enough * for now )*/ - return strchr( pHostName, (int)'.' ) != NULL; + return strchr( pHostName, (int)'.' ) != nullptr; } struct oslHostAddrImpl @@ -779,32 +779,32 @@ struct oslHostAddrImpl static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) { - oslHostAddr pAddr= NULL; - oslSocketAddr pSockAddr = 0; + oslHostAddr pAddr= nullptr; + oslSocketAddr pSockAddr = nullptr; sal_Char *cn; - if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL)) + if ((he == nullptr) || (he->h_name == nullptr) || (he->h_addr_list[0] == nullptr)) return nullptr; if (_osl_isFullQualifiedDomainName(he->h_name)) { cn= strdup(he->h_name); SAL_WARN_IF( !cn, "sal.osl", "insufficient memory" ); - if (cn == NULL) + if (cn == nullptr) return nullptr; } else { cn =_osl_getFullQualifiedDomainName (he->h_name); SAL_WARN_IF( !cn, "sal.osl", "couldn't get full qualified domain name" ); - if (cn == NULL) + if (cn == nullptr) return nullptr; } pSockAddr = __osl_createSocketAddr(); SAL_WARN_IF( !pSockAddr, "sal.osl", "insufficient memory" ); - if (pSockAddr == NULL) + if (pSockAddr == nullptr) { free(cn); return nullptr; @@ -833,7 +833,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he) pAddr= static_cast<oslHostAddr>(malloc(sizeof(struct oslHostAddrImpl))); SAL_WARN_IF( !pAddr, "sal.osl", "allocation error" ); - if (pAddr == NULL) + if (pAddr == nullptr) { __osl_destroySocketAddr( pSockAddr ); free (cn); @@ -851,10 +851,10 @@ oslHostAddr SAL_CALL osl_createHostAddr ( const oslSocketAddr Addr) { oslHostAddr HostAddr; - rtl_String* strHostname=0; - sal_Char* pszHostName=0; + rtl_String* strHostname=nullptr; + sal_Char* pszHostName=nullptr; - if ( ustrHostname != 0 ) + if ( ustrHostname != nullptr ) { rtl_uString2String( &strHostname, rtl_uString_getStr(ustrHostname), @@ -866,7 +866,7 @@ oslHostAddr SAL_CALL osl_createHostAddr ( HostAddr = osl_psz_createHostAddr(pszHostName,Addr); - if ( strHostname != 0 ) + if ( strHostname != nullptr ) { rtl_string_release(strHostname); } @@ -883,17 +883,17 @@ oslHostAddr SAL_CALL osl_psz_createHostAddr ( SAL_WARN_IF( !pszHostname, "sal.osl", "undefined hostname" ); SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); - if ((pszHostname == NULL) || (pAddr == NULL)) + if ((pszHostname == nullptr) || (pAddr == nullptr)) return nullptr; cn = strdup(pszHostname); SAL_WARN_IF( !cn, "sal.osl", "insufficient memory" ); - if (cn == NULL) + if (cn == nullptr) return nullptr; pHostAddr= static_cast<oslHostAddr>(malloc(sizeof(struct oslHostAddrImpl))); SAL_WARN_IF( !pHostAddr, "sal.osl", "allocation error" ); - if (pHostAddr == NULL) + if (pHostAddr == nullptr) { free (cn); return nullptr; @@ -908,10 +908,10 @@ oslHostAddr SAL_CALL osl_psz_createHostAddr ( oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) { oslHostAddr HostAddr; - rtl_String* strHostname=0; - sal_Char* pszHostName=0; + rtl_String* strHostname=nullptr; + sal_Char* pszHostName=nullptr; - if ( ustrHostname != 0 ) + if ( ustrHostname != nullptr ) { rtl_uString2String( &strHostname, rtl_uString_getStr(ustrHostname), @@ -923,7 +923,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) HostAddr = osl_psz_createHostAddrByName(pszHostName); - if ( strHostname != 0 ) + if ( strHostname != nullptr ) { rtl_string_release(strHostname); } @@ -950,7 +950,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr) { SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); - if (pAddr == NULL) + if (pAddr == nullptr) return nullptr; if (pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet)) @@ -987,7 +987,7 @@ void SAL_CALL osl_getHostnameOfHostAddr ( const oslHostAddr Addr, rtl_uString **ustrHostname) { - const sal_Char* pHostname=0; + const sal_Char* pHostname=nullptr; pHostname = osl_psz_getHostnameOfHostAddr(Addr); @@ -1001,7 +1001,7 @@ const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) if (pAddr) return pAddr->pHostName; else - return NULL; + return nullptr; } oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr (const oslHostAddr pAddr) @@ -1011,7 +1011,7 @@ oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr (const oslHostAddr pAddr) if (pAddr) return pAddr->pSockAddr; else - return NULL; + return nullptr; } void SAL_CALL osl_destroyHostAddr (oslHostAddr pAddr) @@ -1065,7 +1065,7 @@ oslSocketResult SAL_CALL osl_psz_getLocalHostname ( LocalHostname[sizeof(LocalHostname)-1] = 0; /* check if we have an FQDN */ - if (strchr(LocalHostname, '.') == NULL) + if (strchr(LocalHostname, '.') == nullptr) { oslHostAddr Addr; @@ -1073,7 +1073,7 @@ oslSocketResult SAL_CALL osl_psz_getLocalHostname ( Addr = osl_psz_createHostAddrByName(LocalHostname); const sal_Char *pStr; - if ((pStr = osl_psz_getHostnameOfHostAddr(Addr)) != NULL) + if ((pStr = osl_psz_getHostnameOfHostAddr(Addr)) != nullptr) { strncpy(LocalHostname, pStr, sizeof( LocalHostname )); LocalHostname[sizeof(LocalHostname)-1] = 0; @@ -1096,10 +1096,10 @@ oslSocketResult SAL_CALL osl_psz_getLocalHostname ( oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) { oslSocketAddr Addr; - rtl_String* strHostname=0; - sal_Char* pszHostName=0; + rtl_String* strHostname=nullptr; + sal_Char* pszHostName=nullptr; - if ( ustrHostname != 0 ) + if ( ustrHostname != nullptr ) { rtl_uString2String( &strHostname, rtl_uString_getStr(ustrHostname), @@ -1111,7 +1111,7 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) Addr = osl_psz_resolveHostname(pszHostName); - if ( strHostname != 0 ) + if ( strHostname != nullptr ) { rtl_string_release(strHostname); } @@ -1138,12 +1138,12 @@ oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname) sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString *ustrProtocol) { sal_Int32 nPort; - rtl_String* strServicename=0; - rtl_String* strProtocol=0; - sal_Char* pszServiceName=0; - sal_Char* pszProtocol=0; + rtl_String* strServicename=nullptr; + rtl_String* strProtocol=nullptr; + sal_Char* pszServiceName=nullptr; + sal_Char* pszProtocol=nullptr; - if ( ustrServicename != 0 ) + if ( ustrServicename != nullptr ) { rtl_uString2String( &strServicename, rtl_uString_getStr(ustrServicename), @@ -1153,7 +1153,7 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString pszServiceName = rtl_string_getStr(strServicename); } - if ( ustrProtocol != 0 ) + if ( ustrProtocol != nullptr ) { rtl_uString2String( &strProtocol, rtl_uString_getStr(ustrProtocol), @@ -1165,12 +1165,12 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString nPort = osl_psz_getServicePort(pszServiceName,pszProtocol); - if ( strServicename != 0 ) + if ( strServicename != nullptr ) { rtl_string_release(strServicename); } - if ( strProtocol != 0 ) + if ( strProtocol != nullptr ) { rtl_string_release(strProtocol); } @@ -1185,7 +1185,7 @@ sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename, ps= getservbyname(pszServicename, pszProtocol); - if (ps != 0) + if (ps != nullptr) return ntohs(ps->s_port); return OSL_INVALID_PORT; @@ -1331,7 +1331,7 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily Family, SAL_WARN( "sal.osl", "socket creation failed: (" << nErrno << ") " << strerror(nErrno) ); __osl_destroySocketImpl((pSocket)); - pSocket= 0; + pSocket= nullptr; } else { @@ -1382,7 +1382,7 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket) int nFD; /* socket already invalid */ - if(pSocket==0) + if(pSocket==nullptr) return; pSocket->m_nLastError=0; @@ -1462,7 +1462,7 @@ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) struct sockaddr Addr; oslSocketAddr pAddr; - if (pSocket == NULL) /* ENOTSOCK */ + if (pSocket == nullptr) /* ENOTSOCK */ return nullptr; AddrLen= sizeof(struct sockaddr); @@ -1480,9 +1480,9 @@ oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket) struct sockaddr Addr; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { - return 0; + return nullptr; } pSocket->m_nLastError=0; @@ -1491,7 +1491,7 @@ oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket) if(getpeername(pSocket->m_Socket, &Addr, &AddrLen) == OSL_SOCKET_ERROR) { pSocket->m_nLastError=errno; - return 0; + return nullptr; } return __osl_createSocketAddrFromSystem( &Addr ); } @@ -1503,7 +1503,7 @@ sal_Bool SAL_CALL osl_bindAddrToSocket(oslSocket pSocket, SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); - if ( pSocket == 0 || pAddr == 0 ) + if ( pSocket == nullptr || pAddr == nullptr ) { return sal_False; } @@ -1527,7 +1527,7 @@ sal_Bool SAL_CALL osl_listenOnSocket(oslSocket pSocket, int nRet; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return sal_False; } @@ -1559,7 +1559,7 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket, SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return osl_Socket_Error; } @@ -1629,10 +1629,10 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket, /* select */ ReadyHandles= select(pSocket->m_Socket+1, - 0, + nullptr, PTR_FD_SET(WriteSet), PTR_FD_SET(ExcptSet), - (pTimeout) ? &tv : 0); + (pTimeout) ? &tv : nullptr); if (ReadyHandles > 0) /* connected */ { @@ -1689,9 +1689,9 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket, socklen_t AddrLen = sizeof(struct sockaddr); SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { - return 0; + return nullptr; } pSocket->m_nLastError=0; @@ -1702,7 +1702,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket, if( ppAddr && *ppAddr ) { osl_destroySocketAddr( *ppAddr ); - *ppAddr = 0; + *ppAddr = nullptr; } /* prevent Linux EINTR behaviour */ @@ -1721,7 +1721,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket, #if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT) pSocket->m_bIsAccepting = false; #endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ - return 0; + return nullptr; } assert(AddrLen == sizeof(struct sockaddr)); @@ -1731,7 +1731,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket, { close(Connection); SAL_WARN( "sal.osl", "close while accept" ); - return 0; + return nullptr; } #endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */ @@ -1774,7 +1774,7 @@ sal_Int32 SAL_CALL osl_receiveSocket(oslSocket pSocket, int nRead; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return -1; } @@ -1810,7 +1810,7 @@ sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket pSocket, oslSocketMsgFlag Flag) { int nRead; - struct sockaddr *pSystemSockAddr = 0; + struct sockaddr *pSystemSockAddr = nullptr; socklen_t AddrLen = 0; if( pSenderAddr ) { @@ -1819,7 +1819,7 @@ sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket pSocket, } SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return -1; } @@ -1855,7 +1855,7 @@ sal_Int32 SAL_CALL osl_sendSocket(oslSocket pSocket, int nWritten; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return -1; } @@ -1892,7 +1892,7 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket pSocket, { int nWritten; - struct sockaddr *pSystemSockAddr = 0; + struct sockaddr *pSystemSockAddr = nullptr; int AddrLen = 0; if( ReceiverAddr ) { @@ -1901,7 +1901,7 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket pSocket, } SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return -1; } @@ -2006,7 +2006,7 @@ bool __osl_socket_poll ( int result; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if (0 == pSocket) + if (nullptr == pSocket) return false; /* EINVAL */ pSocket->m_nLastError = 0; @@ -2096,7 +2096,7 @@ sal_Bool SAL_CALL osl_isReceiveReady ( oslSocket pSocket, const TimeValue* pTimeout) { SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if (pSocket == NULL) + if (pSocket == nullptr) { /* ENOTSOCK */ return sal_False; @@ -2109,7 +2109,7 @@ sal_Bool SAL_CALL osl_isSendReady ( oslSocket pSocket, const TimeValue* pTimeout) { SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if (pSocket == NULL) + if (pSocket == nullptr) { /* ENOTSOCK */ return sal_False; @@ -2122,7 +2122,7 @@ sal_Bool SAL_CALL osl_isExceptionPending ( oslSocket pSocket, const TimeValue* pTimeout) { SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if (pSocket == NULL) + if (pSocket == nullptr) { /* ENOTSOCK */ return sal_False; @@ -2137,7 +2137,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket, int nRet; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return sal_False; } @@ -2163,7 +2163,7 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket, socklen_t nOptLen = (socklen_t) BufferLen; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return -1; } @@ -2192,7 +2192,7 @@ sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket, int nRet; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return sal_False; } @@ -2221,7 +2221,7 @@ sal_Bool SAL_CALL osl_enableNonBlockingMode(oslSocket pSocket, int nRet; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return sal_False; } @@ -2251,7 +2251,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket) int flags; SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return sal_False; } @@ -2272,7 +2272,7 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket) socklen_t TypeSize= sizeof(Type); SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return osl_Socket_TypeInvalid; } @@ -2312,7 +2312,7 @@ void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* /* make sure pBuffer will be a zero-terminated string even when strncpy has to cut */ pBuffer[BufferSize-1]= '\0'; - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { strncpy(pBuffer, strerror(EINVAL), BufferSize-1); return; @@ -2324,7 +2324,7 @@ void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket) { - if ( pSocket == 0 ) + if ( pSocket == nullptr ) { return ERROR_FROM_NATIVE(EINVAL); } @@ -2365,7 +2365,7 @@ void SAL_CALL osl_destroySocketSet(oslSocketSet Set) void SAL_CALL osl_clearSocketSet(oslSocketSet Set) { SAL_WARN_IF( !Set, "sal.osl", "undefined socket set" ); - if ( Set == 0 ) + if ( Set == nullptr ) { return; } @@ -2380,7 +2380,7 @@ void SAL_CALL osl_addToSocketSet(oslSocketSet Set, oslSocket pSocket) SAL_WARN_IF( !Set, "sal.osl", "undefined socket set" ); SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( Set == 0 || pSocket == 0) + if ( Set == nullptr || pSocket == nullptr) { return; } @@ -2397,7 +2397,7 @@ void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, oslSocket pSocket) SAL_WARN_IF( !Set, "sal.osl", "undefined socket set" ); SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( Set == 0 || pSocket == 0) + if ( Set == nullptr || pSocket == nullptr) { return; } @@ -2421,7 +2421,7 @@ sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set, oslSocket pSocket) { SAL_WARN_IF( !Set, "sal.osl", "undefined socket set" ); SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" ); - if ( Set == 0 || pSocket == 0 ) + if ( Set == nullptr || pSocket == nullptr ) { return sal_False; } @@ -2455,10 +2455,10 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet, MaxHandle= OutOfBandSet->m_MaxHandle; return select(MaxHandle+1, - IncomingSet ? PTR_FD_SET(IncomingSet->m_Set) : 0, - OutgoingSet ? PTR_FD_SET(OutgoingSet->m_Set) : 0, - OutOfBandSet ? PTR_FD_SET(OutOfBandSet->m_Set) : 0, - pTimeout ? &tv : 0); + IncomingSet ? PTR_FD_SET(IncomingSet->m_Set) : nullptr, + OutgoingSet ? PTR_FD_SET(OutgoingSet->m_Set) : nullptr, + OutOfBandSet ? PTR_FD_SET(OutOfBandSet->m_Set) : nullptr, + pTimeout ? &tv : nullptr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index 3f19358dedd8..bd3d2c450063 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -266,7 +266,7 @@ int macxp_resolveAlias(char *path, int buflen); #endif #ifndef SLEEP_TIMESPEC -# define SLEEP_TIMESPEC(timespec) nanosleep(×pec, 0) +# define SLEEP_TIMESPEC(timespec) nanosleep(×pec, nullptr) #endif #ifndef INIT_GROUPS @@ -287,13 +287,13 @@ int macxp_resolveAlias(char *path, int buflen); #endif #ifndef PTHREAD_ATTR_DEFAULT -# define PTHREAD_ATTR_DEFAULT NULL +# define PTHREAD_ATTR_DEFAULT nullptr #endif #ifndef PTHREAD_MUTEXATTR_DEFAULT -# define PTHREAD_MUTEXATTR_DEFAULT NULL +# define PTHREAD_MUTEXATTR_DEFAULT nullptr #endif #ifndef PTHREAD_CONDATTR_DEFAULT -# define PTHREAD_CONDATTR_DEFAULT NULL +# define PTHREAD_CONDATTR_DEFAULT nullptr #endif #ifndef PTHREAD_SIGACTION diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 040d3c483042..d6e7941a8fb5 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -37,7 +37,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) oslFileError error; /* described in environ(7) */ const char *pValue = getenv( "TMPDIR" ); - rtl_uString *ustrTempPath = NULL; + rtl_uString *ustrTempPath = nullptr; if ( !pValue ) pValue = getenv( "TEMP" ); @@ -49,7 +49,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) pValue = "/tmp"; rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); - OSL_ASSERT(ustrTempPath != NULL); + OSL_ASSERT(ustrTempPath != nullptr); error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir ); rtl_uString_release( ustrTempPath ); @@ -79,7 +79,7 @@ static void osl_gen_random_name_impl_(rtl_uString** rand_name) uint64_t v; int i; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid(); @@ -97,7 +97,7 @@ static void osl_gen_random_name_impl_(rtl_uString** rand_name) RAND_NAME_LENGTH, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS); - OSL_ASSERT(*rand_name != NULL); + OSL_ASSERT(*rand_name != nullptr); } /***************************************************************** @@ -110,8 +110,8 @@ static oslFileError osl_setup_base_directory_impl_( rtl_uString* pustrDirectoryURL, rtl_uString** ppustr_base_dir) { - rtl_uString* dir_url = 0; - rtl_uString* dir = 0; + rtl_uString* dir_url = nullptr; + rtl_uString* dir = nullptr; oslFileError error = osl_File_E_None; if (pustrDirectoryURL) @@ -148,9 +148,9 @@ static oslFileError osl_setup_base_directory_impl_( { oslFileError osl_error; - OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!"); + OSL_PRECOND(((nullptr != pHandle) || (nullptr != ppustrTempFileURL)), "Invalid parameter!"); - if ((0 == pHandle) && (0 == ppustrTempFileURL)) + if ((nullptr == pHandle) && (nullptr == ppustrTempFileURL)) { osl_error = osl_File_E_INVAL; } @@ -159,7 +159,7 @@ static oslFileError osl_setup_base_directory_impl_( osl_error = osl_setup_base_directory_impl_( pustrDirectoryURL, ppustr_base_dir); - *b_delete_on_close = (0 == ppustrTempFileURL); + *b_delete_on_close = (nullptr == ppustrTempFileURL); } return osl_error; @@ -175,10 +175,10 @@ static oslFileError osl_create_temp_file_impl_( oslFileHandle* file_handle, rtl_uString** ppustr_temp_file_name) { - rtl_uString* rand_name = 0; + rtl_uString* rand_name = nullptr; sal_uInt32 len_base_dir = 0; - rtl_uString* tmp_file_path = 0; - rtl_uString* tmp_file_url = 0; + rtl_uString* tmp_file_path = nullptr; + rtl_uString* tmp_file_url = nullptr; sal_Int32 capacity = 0; oslFileError osl_error = osl_File_E_None; sal_Int32 offset_file_name; @@ -269,8 +269,8 @@ oslFileError SAL_CALL osl_createTempFile( oslFileHandle* pHandle, rtl_uString** ppustrTempFileURL) { - rtl_uString* base_directory = 0; - rtl_uString* temp_file_name = 0; + rtl_uString* base_directory = nullptr; + rtl_uString* temp_file_name = nullptr; oslFileHandle temp_file_handle; sal_Bool b_delete_on_close; oslFileError osl_error; @@ -290,7 +290,7 @@ oslFileError SAL_CALL osl_createTempFile( if (osl_File_E_None == osl_error) { - rtl_uString* temp_file_url = 0; + rtl_uString* temp_file_url = nullptr; /* assuming this works */ osl_getFileURLFromSystemPath(temp_file_name, &temp_file_url); diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index c4cf0dbd88d8..4e349f2f19f6 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -167,7 +167,7 @@ static void osl_thread_destruct_Impl (Thread_Impl ** ppImpl) pthread_mutex_destroy (&((*ppImpl)->m_Lock)); delete *ppImpl; - (*ppImpl) = 0; + (*ppImpl) = nullptr; } } @@ -246,7 +246,7 @@ static void* osl_thread_start_Impl (void* pData) } osl_thread_cleanup_Impl (pImpl); - return 0; + return nullptr; } static oslThread osl_thread_create_Impl ( @@ -263,7 +263,7 @@ static oslThread osl_thread_create_Impl ( pImpl = osl_thread_construct_Impl(); if (!pImpl) - return 0; /* ENOMEM */ + return nullptr; /* ENOMEM */ pImpl->m_WorkerFunction = pWorker; pImpl->m_pData = pThreadData; @@ -306,7 +306,7 @@ static oslThread osl_thread_create_Impl ( pthread_mutex_unlock (&(pImpl->m_Lock)); osl_thread_destruct_Impl (&pImpl); - return 0; + return nullptr; } #if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) @@ -348,7 +348,7 @@ oslThread osl_createSuspendedThread ( void SAL_CALL osl_destroyThread(oslThread Thread) { - if (Thread != NULL) { + if (Thread != nullptr) { Thread_Impl * impl = static_cast<Thread_Impl *>(Thread); bool active; pthread_mutex_lock(&impl->m_Lock); @@ -454,7 +454,7 @@ void SAL_CALL osl_joinWithThread(oslThread Thread) if (attached) { - pthread_join (thread, NULL); + pthread_join (thread, nullptr); } } @@ -577,7 +577,7 @@ static sal_uInt16 lookupThreadId (pthread_t hThread) pthread_mutex_lock(&HashLock); pEntry = HashTable[HASHID(hThread)]; - while (pEntry != NULL) + while (pEntry != nullptr) { if (pthread_equal(pEntry->Handle, hThread)) { @@ -594,13 +594,13 @@ static sal_uInt16 lookupThreadId (pthread_t hThread) static sal_uInt16 insertThreadId (pthread_t hThread) { - HashEntry *pEntry, *pInsert = NULL; + HashEntry *pEntry, *pInsert = nullptr; pthread_mutex_lock(&HashLock); pEntry = HashTable[HASHID(hThread)]; - while (pEntry != NULL) + while (pEntry != nullptr) { if (pthread_equal(pEntry->Handle, hThread)) break; @@ -609,7 +609,7 @@ static sal_uInt16 insertThreadId (pthread_t hThread) pEntry = pEntry->Next; } - if (pEntry == NULL) + if (pEntry == nullptr) { pEntry = static_cast<HashEntry*>(calloc(sizeof(HashEntry), 1)); @@ -635,12 +635,12 @@ static sal_uInt16 insertThreadId (pthread_t hThread) static void removeThreadId (pthread_t hThread) { - HashEntry *pEntry, *pRemove = NULL; + HashEntry *pEntry, *pRemove = nullptr; pthread_mutex_lock(&HashLock); pEntry = HashTable[HASHID(hThread)]; - while (pEntry != NULL) + while (pEntry != nullptr) { if (pthread_equal(pEntry->Handle, hThread)) break; @@ -649,7 +649,7 @@ static void removeThreadId (pthread_t hThread) pEntry = pEntry->Next; } - if (pEntry != NULL) + if (pEntry != nullptr) { if (pRemove) pRemove->Next = pEntry->Next; @@ -952,7 +952,7 @@ oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallbac if (pthread_key_create(&(pKey->m_key), pKey->pfnCallback) != 0) { rtl_freeMemory(pKey); - pKey = 0; + pKey = nullptr; } } @@ -972,13 +972,13 @@ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key) void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key) { wrapper_pthread_key *pKey = static_cast<wrapper_pthread_key*>(Key); - return pKey ? pthread_getspecific(pKey->m_key) : NULL; + return pKey ? pthread_getspecific(pKey->m_key) : nullptr; } sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) { bool bRet; - void *pOldData = NULL; + void *pOldData = nullptr; wrapper_pthread_key *pKey = static_cast<wrapper_pthread_key*>(Key); if (!pKey) return sal_False; @@ -1002,10 +1002,10 @@ static void osl_thread_textencoding_init_Impl() rtl_TextEncoding defaultEncoding; /* create thread specific data key */ - pthread_key_create (&(g_thread.m_textencoding.m_key), NULL); + pthread_key_create (&(g_thread.m_textencoding.m_key), nullptr); /* determine default text encoding */ - defaultEncoding = osl_getTextEncodingFromLocale(NULL); + defaultEncoding = osl_getTextEncodingFromLocale(nullptr); // Tools string functions call abort() on an unknown encoding so ASCII is a // meaningfull fallback: if ( RTL_TEXTENCODING_DONTKNOW == defaultEncoding ) diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx index 74ab972db414..0764d08ea8eb 100644 --- a/sal/osl/unx/time.cxx +++ b/sal/osl/unx/time.cxx @@ -101,7 +101,7 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDa pSystemTime = gmtime_r( &atime, &tmBuf ); /* Convert struct tm to struct oslDateTime */ - if ( pSystemTime != NULL ) + if ( pSystemTime != nullptr ) { pDateTime->NanoSeconds = pTimeVal->Nanosec; pDateTime->Seconds = pSystemTime->tm_sec; diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index 5a2a32605896..1e9ea02fe324 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -131,7 +131,7 @@ done_accessing_file_path( const char * /*cpFilePath*/, accessFilePathState *stat typedef void accessFilePathState; -#define prepare_to_access_file_path( cpFilePath ) NULL +#define prepare_to_access_file_path( cpFilePath ) nullptr #define done_accessing_file_path( cpFilePath, state ) ((void) cpFilePath, (void) state) diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx index c742337748be..abe5e8fc4a6e 100644 --- a/sal/qa/ByteSequence/ByteSequence.cxx +++ b/sal/qa/ByteSequence/ByteSequence.cxx @@ -60,7 +60,7 @@ public: } void test_elem0() { - rtl::ByteSequence s(0, 0); + rtl::ByteSequence s(nullptr, 0); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s.getLength()); } diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index ad5bbaae49b3..809665f74665 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -1515,7 +1515,7 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "test empty string", - pstr != 0 && + pstr != nullptr && pstr[0] == '\0' ); diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index a0c5fc53d658..221fd4cc893f 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1132,9 +1132,9 @@ namespace osl_FileBase : nError1(FileBase::E_None) , nError2(FileBase::E_None) , bOK(false) - , pHandle(NULL) - , pUStr_DirURL(NULL) - , pUStr_FileURL(NULL) + , pHandle(nullptr) + , pUStr_DirURL(nullptr) + , pUStr_FileURL(nullptr) { } @@ -1166,7 +1166,7 @@ namespace osl_FileBase } CPPUNIT_ASSERT_MESSAGE( "test for createTempFile function: create temp file and test the existence", - ( osl::FileBase::E_None == nError1 ) && ( pHandle != NULL ) && ( osl::FileBase::E_EXIST== nError2 ) ); + ( osl::FileBase::E_None == nError1 ) && ( pHandle != nullptr ) && ( osl::FileBase::E_EXIST== nError2 ) ); } void createTempFile_002() @@ -1177,7 +1177,7 @@ namespace osl_FileBase nError2 = testFile.open( osl_File_OpenFlag_Create ); CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist", - ( osl::FileBase::E_None == nError1 ) && ( pHandle != NULL ) && + ( osl::FileBase::E_None == nError1 ) && ( pHandle != nullptr ) && ( osl::FileBase::E_EXIST == nError2 ) ); //check file if have the write permission @@ -1193,9 +1193,9 @@ namespace osl_FileBase void createTempFile_003() { - nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, 0 ); + nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, nullptr ); //the temp file will be removed when return from createTempFile - bOK = (pHandle != NULL && nError1 == osl::FileBase::E_None); + bOK = (pHandle != nullptr && nError1 == osl::FileBase::E_None); if ( bOK ) osl_closeFile( *pHandle ); @@ -1204,8 +1204,8 @@ namespace osl_FileBase } void createTempFile_004() { - nError1 = FileBase::createTempFile( pUStr_DirURL, 0, pUStr_FileURL ); - bOK = ( pUStr_FileURL != 0); + nError1 = FileBase::createTempFile( pUStr_DirURL, nullptr, pUStr_FileURL ); + bOK = ( pUStr_FileURL != nullptr); CPPUNIT_ASSERT(bOK); ::osl::File testFile( *pUStr_FileURL ); nError2 = testFile.open( osl_File_OpenFlag_Create ); @@ -1314,7 +1314,7 @@ namespace osl_FileStatus public: isValid() - : pDir(NULL) + : pDir(nullptr) { } @@ -1792,10 +1792,10 @@ namespace osl_FileStatus // test code. void getAccessTime_001() { - TimeValue *pTV_current = NULL; - CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); - TimeValue *pTV_access = NULL; - CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); + TimeValue *pTV_current = nullptr; + CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); + TimeValue *pTV_access = nullptr; + CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); ::osl::FileStatus rFileStatus( osl_FileStatus_Mask_AccessTime ); nError = rItem.getFileStatus( rFileStatus ); @@ -1832,8 +1832,8 @@ namespace osl_FileStatus // test code. void getModifyTime_001() { - TimeValue *pTV_current = NULL; - CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); + TimeValue *pTV_current = nullptr; + CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); //create file aTypeURL = aUserDirectoryURL.copy( 0 ); @@ -1852,8 +1852,8 @@ namespace osl_FileStatus CPPUNIT_ASSERT( nError == FileBase::E_None ); //get modify time - TimeValue* pTV_modify = NULL; - CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); + TimeValue* pTV_modify = nullptr; + CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); *pTV_modify = rFileStatus.getModifyTime(); bool bOK = t_compareTime( pTV_modify, pTV_current, delta ); @@ -3451,14 +3451,14 @@ namespace osl_File // test code. void setTime_001() { - TimeValue *pTV_current = NULL; - CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); - TimeValue *pTV_creation = NULL; - CPPUNIT_ASSERT( ( pTV_creation = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); - TimeValue *pTV_access = NULL; - CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); - TimeValue *pTV_modify = NULL; - CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != NULL ); + TimeValue *pTV_current = nullptr; + CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); + TimeValue *pTV_creation = nullptr; + CPPUNIT_ASSERT( ( pTV_creation = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); + TimeValue *pTV_access = nullptr; + CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); + TimeValue *pTV_modify = nullptr; + CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr ); //get current time bool bOk = osl_getSystemTime( pTV_current ); @@ -4666,7 +4666,7 @@ namespace osl_Directory return; rtl::OUString aTmpDir; - nError1 = FileBase::createTempFile(NULL, NULL, &aTmpDir); + nError1 = FileBase::createTempFile(nullptr, nullptr, &aTmpDir); CPPUNIT_ASSERT_MESSAGE("temp File creation failed", osl::FileBase::E_None == nError1); nError1 = ::osl::File::remove(aTmpDir); @@ -4850,7 +4850,7 @@ namespace osl_Directory CPPUNIT_ASSERT_MESSAGE ( "mkdtemp call failed", - out != NULL + out != nullptr ); tmp_x += rtl::OString('/'); diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 402bbfb483d1..647083201213 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -64,7 +64,7 @@ const char * const aSource1[] = "a/b/c/d" , "file:///" TEST_VOLUME "bla/a/b/c/d", "a/./c" , "file:///" TEST_VOLUME "bla/a/c", "file:///bla/blub", "file:///" "bla/blub", - 0 , 0 + nullptr , nullptr }; const char * const aSource2[ ] = @@ -76,7 +76,7 @@ const char * const aSource2[ ] = "../../a", "file:///" TEST_VOLUME "bla/a", "../../../a", "file:///" TEST_VOLUME "a", "../../../a/b/c/d", "file:///" TEST_VOLUME "a/b/c/d", - 0,0 + nullptr,nullptr }; using ::rtl::OUString; diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 4dc3fe19a489..2addac8cf9ef 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -40,7 +40,7 @@ public: //create a tempfile rtl::OUString aTmpFile; - err = FileBase::createTempFile(NULL, NULL, &aTmpFile); + err = FileBase::createTempFile(nullptr, nullptr, &aTmpFile); CPPUNIT_ASSERT_MESSAGE("temp File creation failed", err == osl::FileBase::E_None); //now attempt to open with Create flag an existing file, should get E_EXIST diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 171e9d61b6b9..571523e55e9b 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -200,7 +200,7 @@ namespace osl_Module ::osl::Module aMod( getDllURL( ) ); aMod.unload( ); - bRes = oslModule(aMod) ==NULL; + bRes = oslModule(aMod) ==nullptr; CPPUNIT_ASSERT_MESSAGE( "#test comment#: unload function should do the same thing as destructor.", bRes ); @@ -287,10 +287,10 @@ namespace osl_Module #if !defined( MACOSX ) // TODO: Find out why this fails on Mac OS X ::osl::Module aMod; - bRes = ( static_cast<oslModule>(aMod) == NULL ); + bRes = ( static_cast<oslModule>(aMod) == nullptr ); aMod.load( getDllURL( ) ); - bRes1 = static_cast<oslModule>(aMod) != NULL; + bRes1 = static_cast<oslModule>(aMod) != nullptr; aMod.unload( ); diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 9f04b503014f..529c113ced76 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -208,7 +208,7 @@ namespace osl_Pipe ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE ); /// constructs two pipes without acquiring the handle on the base pipe. ::osl::Pipe aAcquirePipe( aPipe.getHandle( ) ); - ::osl::Pipe aAcquirePipe1( NULL ); + ::osl::Pipe aAcquirePipe1( nullptr ); bRes = aAcquirePipe.is( ); bRes1 = aAcquirePipe1.is( ); @@ -257,7 +257,7 @@ namespace osl_Pipe void is_004( ) { - ::osl::Pipe aPipe( NULL ); + ::osl::Pipe aPipe( nullptr ); CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid constructor.", !aPipe.is( ) ); } diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 07440dd27a90..7b29a84c667b 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -171,7 +171,7 @@ namespace #else void read_parent_environment(string_container_t* env_container) { - for (int i = 0; NULL != environ[i]; i++) + for (int i = 0; nullptr != environ[i]; i++) env_container->push_back(OString(environ[i])); tidy_container(*env_container); } @@ -213,7 +213,7 @@ public: OUString create_temp_file(OUString &temp_file_url) { - FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url); + FileBase::RC rc = FileBase::createTempFile(nullptr, nullptr, &temp_file_url); CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile failed", FileBase::E_None, rc); OUString temp_file_path; @@ -349,9 +349,9 @@ public: parameters_, parameters_count_, osl_Process_NORMAL, - NULL, + nullptr, suCWD.pData, - NULL, + nullptr, 0, &process); @@ -398,7 +398,7 @@ public: parameters_, parameters_count_, osl_Process_NORMAL, - NULL, + nullptr, suCWD.pData, child_env, SAL_N_ELEMENTS(child_env), @@ -442,12 +442,12 @@ public: #endif oslProcessError osl_error = osl_executeProcess( suBatch.pData, - NULL, + nullptr, 0, osl_Process_NORMAL, - NULL, + nullptr, suCWD.pData, - NULL, + nullptr, 0, &process); diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index feabd1dc6e7d..f709de940c51 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -82,7 +82,7 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) void dump_env(char* file_path) { std::ofstream file(file_path); - for (int i = 0; NULL != environ[i]; ++i) + for (int i = 0; nullptr != environ[i]; ++i) file << environ[i] << '\0'; } #endif diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 3cfba1247d65..5389c0cdb100 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -45,14 +45,14 @@ void oldtests::test_profile() // successful write oslProfile hProfile = osl_openProfile( rtl::OUString(baseUrl + "/soffice.ini").pData, osl_Profile_WRITELOCK ); - CPPUNIT_ASSERT(hProfile != 0); + CPPUNIT_ASSERT(hProfile != nullptr); CPPUNIT_ASSERT_MESSAGE( "cannot write into init file", osl_writeProfileBool( hProfile, "testsection", "testbool", 1 )); CPPUNIT_ASSERT(osl_closeProfile( hProfile )); // unsuccessful open - CPPUNIT_ASSERT_EQUAL(oslProfile(0), osl_openProfile( rtl::OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK )); + CPPUNIT_ASSERT_EQUAL(oslProfile(nullptr), osl_openProfile( rtl::OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK )); } } // namespace osl_Profile diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index a5cc2a03238d..693137fd9ab9 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -59,7 +59,7 @@ namespace osl_Security ::osl::Security aSec; CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a security its handle should not be NULL.", - aSec.getHandle( ) != NULL ); + aSec.getHandle( ) != nullptr ); } CPPUNIT_TEST_SUITE( ctors ); @@ -327,7 +327,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, /// some initialization work for UNIX OS struct passwd* pw; - CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != NULL ); + CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != nullptr ); /// get user ID; strUserID = OUString::number( getuid( ) ); diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index 3b05e392c20d..02e6eb76855a 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx @@ -46,7 +46,7 @@ void TestThread::run() { } #endif setName("TestThread"); - if (std::getenv("URE_TEST_SETTHREADNAME") != 0) { + if (std::getenv("URE_TEST_SETTHREADNAME") != nullptr) { // On Linux, the thread name can now be observed with "ps -L"; on // Windows with the Microsoft compiler, the thread name can now be // observed in a debugger. diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 1a588653edf7..f567aa32ed4d 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -52,7 +52,7 @@ class Memory : public CppUnit::TestFixture public: Memory() - : m_pMemory(NULL) + : m_pMemory(nullptr) , m_nSizeOfMemory(1024) { } @@ -66,12 +66,12 @@ public: void tearDown() override { rtl_freeMemory(m_pMemory); - m_pMemory = NULL; + m_pMemory = nullptr; } void rtl_allocateMemory_001() { - CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pMemory != NULL); + CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pMemory != nullptr); memset(m_pMemory, 1, m_nSizeOfMemory); CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, m_nSizeOfMemory, 1)); } @@ -81,7 +81,7 @@ public: sal_uInt32 nSize = 2 * 1024; m_pMemory = static_cast<char*>(rtl_reallocateMemory(m_pMemory, nSize)); - CPPUNIT_ASSERT_MESSAGE( "Can reallocate memory.", m_pMemory != NULL); + CPPUNIT_ASSERT_MESSAGE( "Can reallocate memory.", m_pMemory != nullptr); memset(m_pMemory, 2, nSize); CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2)); } @@ -100,7 +100,7 @@ class TestZeroMemory : public CppUnit::TestFixture public: TestZeroMemory() - : m_pZeroMemory(NULL) + : m_pZeroMemory(nullptr) , m_nSizeOfZeroMemory( 50 * 1024 * 1024 ) { } @@ -122,7 +122,7 @@ public: void rtl_allocateZeroMemory_001() { - CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL); + CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != nullptr); CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0)); memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory); diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 842ce97c9d93..0a477699f464 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -45,45 +45,45 @@ public: void create_001() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void create_002() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); } void create_003() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeCBC); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void create_004() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeCBC); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); } void create_005() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void create_006() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeStream); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); } void create_007() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeInvalid); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); } void create_008() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmInvalid, rtl_Cipher_ModeInvalid); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); } // Change the following lines only, if you add, remove or rename @@ -117,25 +117,25 @@ public: void createBF_001() { rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void createBF_002() { rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeCBC); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void createBF_003() { rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeStream); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } void createBF_004() { rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeInvalid); - CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == NULL); + CPPUNIT_ASSERT_MESSAGE("create provide wrong object.", aCipher == nullptr); // rtl_cipher_destroy(aCipher); } // Change the following lines only, if you add, remove or rename @@ -165,7 +165,7 @@ public: void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr) { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -213,7 +213,7 @@ public: void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr) { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -326,7 +326,7 @@ public: void destroy_001() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeCBC); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroy(aCipher); } // Change the following lines only, if you add, remove or rename @@ -353,7 +353,7 @@ public: void destroyBF_001() { rtlCipher aCipher = rtl_cipher_createBF(rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); rtl_cipher_destroyBF(aCipher); // more proforma // should not GPF @@ -382,7 +382,7 @@ public: void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, sal_uInt8 _nDataValue) { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -479,7 +479,7 @@ public: void init_001() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -501,7 +501,7 @@ public: void init_002() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -523,7 +523,7 @@ public: void init_003() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; @@ -545,7 +545,7 @@ public: void init_004() { rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB); - CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != NULL); + CPPUNIT_ASSERT_MESSAGE("create failed.", aCipher != nullptr); sal_uInt32 nKeyLen = 16; sal_uInt8 *pKeyBuffer = new sal_uInt8[ nKeyLen ]; diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 52ebb81ffb12..4a1b2276c727 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -114,12 +114,12 @@ public: for (int i = 0; i < aAlgorithmSize; i++) { rtlDigest handle = rtl_digest_create( constDigestAlgorithms[i] ); - CPPUNIT_ASSERT_MESSAGE("create digest", handle != NULL); + CPPUNIT_ASSERT_MESSAGE("create digest", handle != nullptr); rtl_digest_destroy( handle ); } rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid ); - CPPUNIT_ASSERT_MESSAGE("create invalid digest", handle == NULL); + CPPUNIT_ASSERT_MESSAGE("create invalid digest", handle == nullptr); rtl_digest_destroy( handle ); } @@ -162,12 +162,12 @@ public: rtlDigestError aError; rtlDigest handle; - handle = NULL; - aError = rtl_digest_init(handle, NULL, 0); + handle = nullptr; + aError = rtl_digest_init(handle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("init(NULL, 0, 0)", aError == rtl_Digest_E_Argument); handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); - aError = rtl_digest_init(handle, NULL, 0); + aError = rtl_digest_init(handle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("init(handle, 0, 0)", aError == rtl_Digest_E_None); rtl_digest_destroy( handle ); @@ -285,24 +285,24 @@ public: rtlDigestError aError; rtlDigest aHandle; - aHandle = NULL; - aError = rtl_digest_update(aHandle, NULL, 0); + aHandle = nullptr; + aError = rtl_digest_update(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("does not handle wrong parameter", aError == rtl_Digest_E_Argument); - aHandle = NULL; - aError = rtl_digest_updateMD2(aHandle, NULL, 0); + aHandle = nullptr; + aError = rtl_digest_updateMD2(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("does not handle wrong parameter", aError == rtl_Digest_E_Argument); - aError = rtl_digest_updateMD5(aHandle, NULL, 0); + aError = rtl_digest_updateMD5(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("does not handle wrong parameter", aError == rtl_Digest_E_Argument); aHandle = rtl_digest_create( rtl_Digest_AlgorithmMD2 ); - CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != 0); + CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != nullptr); const sal_uInt8* pData = reinterpret_cast<const sal_uInt8*>(sSampleString.getStr()); sal_uInt32 nSize = sSampleString.getLength(); - aError = rtl_digest_updateMD2(aHandle, NULL, 0); + aError = rtl_digest_updateMD2(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("handle parameter 'pData' wrong", aError == rtl_Digest_E_Argument); aError = rtl_digest_updateMD2(aHandle, pData, 0); @@ -312,7 +312,7 @@ public: // use wrong Algorithm!!! This is volitional! aHandle = rtl_digest_create(rtl_Digest_AlgorithmMD2); - CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != 0); + CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != nullptr); aError = rtl_digest_updateMD5(aHandle, pData, nSize); CPPUNIT_ASSERT_MESSAGE("handle parameter 'handle' wrong", aError == rtl_Digest_E_Algorithm); @@ -320,9 +320,9 @@ public: rtl_digest_destroyMD5(aHandle); aHandle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); - CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD5", aHandle != 0); + CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD5", aHandle != nullptr); - aError = rtl_digest_updateMD5(aHandle, NULL, 0); + aError = rtl_digest_updateMD5(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("handle parameter 'pData' wrong", aError == rtl_Digest_E_Argument); aError = rtl_digest_updateMD5(aHandle, pData, 0); @@ -336,22 +336,22 @@ public: rtlDigest aHandle; rtlDigestError aError; - aHandle = NULL; - aError = rtl_digest_get(aHandle, NULL, 0); + aHandle = nullptr; + aError = rtl_digest_get(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("does not handle wrong parameter", aError == rtl_Digest_E_Argument); - aHandle = NULL; - aError = rtl_digest_getMD5(aHandle, NULL, 0); + aHandle = nullptr; + aError = rtl_digest_getMD5(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("does not handle wrong parameter", aError == rtl_Digest_E_Argument); // test with wrong algorithm aHandle = rtl_digest_create(rtl_Digest_AlgorithmMD2); - CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != 0); + CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD2", aHandle != nullptr); sal_uInt32 nKeyLen = rtl_digest_queryLength(aHandle); std::unique_ptr<sal_uInt8[]> pKeyBuffer(new sal_uInt8[nKeyLen]); - aError = rtl_digest_getMD5(aHandle, NULL, 0); + aError = rtl_digest_getMD5(aHandle, nullptr, 0); CPPUNIT_ASSERT_MESSAGE("handle 2. parameter wrong", aError == rtl_Digest_E_Argument); aError = rtl_digest_getMD5(aHandle, pKeyBuffer.get(), 0); @@ -360,9 +360,9 @@ public: rtl_digest_destroyMD2(aHandle); aHandle = rtl_digest_create(rtl_Digest_AlgorithmMD5); - CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD5", aHandle != 0); + CPPUNIT_ASSERT_MESSAGE("create with rtl_Digest_AlgorithmMD5", aHandle != nullptr); - aError = rtl_digest_getMD5(aHandle, NULL, nKeyLen); + aError = rtl_digest_getMD5(aHandle, nullptr, nKeyLen); CPPUNIT_ASSERT_MESSAGE("handle parameter 'pData' wrong", aError == rtl_Digest_E_Argument ); aError = rtl_digest_getMD5(aHandle, pKeyBuffer.get(), 0); diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 44f6996b8056..fc99838ee573 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -51,7 +51,7 @@ public: void getDefault_001() { rtl_Locale* pData = rtl_locale_getDefault(); - CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != NULL); + CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr); } // Change the following lines only, if you add, remove or rename @@ -83,7 +83,7 @@ public: { rtl_locale_setDefault(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr()); rtl_Locale* pData = rtl_locale_getDefault(); - CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != NULL); + CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr); // be sure to not GPF } diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 2f0b366bccc9..7868b98c6464 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -995,7 +995,7 @@ public: void createFromCodePoints::test() { CPPUNIT_ASSERT_EQUAL( sal_Int32(0), - rtl::OUString(static_cast< sal_uInt32 const * >(NULL), 0).getLength()); + rtl::OUString(static_cast< sal_uInt32 const * >(nullptr), 0).getLength()); static sal_uInt32 const cp[] = { 0, 0xD800, 0xFFFF, 0x10000, 0x10FFFF }; rtl::OUString s(cp, sizeof cp / sizeof (sal_uInt32)); CPPUNIT_ASSERT_EQUAL(sal_Int32(7), s.getLength()); diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index ee8dcfa7dd29..d4d7c86b7df5 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -42,9 +42,9 @@ using ::rtl::OUStringToOString; /** print a UNI_CODE String. And also print some comments of the string. */ -inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = NULL ) +inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = nullptr ) { - if ( msg != NULL ) + if ( msg != nullptr ) { printf("#%s #printUString_u# ", msg ); } @@ -93,7 +93,7 @@ public: printUString(suCWD, "path to the current module"); // printUString(suCWD2, "suCWD2"); - oslProcess hProcess = NULL; + oslProcess hProcess = nullptr; const int nParameterCount = 4; rtl_uString* pParameters[ nParameterCount ]; @@ -110,9 +110,9 @@ public: pParameters, nParameterCount, osl_Process_WAIT, - 0, /* osl_getCurrentSecurity() */ + nullptr, /* osl_getCurrentSecurity() */ suCWD.pData, - NULL, + nullptr, 0, &hProcess ); @@ -229,22 +229,22 @@ public: printf("# UUID to String is %s\n", pUUID1); rtl::OUString suCWD = getModulePath(); - oslProcess hProcess = NULL; + oslProcess hProcess = nullptr; rtl::OUString suFileURL = suCWD + "/" + EXEC_NAME; oslFileHandle* pChildOutputRead = new oslFileHandle(); oslProcessError osl_error = osl_executeProcess_WithRedirectedIO( suFileURL.pData, - NULL, + nullptr, 0, osl_Process_WAIT, - 0, + nullptr, suCWD.pData, - NULL, + nullptr, 0, &hProcess, - NULL, + nullptr, pChildOutputRead, - NULL); + nullptr); CPPUNIT_ASSERT_MESSAGE ( diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx index 0a54c96ae4e0..ba46d9f76397 100644 --- a/sal/qa/rtl/strings/test_ostring_concat.cxx +++ b/sal/qa/rtl/strings/test_ostring_concat.cxx @@ -86,7 +86,7 @@ void test::ostring::StringConcat::checkConcat() void test::ostring::StringConcat::checkEnsureCapacity() { - rtl_String* str = NULL; + rtl_String* str = nullptr; rtl_string_newFromLiteral( &str, "test", strlen( "test" ), 0 ); CPPUNIT_ASSERT_EQUAL( sal_Int32( 4 ), str->length ); CPPUNIT_ASSERT_EQUAL( 1, int( str->refCount )); @@ -145,8 +145,8 @@ void test::ostring::StringConcat::checkInvalid() CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringBuffer( "b" ))); CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( "b" ))); CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + 1 )); - rtl_String* rs = NULL; - rtl_uString* rus = NULL; + rtl_String* rs = nullptr; + rtl_uString* rus = nullptr; CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rs )); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rus )); } diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx index 3bc69e17cfe8..b319c089d35f 100644 --- a/sal/qa/rtl/strings/test_oustring_concat.cxx +++ b/sal/qa/rtl/strings/test_oustring_concat.cxx @@ -87,7 +87,7 @@ void test::oustring::StringConcat::checkConcatAsciiL() void test::oustring::StringConcat::checkEnsureCapacity() { - rtl_uString* str = NULL; + rtl_uString* str = nullptr; rtl_uString_newFromLiteral( &str, "test", strlen( "test" ), 0 ); CPPUNIT_ASSERT_EQUAL( sal_Int32( 4 ), str->length ); CPPUNIT_ASSERT_EQUAL( 1, int( str->refCount )); @@ -154,8 +154,8 @@ void test::oustring::StringConcat::checkInvalid() CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + static_cast<char*>(d) )); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + OStringLiteral( "b" ))); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + 1 )); - rtl_String* rs = NULL; - rtl_uString* rus = NULL; + rtl_String* rs = nullptr; + rtl_uString* rus = nullptr; CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rs )); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rus )); } diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx index 363c0ffa3516..639d9b744555 100644 --- a/sal/qa/rtl/strings/test_oustring_convert.cxx +++ b/sal/qa/rtl/strings/test_oustring_convert.cxx @@ -79,7 +79,7 @@ void testConvertToString(TestConvertToString const & rTest) if (bSuccess) { - if (rTest.pStrict == 0 || !aStrict.equals(rTest.pStrict)) + if (rTest.pStrict == nullptr || !aStrict.equals(rTest.pStrict)) { rtl::OStringBuffer aMessage(aPrefix); aMessage.append(RTL_CONSTASCII_STRINGPARAM("strict = \"")); @@ -96,7 +96,7 @@ void testConvertToString(TestConvertToString const & rTest) aMessage.append(RTL_CONSTASCII_STRINGPARAM("modified output")); CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false); } - if (rTest.pStrict != 0) + if (rTest.pStrict != nullptr) { rtl::OStringBuffer aMessage(aPrefix); aMessage.append(RTL_CONSTASCII_STRINGPARAM("failed")); @@ -149,7 +149,7 @@ void test::oustring::Convert::convertToString() RTL_TEXTENCODING_ISO_2022_JP, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR, - 0, + nullptr, "" }, { { 0x3001, 0xB800 }, 2, @@ -162,7 +162,7 @@ void test::oustring::Convert::convertToString() RTL_TEXTENCODING_ISO_8859_1, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR, - 0, + nullptr, "A" }, { { 0x0041,0x0100,0x0042 }, 3, diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 75a6fb7507a3..8a6b4837b39d 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -57,10 +57,10 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { = rtl_createTextToUnicodeConverter(rSet.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rSet.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_TextToUnicodeContext aContext = rtl_createTextToUnicodeContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; @@ -103,10 +103,10 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { = rtl_createUnicodeToTextConverter(rSet.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rSet.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_UnicodeToTextContext aContext = rtl_createUnicodeToTextContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; @@ -147,10 +147,10 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { = rtl_createTextToUnicodeConverter(rSet.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rSet.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_TextToUnicodeContext aContext = rtl_createTextToUnicodeContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; @@ -195,10 +195,10 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { = rtl_createTextToUnicodeConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_TextToUnicodeContext aContext = rtl_createTextToUnicodeContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; @@ -235,10 +235,10 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { = rtl_createTextToUnicodeConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_TextToUnicodeContext aContext = rtl_createTextToUnicodeContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); if (aContext != reinterpret_cast<rtl_TextToUnicodeContext>(1)) { sal_Size nInput = 0; sal_Size nOutput = 0; @@ -289,7 +289,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { = rtl_createTextToUnicodeConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); for (sal_Size i = 0;;) { if (i == rTest.m_nTextSize) { goto done; @@ -299,7 +299,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { sal_uInt32 nInfo = 0; sal_Size nCvtBytes; sal_Size nChars = rtl_convertTextToUnicode( - aConverter, 0, &c1, 1, aUC, 2, + aConverter, nullptr, &c1, 1, aUC, 2, (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR @@ -319,7 +319,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { c1 = rTest.m_pText[i++]; sBuffer[nLen++] = c1; nChars = rtl_convertTextToUnicode( - aConverter, 0, sBuffer, nLen, aUC, 2, + aConverter, nullptr, sBuffer, nLen, aUC, 2, (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR @@ -370,10 +370,10 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { = rtl_createUnicodeToTextConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); rtl_UnicodeToTextContext aContext = rtl_createUnicodeToTextContext(aConverter); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", aContext != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; @@ -413,12 +413,12 @@ void doComplexCharSetCutTest(ComplexCharSetTest const & rTest) { = rtl_createTextToUnicodeConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), RTL_TEXTENCODING_UTF8).getStr(), - aConverter != NULL); + aConverter != nullptr); sal_Size nSize; sal_uInt32 nInfo; sal_Size nConverted; nSize = rtl_convertTextToUnicode( - aConverter, 0, reinterpret_cast< sal_Char const * >(rTest.m_pText), + aConverter, nullptr, reinterpret_cast< sal_Char const * >(rTest.m_pText), rTest.m_nTextSize, aUnicode, TEST_STRING_SIZE, (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR @@ -2668,9 +2668,9 @@ void Test::testSRCBUFFERTOSMALL() { rtl_TextToUnicodeConverter cv = rtl_createTextToUnicodeConverter( RTL_TEXTENCODING_EUC_JP); CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeConverter(EUC-JP) failed", - cv != NULL); + cv != nullptr); rtl_TextToUnicodeContext cx = rtl_createTextToUnicodeContext(cv); - CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", cx != NULL); + CPPUNIT_ASSERT_MESSAGE("rtl_createTextToUnicodeContext failed", cx != nullptr); char src = '\xA1'; sal_Unicode dst[10]; sal_uInt32 info; @@ -2774,7 +2774,7 @@ void Test::testMime() { { "KSC_5601", RTL_TEXTENCODING_MS_949, false }, { "korean", RTL_TEXTENCODING_MS_949, false }, { "csKSC56011987", RTL_TEXTENCODING_MS_949, false }, - { 0, RTL_TEXTENCODING_MS_949, true }, + { nullptr, RTL_TEXTENCODING_MS_949, true }, { "Adobe-Standard-Encoding", RTL_TEXTENCODING_ADOBE_STANDARD, false }, { "csAdobeStandardEncoding", RTL_TEXTENCODING_ADOBE_STANDARD, false }, @@ -2788,10 +2788,10 @@ void Test::testMime() { { "Cyrillic-Asian", RTL_TEXTENCODING_PT154, false } }; for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { - if (data[i].mime == 0) { + if (data[i].mime == nullptr) { OSL_ASSERT(data[i].reverse); CPPUNIT_ASSERT_EQUAL( - static_cast< char const * >(0), + static_cast< char const * >(nullptr), rtl_getMimeCharsetFromTextEncoding(data[i].encoding)); } else { CPPUNIT_ASSERT_EQUAL( diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 191bf5dc2b53..00e8dd56b7db 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -323,7 +323,7 @@ void Test::test_Uri() { { "http://a/b/c/d;p?q", "http:g", "http:g" }, { "http!://a/b/c/d;p?q", "g:h", "g:h" }, - { "http!://a/b/c/d;p?q", "g", 0 }, + { "http!://a/b/c/d;p?q", "g", nullptr }, { "http:b/c/d;p?q", "g:h", "g:h" }, { "http:b/c/d;p?q", "g", "http:b/c/g" }, { "http://a/b/../", "../c", "http://a/c" }, @@ -347,8 +347,8 @@ void Test::test_Uri() { bMalformed = true; } if (bMalformed - ? aRelToAbsTest[i].pAbs != 0 - : (aRelToAbsTest[i].pAbs == 0 + ? aRelToAbsTest[i].pAbs != nullptr + : (aRelToAbsTest[i].pAbs == nullptr || !aAbs.equalsAscii(aRelToAbsTest[i].pAbs))) { printf( @@ -358,7 +358,7 @@ void Test::test_Uri() { ? "<MALFORMED>" : rtl::OUStringToOString( aAbs, RTL_TEXTENCODING_UTF8).getStr()), - (aRelToAbsTest[i].pAbs == 0 + (aRelToAbsTest[i].pAbs == nullptr ? "<MALFORMED>" : aRelToAbsTest[i].pAbs)); CPPUNIT_ASSERT(false); } diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index f568d03702c2..ba20eadec53d 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -60,7 +60,7 @@ public: sal_Int32 i,i2; for( i = 0 ; i < TEST_UUID ; i ++ ) { - rtl_createUuid( aNode[i], 0, sal_False ); + rtl_createUuid( aNode[i], nullptr, sal_False ); } bool bRes = true; for( i = 0 ; i < TEST_UUID ; i ++ ) @@ -137,7 +137,7 @@ public: sal_uInt8 pNamedUUID[16], pNamedUUID2[16]; // Same name does generate the same uuid - rtl_String *pName = 0; + rtl_String *pName = nullptr; rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Name" ); rtl_createNamedUuid( pNamedUUID , NameSpace_DNS , pName ); rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName ); diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index 329d013dfafb..3e6adbe481ab 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -50,7 +50,7 @@ static rtl_arena_list_st g_arena_list; * * @internal */ -static rtl_arena_type * gp_arena_arena = 0; +static rtl_arena_type * gp_arena_arena = nullptr; /** gp_machdep_arena * @@ -59,11 +59,11 @@ static rtl_arena_type * gp_arena_arena = 0; * * @internal */ -static rtl_arena_type * gp_machdep_arena = 0; +static rtl_arena_type * gp_machdep_arena = nullptr; /** gp_default_arena */ -rtl_arena_type * gp_default_arena = 0; +rtl_arena_type * gp_default_arena = nullptr; namespace { @@ -127,7 +127,7 @@ rtl_arena_segment_populate ( span = static_cast< rtl_arena_segment_type * >( rtl_machdep_alloc(gp_machdep_arena, &size)); - if (span != 0) + if (span != nullptr) { rtl_arena_segment_type *first, *last, *head; sal_Size count = size / sizeof(rtl_arena_segment_type); @@ -150,7 +150,7 @@ rtl_arena_segment_populate ( first->m_type = 0; } } - return (span != 0); + return (span != nullptr); } /** rtl_arena_segment_get() @@ -166,7 +166,7 @@ rtl_arena_segment_get ( { rtl_arena_segment_type * head; - assert(*ppSegment == 0); + assert(*ppSegment == nullptr); head = &(arena->m_segment_reserve_head); if ((head->m_snext != head) || rtl_arena_segment_populate (arena)) @@ -203,7 +203,7 @@ rtl_arena_segment_put ( QUEUE_INSERT_HEAD_NAMED(head, (*ppSegment), s); /* clear */ - (*ppSegment) = 0; + (*ppSegment) = nullptr; } /** rtl_arena_freelist_insert() @@ -274,7 +274,7 @@ rtl_arena_hash_rescale ( new_bytes = new_size * sizeof(rtl_arena_segment_type*); new_table = static_cast<rtl_arena_segment_type **>(rtl_arena_alloc (gp_arena_arena, &new_bytes)); - if (new_table != 0) + if (new_table != nullptr) { rtl_arena_segment_type ** old_table; sal_Size old_size, i; @@ -302,7 +302,7 @@ rtl_arena_hash_rescale ( for (i = 0; i < old_size; i++) { rtl_arena_segment_type * curr = old_table[i]; - while (curr != 0) + while (curr != nullptr) { rtl_arena_segment_type * next = curr->m_fnext; rtl_arena_segment_type ** head; @@ -314,7 +314,7 @@ rtl_arena_hash_rescale ( curr = next; } - old_table[i] = 0; + old_table[i] = nullptr; } RTL_MEMORY_LOCK_RELEASE(&(arena->m_lock)); @@ -361,7 +361,7 @@ rtl_arena_hash_remove ( sal_Size lookups = 0; segpp = &(arena->m_hash_table[RTL_ARENA_HASH_INDEX(arena, addr)]); - while ((segment = *segpp) != 0) + while ((segment = *segpp) != nullptr) { if (segment->m_addr == addr) { @@ -374,8 +374,8 @@ rtl_arena_hash_remove ( segpp = &(segment->m_fnext); } - assert(segment != 0); // bad free - if (segment != 0) + assert(segment != nullptr); // bad free + if (segment != nullptr) { assert(segment->m_size == size); (void) size; // avoid warnings @@ -424,7 +424,7 @@ rtl_arena_segment_alloc ( { int index = 0; - assert(*ppSegment == 0); + assert(*ppSegment == nullptr); if (!RTL_MEMORY_ISP2(size)) { int msb = highbit(size); @@ -462,12 +462,12 @@ rtl_arena_segment_alloc ( } dequeue_and_leave: - if (*ppSegment != 0) + if (*ppSegment != nullptr) { /* remove from freelist */ rtl_arena_freelist_remove (arena, (*ppSegment)); } - return (*ppSegment != 0); + return (*ppSegment != nullptr); } /** rtl_arena_segment_create() @@ -483,15 +483,15 @@ rtl_arena_segment_create ( rtl_arena_segment_type ** ppSegment ) { - assert((*ppSegment) == 0); - if (arena->m_source_alloc != 0) + assert((*ppSegment) == nullptr); + if (arena->m_source_alloc != nullptr) { rtl_arena_segment_get (arena, ppSegment); - if (*ppSegment != 0) + if (*ppSegment != nullptr) { - rtl_arena_segment_type * span = 0; + rtl_arena_segment_type * span = nullptr; rtl_arena_segment_get (arena, &span); - if (span != 0) + if (span != nullptr) { /* import new span from source arena */ RTL_MEMORY_LOCK_RELEASE(&(arena->m_lock)); @@ -679,8 +679,8 @@ rtl_arena_activate ( void (SAL_CALL * source_free) (rtl_arena_type *, void *, sal_Size) ) { - assert(arena != 0); - if (arena != 0) + assert(arena != nullptr); + if (arena != nullptr) { (void) snprintf (arena->m_name, sizeof(arena->m_name), "%s", name); @@ -709,13 +709,13 @@ rtl_arena_activate ( if (!(arena->m_qcache_ptr)) { /* out of memory */ - return 0; + return nullptr; } for (i = 1; i <= n; i++) { size = i * arena->m_quantum; (void) snprintf (namebuf, sizeof(namebuf), "%s_%" SAL_PRIuUINTPTR, arena->m_name, size); - arena->m_qcache_ptr[i - 1] = rtl_cache_create(namebuf, size, 0, NULL, NULL, NULL, NULL, arena, RTL_CACHE_FLAG_QUANTUMCACHE); + arena->m_qcache_ptr[i - 1] = rtl_cache_create(namebuf, size, 0, nullptr, nullptr, nullptr, nullptr, arena, RTL_CACHE_FLAG_QUANTUMCACHE); } } @@ -742,15 +742,15 @@ rtl_arena_deactivate ( RTL_MEMORY_LOCK_RELEASE(&(g_arena_list.m_lock)); /* cleanup quantum cache(s) */ - if ((arena->m_qcache_max > 0) && (arena->m_qcache_ptr != 0)) + if ((arena->m_qcache_max > 0) && (arena->m_qcache_ptr != nullptr)) { int i, n = (arena->m_qcache_max >> arena->m_quantum_shift); for (i = 1; i <= n; i++) { - if (arena->m_qcache_ptr[i - 1] != 0) + if (arena->m_qcache_ptr[i - 1] != nullptr) { rtl_cache_destroy (arena->m_qcache_ptr[i - 1]); - arena->m_qcache_ptr[i - 1] = 0; + arena->m_qcache_ptr[i - 1] = nullptr; } } rtl_arena_free ( @@ -758,7 +758,7 @@ rtl_arena_deactivate ( arena->m_qcache_ptr, n * sizeof(rtl_cache_type*)); - arena->m_qcache_ptr = 0; + arena->m_qcache_ptr = nullptr; } /* check for leaked segments */ @@ -782,7 +782,7 @@ rtl_arena_deactivate ( /* cleanup still used segment(s) */ for (i = 0, n = arena->m_hash_size; i < n; i++) { - while ((segment = arena->m_hash_table[i]) != 0) + while ((segment = arena->m_hash_table[i]) != nullptr) { /* pop from hash table */ arena->m_hash_table[i] = segment->m_fnext, segment->m_fnext = segment->m_fprev = segment; @@ -874,19 +874,19 @@ SAL_CALL rtl_arena_create ( SAL_UNUSED_PARAMETER int ) SAL_THROW_EXTERN_C() { - rtl_arena_type * result = 0; + rtl_arena_type * result = nullptr; sal_Size size = sizeof(rtl_arena_type); try_alloc: result = static_cast<rtl_arena_type*>(rtl_arena_alloc (gp_arena_arena, &size)); - if (result != 0) + if (result != nullptr) { rtl_arena_type * arena = result; rtl_arena_constructor (arena); if (!source_arena) { - assert(gp_default_arena != 0); + assert(gp_default_arena != nullptr); source_arena = gp_default_arena; } @@ -900,14 +900,14 @@ try_alloc: source_free ); - if (result == 0) + if (result == nullptr) { rtl_arena_deactivate (arena); rtl_arena_destructor (arena); rtl_arena_free (gp_arena_arena, arena, size); } } - else if (gp_arena_arena == 0) + else if (gp_arena_arena == nullptr) { ensureArenaSingleton(); if (gp_arena_arena) @@ -926,7 +926,7 @@ SAL_CALL rtl_arena_destroy ( rtl_arena_type * arena ) SAL_THROW_EXTERN_C() { - if (arena != 0) + if (arena != nullptr) { rtl_arena_deactivate (arena); rtl_arena_destructor (arena); @@ -942,9 +942,9 @@ SAL_CALL rtl_arena_alloc ( sal_Size * pSize ) SAL_THROW_EXTERN_C() { - void * addr = 0; + void * addr = nullptr; - if ((arena != 0) && (pSize != 0)) + if ((arena != nullptr) && (pSize != nullptr)) { sal_Size size; @@ -952,7 +952,7 @@ SAL_CALL rtl_arena_alloc ( if (size > arena->m_qcache_max) { /* allocate from segment list */ - rtl_arena_segment_type *segment = 0; + rtl_arena_segment_type *segment = nullptr; RTL_MEMORY_LOCK_ACQUIRE(&(arena->m_lock)); if (rtl_arena_segment_alloc (arena, size, &segment) || @@ -970,9 +970,9 @@ SAL_CALL rtl_arena_alloc ( oversize = segment->m_size - size; if ((oversize >= arena->m_quantum) && (oversize >= arena->m_qcache_max)) { - rtl_arena_segment_type * remainder = 0; + rtl_arena_segment_type * remainder = nullptr; rtl_arena_segment_get (arena, &remainder); - if (remainder != 0) + if (remainder != nullptr) { segment->m_size = size; @@ -996,10 +996,10 @@ SAL_CALL rtl_arena_alloc ( { /* allocate from quantum cache(s) */ int index = (size >> arena->m_quantum_shift) - 1; - assert(arena->m_qcache_ptr[index] != 0); + assert(arena->m_qcache_ptr[index] != nullptr); addr = rtl_cache_alloc (arena->m_qcache_ptr[index]); - if (addr != 0) + if (addr != nullptr) (*pSize) = size; } } @@ -1015,7 +1015,7 @@ SAL_CALL rtl_arena_free ( sal_Size size ) SAL_THROW_EXTERN_C() { - if (arena != 0) + if (arena != nullptr) { size = RTL_MEMORY_ALIGN(size, arena->m_quantum); if (size > arena->m_qcache_max) @@ -1026,7 +1026,7 @@ SAL_CALL rtl_arena_free ( RTL_MEMORY_LOCK_ACQUIRE(&(arena->m_lock)); segment = rtl_arena_hash_remove (arena, reinterpret_cast<sal_uIntPtr>(addr), size); - if (segment != 0) + if (segment != nullptr) { rtl_arena_segment_type *next, *prev; @@ -1081,7 +1081,7 @@ SAL_CALL rtl_arena_free ( { /* free to quantum cache(s) */ int index = (size >> arena->m_quantum_shift) - 1; - assert(arena->m_qcache_ptr[index] != 0); + assert(arena->m_qcache_ptr[index] != nullptr); rtl_cache_free (arena->m_qcache_ptr[index], addr); } @@ -1139,7 +1139,7 @@ SAL_CALL rtl_machdep_alloc ( #endif #if defined(SAL_UNX) - addr = mmap (NULL, (size_t)(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + addr = mmap (nullptr, (size_t)(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); #elif defined(SAL_W32) addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE); #endif /* (SAL_UNX || SAL_W32) */ @@ -1153,7 +1153,7 @@ SAL_CALL rtl_machdep_alloc ( (*pSize) = size; return addr; } - return NULL; + return nullptr; } /** rtl_machdep_free() @@ -1214,7 +1214,7 @@ rtl_arena_init() /* machdep (pseudo) arena */ static rtl_arena_type g_machdep_arena; - assert(gp_machdep_arena == 0); + assert(gp_machdep_arena == nullptr); rtl_arena_constructor (&g_machdep_arena); gp_machdep_arena = rtl_arena_activate ( @@ -1222,15 +1222,15 @@ rtl_arena_init() "rtl_machdep_arena", rtl_machdep_pagesize(), 0, /* no quantum caching */ - 0, 0, 0 /* no source */ + nullptr, nullptr, nullptr /* no source */ ); - assert(gp_machdep_arena != 0); + assert(gp_machdep_arena != nullptr); } { /* default arena */ static rtl_arena_type g_default_arena; - assert(gp_default_arena == 0); + assert(gp_default_arena == nullptr); rtl_arena_constructor (&g_default_arena); gp_default_arena = rtl_arena_activate ( @@ -1242,13 +1242,13 @@ rtl_arena_init() rtl_machdep_alloc, rtl_machdep_free ); - assert(gp_default_arena != 0); + assert(gp_default_arena != nullptr); } { /* arena internal arena */ static rtl_arena_type g_arena_arena; - assert(gp_arena_arena == 0); + assert(gp_arena_arena == nullptr); rtl_arena_constructor (&g_arena_arena); gp_arena_arena = rtl_arena_activate ( @@ -1260,7 +1260,7 @@ rtl_arena_init() rtl_arena_alloc, rtl_arena_free ); - assert(gp_arena_arena != 0); + assert(gp_arena_arena != nullptr); } // SAL_INFO("sal.rtl", "rtl_arena_init completed"); } @@ -1270,7 +1270,7 @@ rtl_arena_init() void rtl_arena_fini() { - if (gp_arena_arena != 0) + if (gp_arena_arena != nullptr) { rtl_arena_type * arena, * head; diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx index 8a80e70fba1b..54903819e93c 100644 --- a/sal/rtl/alloc_cache.cxx +++ b/sal/rtl/alloc_cache.cxx @@ -62,22 +62,22 @@ static rtl_cache_list_st g_cache_list; * * @internal */ -static rtl_arena_type * gp_cache_arena = 0; +static rtl_arena_type * gp_cache_arena = nullptr; /** gp_cache_magazine_cache * @internal */ -static rtl_cache_type * gp_cache_magazine_cache = 0; +static rtl_cache_type * gp_cache_magazine_cache = nullptr; /** gp_cache_slab_cache * @internal */ -static rtl_cache_type * gp_cache_slab_cache = 0; +static rtl_cache_type * gp_cache_slab_cache = nullptr; /** gp_cache_bufctl_cache * @internal */ -static rtl_cache_type * gp_cache_bufctl_cache = 0; +static rtl_cache_type * gp_cache_bufctl_cache = nullptr; /* ================================================================= */ @@ -104,7 +104,7 @@ rtl_cache_hash_rescale ( new_bytes = new_size * sizeof(rtl_cache_bufctl_type*); new_table = static_cast<rtl_cache_bufctl_type**>(rtl_arena_alloc(gp_cache_arena, &new_bytes)); - if (new_table != 0) + if (new_table != nullptr) { rtl_cache_bufctl_type ** old_table; sal_Size old_size, i; @@ -133,7 +133,7 @@ rtl_cache_hash_rescale ( for (i = 0; i < old_size; i++) { rtl_cache_bufctl_type * curr = old_table[i]; - while (curr != 0) + while (curr != nullptr) { rtl_cache_bufctl_type * next = curr->m_next; rtl_cache_bufctl_type ** head; @@ -145,7 +145,7 @@ rtl_cache_hash_rescale ( curr = next; } - old_table[i] = 0; + old_table[i] = nullptr; } RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock)); @@ -187,11 +187,11 @@ rtl_cache_hash_remove ( sal_Size lookups = 0; ppHead = &(cache->m_hash_table[RTL_CACHE_HASH_INDEX(cache, addr)]); - while ((bufctl = *ppHead) != 0) + while ((bufctl = *ppHead) != nullptr) { if (bufctl->m_addr == addr) { - *ppHead = bufctl->m_next, bufctl->m_next = 0; + *ppHead = bufctl->m_next, bufctl->m_next = nullptr; break; } @@ -199,7 +199,7 @@ rtl_cache_hash_remove ( ppHead = &(bufctl->m_next); } - assert(bufctl != 0); // bad free + assert(bufctl != nullptr); // bad free if (lookups > 1) { @@ -264,13 +264,13 @@ rtl_cache_slab_create ( rtl_cache_type * cache ) { - rtl_cache_slab_type * slab = 0; + rtl_cache_slab_type * slab = nullptr; void * addr; sal_Size size; size = cache->m_slab_size; addr = rtl_arena_alloc (cache->m_source, &size); - if (addr != 0) + if (addr != nullptr) { assert(size >= cache->m_slab_size); @@ -284,15 +284,15 @@ rtl_cache_slab_create ( { /* construct embedded slab struct */ slab = RTL_CACHE_SLAB(addr, cache->m_slab_size); - (void) rtl_cache_slab_constructor (slab, 0); + (void) rtl_cache_slab_constructor (slab, nullptr); } - if (slab != 0) + if (slab != nullptr) { slab->m_data = reinterpret_cast<sal_uIntPtr>(addr); /* dynamic freelist initialization */ slab->m_bp = slab->m_data; - slab->m_sp = 0; + slab->m_sp = nullptr; } else { @@ -319,12 +319,12 @@ rtl_cache_slab_destroy ( { /* cleanup bufctl(s) for free buffer(s) */ sal_Size ntypes = (slab->m_bp - slab->m_data) / cache->m_type_size; - for (ntypes -= refcnt; slab->m_sp != 0; ntypes--) + for (ntypes -= refcnt; slab->m_sp != nullptr; ntypes--) { rtl_cache_bufctl_type * bufctl = slab->m_sp; /* pop from freelist */ - slab->m_sp = bufctl->m_next, bufctl->m_next = 0; + slab->m_sp = bufctl->m_next, bufctl->m_next = nullptr; /* return bufctl struct to bufctl cache */ rtl_cache_free (gp_cache_bufctl_cache, bufctl); @@ -337,7 +337,7 @@ rtl_cache_slab_destroy ( else { /* destruct embedded slab struct */ - rtl_cache_slab_destructor (slab, 0); + rtl_cache_slab_destructor (slab, nullptr); } if ((refcnt == 0) || (cache->m_features & RTL_CACHE_FEATURE_BULKDESTROY)) @@ -361,7 +361,7 @@ rtl_cache_slab_populate ( RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock)); slab = rtl_cache_slab_create (cache); RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_slab_lock)); - if (slab != 0) + if (slab != nullptr) { /* update buffer start addr w/ current color */ slab->m_bp += cache->m_ncolor; @@ -377,7 +377,7 @@ rtl_cache_slab_populate ( /* insert onto 'free' queue */ QUEUE_INSERT_HEAD_NAMED(&(cache->m_free_head), slab, slab_); } - return (slab != 0); + return (slab != nullptr); } /* ================================================================= */ @@ -391,7 +391,7 @@ rtl_cache_slab_alloc ( rtl_cache_type * cache ) { - void * addr = 0; + void * addr = nullptr; rtl_cache_slab_type * head; RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_slab_lock)); @@ -405,7 +405,7 @@ rtl_cache_slab_alloc ( slab = head->m_slab_next; assert(slab->m_ntypes < cache->m_ntypes); - if (slab->m_sp == 0) + if (slab->m_sp == nullptr) { /* initialize bufctl w/ current 'slab->m_bp' */ assert(slab->m_bp < slab->m_data + cache->m_ntypes * cache->m_type_size + cache->m_ncolor_max); @@ -414,11 +414,11 @@ rtl_cache_slab_alloc ( /* allocate bufctl */ assert(cache != gp_cache_bufctl_cache); bufctl = static_cast<rtl_cache_bufctl_type*>(rtl_cache_alloc (gp_cache_bufctl_cache)); - if (bufctl == 0) + if (bufctl == nullptr) { /* out of memory */ RTL_MEMORY_LOCK_RELEASE(&(cache->m_slab_lock)); - return 0; + return nullptr; } bufctl->m_addr = slab->m_bp; @@ -429,7 +429,7 @@ rtl_cache_slab_alloc ( /* embedded bufctl */ bufctl = reinterpret_cast<rtl_cache_bufctl_type*>(slab->m_bp); } - bufctl->m_next = 0; + bufctl->m_next = nullptr; /* update 'slab->m_bp' to next free buffer */ slab->m_bp += cache->m_type_size; @@ -485,7 +485,7 @@ rtl_cache_slab_free ( if (cache->m_features & RTL_CACHE_FEATURE_HASH) { bufctl = rtl_cache_hash_remove (cache, reinterpret_cast<sal_uIntPtr>(addr)); - slab = (bufctl != 0) ? reinterpret_cast<rtl_cache_slab_type*>(bufctl->m_slab) : 0; + slab = (bufctl != nullptr) ? reinterpret_cast<rtl_cache_slab_type*>(bufctl->m_slab) : nullptr; } else { @@ -494,7 +494,7 @@ rtl_cache_slab_free ( slab = RTL_CACHE_SLAB(addr, cache->m_slab_size); } - if (slab != 0) + if (slab != nullptr) { /* check for full slab */ if (slab->m_ntypes == cache->m_ntypes) @@ -543,7 +543,7 @@ rtl_cache_magazine_constructor (void * obj, SAL_UNUSED_PARAMETER void *) rtl_cache_magazine_type * mag = static_cast<rtl_cache_magazine_type*>(obj); /* @@@ sal_Size size = (sal_Size)(arg); @@@ */ - mag->m_mag_next = 0; + mag->m_mag_next = nullptr; mag->m_mag_size = RTL_CACHE_MAGAZINE_SIZE; mag->m_mag_used = 0; @@ -557,7 +557,7 @@ rtl_cache_magazine_destructor (void * obj, SAL_UNUSED_PARAMETER void *) { rtl_cache_magazine_type * mag = static_cast< rtl_cache_magazine_type * >( obj); - assert(mag->m_mag_next == 0); // assure removed from queue(s) + assert(mag->m_mag_next == nullptr); // assure removed from queue(s) assert(mag->m_mag_used == 0); // assure no longer referenced (void) mag; // avoid warnings } @@ -573,9 +573,9 @@ rtl_cache_magazine_clear ( for (; mag->m_mag_used > 0; --mag->m_mag_used) { void * obj = mag->m_objects[mag->m_mag_used - 1]; - mag->m_objects[mag->m_mag_used - 1] = 0; + mag->m_objects[mag->m_mag_used - 1] = nullptr; - if (cache->m_destructor != 0) + if (cache->m_destructor != nullptr) { /* destruct object */ (cache->m_destructor)(obj, cache->m_userarg); @@ -615,15 +615,15 @@ rtl_cache_depot_dequeue ( rtl_cache_depot_type * depot ) { - rtl_cache_magazine_type * mag = 0; + rtl_cache_magazine_type * mag = nullptr; if (depot->m_mag_count > 0) { /* dequeue magazine */ - assert(depot->m_mag_next != 0); + assert(depot->m_mag_next != nullptr); mag = depot->m_mag_next; depot->m_mag_next = mag->m_mag_next; - mag->m_mag_next = 0; + mag->m_mag_next = nullptr; /* update depot stats */ depot->m_mag_count--; @@ -647,17 +647,17 @@ rtl_cache_depot_exchange_alloc ( { rtl_cache_magazine_type * full; - assert((empty == 0) || (empty->m_mag_used == 0)); + assert((empty == nullptr) || (empty->m_mag_used == 0)); /* dequeue full magazine */ full = rtl_cache_depot_dequeue (&(cache->m_depot_full)); - if ((full != 0) && (empty != 0)) + if ((full != nullptr) && (empty != nullptr)) { /* enqueue empty magazine */ rtl_cache_depot_enqueue (&(cache->m_depot_empty), empty); } - assert((full == 0) || (full->m_mag_used > 0)); + assert((full == nullptr) || (full->m_mag_used > 0)); return full; } @@ -674,17 +674,17 @@ rtl_cache_depot_exchange_free ( { rtl_cache_magazine_type * empty; - assert((full == 0) || (full->m_mag_used > 0)); + assert((full == nullptr) || (full->m_mag_used > 0)); /* dequeue empty magazine */ empty = rtl_cache_depot_dequeue (&(cache->m_depot_empty)); - if ((empty != 0) && (full != 0)) + if ((empty != nullptr) && (full != nullptr)) { /* enqueue full magazine */ rtl_cache_depot_enqueue (&(cache->m_depot_full), full); } - assert((empty == 0) || (empty->m_mag_used == 0)); + assert((empty == nullptr) || (empty->m_mag_used == 0)); return empty; } @@ -698,21 +698,21 @@ rtl_cache_depot_populate ( rtl_cache_type * cache ) { - rtl_cache_magazine_type * empty = 0; + rtl_cache_magazine_type * empty = nullptr; - if (cache->m_magazine_cache != 0) + if (cache->m_magazine_cache != nullptr) { /* allocate new empty magazine */ RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock)); empty = static_cast<rtl_cache_magazine_type*>(rtl_cache_alloc (cache->m_magazine_cache)); RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock)); - if (empty != 0) + if (empty != nullptr) { /* enqueue (new) empty magazine */ rtl_cache_depot_enqueue (&(cache->m_depot_empty), empty); } } - return (empty != 0); + return (empty != nullptr); } /* ================================================================= */ @@ -787,8 +787,8 @@ rtl_cache_activate ( int flags ) { - assert(cache != 0); - if (cache != 0) + assert(cache != nullptr); + if (cache != nullptr) { sal_Size slabsize; @@ -855,8 +855,8 @@ rtl_cache_activate ( if (cache->m_slab_size > source->m_quantum) { - assert(gp_cache_slab_cache != 0); - assert(gp_cache_bufctl_cache != 0); + assert(gp_cache_slab_cache != nullptr); + assert(gp_cache_bufctl_cache != nullptr); cache->m_features |= RTL_CACHE_FEATURE_HASH; cache->m_ntypes = cache->m_slab_size / cache->m_type_size; @@ -881,7 +881,7 @@ rtl_cache_activate ( /* magazine layer */ if (!(flags & RTL_CACHE_FLAG_NOMAGAZINE)) { - assert(gp_cache_magazine_cache != 0); + assert(gp_cache_magazine_cache != nullptr); cache->m_magazine_cache = gp_cache_magazine_cache; } @@ -910,37 +910,37 @@ rtl_cache_deactivate ( (void)active; /* cleanup magazine layer */ - if (cache->m_magazine_cache != 0) + if (cache->m_magazine_cache != nullptr) { rtl_cache_type * mag_cache; rtl_cache_magazine_type * mag; /* prevent recursion */ - mag_cache = cache->m_magazine_cache, cache->m_magazine_cache = 0; + mag_cache = cache->m_magazine_cache, cache->m_magazine_cache = nullptr; /* cleanup cpu layer */ - if ((mag = cache->m_cpu_curr) != 0) + if ((mag = cache->m_cpu_curr) != nullptr) { // coverity[missing_lock] - cache->m_cpu_curr = 0; + cache->m_cpu_curr = nullptr; rtl_cache_magazine_clear (cache, mag); rtl_cache_free (mag_cache, mag); } - if ((mag = cache->m_cpu_prev) != 0) + if ((mag = cache->m_cpu_prev) != nullptr) { // coverity[missing_lock] - cache->m_cpu_prev = 0; + cache->m_cpu_prev = nullptr; rtl_cache_magazine_clear (cache, mag); rtl_cache_free (mag_cache, mag); } /* cleanup depot layer */ - while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_full))) != 0) + while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_full))) != nullptr) { rtl_cache_magazine_clear (cache, mag); rtl_cache_free (mag_cache, mag); } - while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_empty))) != 0) + while ((mag = rtl_cache_depot_dequeue(&(cache->m_depot_empty))) != nullptr) { rtl_cache_magazine_clear (cache, mag); rtl_cache_free (mag_cache, mag); @@ -977,10 +977,10 @@ rtl_cache_deactivate ( for (i = 0; i < n; i++) { rtl_cache_bufctl_type * bufctl; - while ((bufctl = cache->m_hash_table[i]) != 0) + while ((bufctl = cache->m_hash_table[i]) != nullptr) { /* pop from hash table */ - cache->m_hash_table[i] = bufctl->m_next, bufctl->m_next = 0; + cache->m_hash_table[i] = bufctl->m_next, bufctl->m_next = nullptr; /* return to bufctl cache */ rtl_cache_free (gp_cache_bufctl_cache, bufctl); @@ -1055,12 +1055,12 @@ SAL_CALL rtl_cache_create ( int flags ) SAL_THROW_EXTERN_C() { - rtl_cache_type * result = 0; + rtl_cache_type * result = nullptr; sal_Size size = sizeof(rtl_cache_type); try_alloc: result = static_cast<rtl_cache_type*>(rtl_arena_alloc (gp_cache_arena, &size)); - if (result != 0) + if (result != nullptr) { rtl_cache_type * cache = result; (void) rtl_cache_constructor (cache); @@ -1068,7 +1068,7 @@ try_alloc: if (!source) { /* use default arena */ - assert(gp_default_arena != 0); + assert(gp_default_arena != nullptr); source = gp_default_arena; } @@ -1085,7 +1085,7 @@ try_alloc: flags ); - if (result == 0) + if (result == nullptr) { /* activation failed */ rtl_cache_deactivate (cache); @@ -1093,7 +1093,7 @@ try_alloc: rtl_arena_free (gp_cache_arena, cache, size); } } - else if (gp_cache_arena == 0) + else if (gp_cache_arena == nullptr) { ensureCacheSingleton(); if (gp_cache_arena) @@ -1111,7 +1111,7 @@ void SAL_CALL rtl_cache_destroy ( rtl_cache_type * cache ) SAL_THROW_EXTERN_C() { - if (cache != 0) + if (cache != nullptr) { rtl_cache_deactivate (cache); rtl_cache_destructor (cache); @@ -1126,27 +1126,27 @@ SAL_CALL rtl_cache_alloc ( rtl_cache_type * cache ) SAL_THROW_EXTERN_C() { - void * obj = 0; + void * obj = nullptr; - if (cache == 0) - return 0; + if (cache == nullptr) + return nullptr; if (alloc_mode == AMode_SYSTEM) { obj = rtl_allocateMemory(cache->m_type_size); - if ((obj != 0) && (cache->m_constructor != 0)) + if ((obj != nullptr) && (cache->m_constructor != nullptr)) { if (!((cache->m_constructor)(obj, cache->m_userarg))) { /* construction failure */ - rtl_freeMemory(obj), obj = 0; + rtl_freeMemory(obj), obj = nullptr; } } return obj; } RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock)); - if (cache->m_cpu_curr != 0) + if (cache->m_cpu_curr != nullptr) { for (;;) { @@ -1154,7 +1154,7 @@ SAL_CALL rtl_cache_alloc ( rtl_cache_magazine_type *curr, *prev, *temp; curr = cache->m_cpu_curr; - if ((curr != 0) && (curr->m_mag_used > 0)) + if ((curr != nullptr) && (curr->m_mag_used > 0)) { obj = curr->m_objects[--curr->m_mag_used]; cache->m_cpu_stats.m_alloc += 1; @@ -1164,7 +1164,7 @@ SAL_CALL rtl_cache_alloc ( } prev = cache->m_cpu_prev; - if ((prev != 0) && (prev->m_mag_used > 0)) + if ((prev != nullptr) && (prev->m_mag_used > 0)) { temp = cache->m_cpu_curr; cache->m_cpu_curr = cache->m_cpu_prev; @@ -1174,7 +1174,7 @@ SAL_CALL rtl_cache_alloc ( } temp = rtl_cache_depot_exchange_alloc (cache, prev); - if (temp != 0) + if (temp != nullptr) { cache->m_cpu_prev = cache->m_cpu_curr; cache->m_cpu_curr = temp; @@ -1190,13 +1190,13 @@ SAL_CALL rtl_cache_alloc ( /* alloc buffer from slab layer */ obj = rtl_cache_slab_alloc (cache); - if ((obj != 0) && (cache->m_constructor != 0)) + if ((obj != nullptr) && (cache->m_constructor != nullptr)) { /* construct object */ if (!((cache->m_constructor)(obj, cache->m_userarg))) { /* construction failure */ - rtl_cache_slab_free (cache, obj), obj = 0; + rtl_cache_slab_free (cache, obj), obj = nullptr; } } return (obj); @@ -1210,11 +1210,11 @@ SAL_CALL rtl_cache_free ( void * obj ) SAL_THROW_EXTERN_C() { - if ((obj != 0) && (cache != 0)) + if ((obj != nullptr) && (cache != nullptr)) { if (alloc_mode == AMode_SYSTEM) { - if (cache->m_destructor != 0) + if (cache->m_destructor != nullptr) { /* destruct object */ (cache->m_destructor)(obj, cache->m_userarg); @@ -1231,7 +1231,7 @@ SAL_CALL rtl_cache_free ( rtl_cache_magazine_type *curr, *prev, *temp; curr = cache->m_cpu_curr; - if ((curr != 0) && (curr->m_mag_used < curr->m_mag_size)) + if ((curr != nullptr) && (curr->m_mag_used < curr->m_mag_size)) { curr->m_objects[curr->m_mag_used++] = obj; cache->m_cpu_stats.m_free += 1; @@ -1241,7 +1241,7 @@ SAL_CALL rtl_cache_free ( } prev = cache->m_cpu_prev; - if ((prev != 0) && (prev->m_mag_used == 0)) + if ((prev != nullptr) && (prev->m_mag_used == 0)) { temp = cache->m_cpu_curr; cache->m_cpu_curr = cache->m_cpu_prev; @@ -1251,7 +1251,7 @@ SAL_CALL rtl_cache_free ( } temp = rtl_cache_depot_exchange_free (cache, prev); - if (temp != 0) + if (temp != nullptr) { cache->m_cpu_prev = cache->m_cpu_curr; cache->m_cpu_curr = temp; @@ -1271,7 +1271,7 @@ SAL_CALL rtl_cache_free ( RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock)); /* no space for constructed object in magazine layer */ - if (cache->m_destructor != 0) + if (cache->m_destructor != nullptr) { /* destruct object */ (cache->m_destructor)(obj, cache->m_userarg); @@ -1333,9 +1333,9 @@ rtl_cache_wsupdate_init() { RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock)); g_cache_list.m_update_done = 0; - (void) pthread_cond_init (&(g_cache_list.m_update_cond), NULL); + (void) pthread_cond_init (&(g_cache_list.m_update_cond), nullptr); if (pthread_create ( - &(g_cache_list.m_update_thread), NULL, rtl_cache_wsupdate_all, reinterpret_cast<void*>(10)) != 0) + &(g_cache_list.m_update_thread), nullptr, rtl_cache_wsupdate_all, reinterpret_cast<void*>(10)) != 0) { /* failure */ g_cache_list.m_update_thread = pthread_t(); @@ -1351,7 +1351,7 @@ rtl_cache_wsupdate_wait (unsigned int seconds) timeval now; timespec wakeup; - gettimeofday(&now, 0); + gettimeofday(&now, nullptr); wakeup.tv_sec = now.tv_sec + (seconds); wakeup.tv_nsec = now.tv_usec * 1000; @@ -1371,7 +1371,7 @@ rtl_cache_wsupdate_fini() RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock)); if (g_cache_list.m_update_thread != pthread_t()) - pthread_join (g_cache_list.m_update_thread, NULL); + pthread_join (g_cache_list.m_update_thread, nullptr); } /* ================================================================= */ @@ -1447,7 +1447,7 @@ rtl_cache_depot_wsupdate ( for (; npurge > 0; npurge--) { rtl_cache_magazine_type * mag = rtl_cache_depot_dequeue (depot); - if (mag != 0) + if (mag != nullptr) { RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock)); rtl_cache_magazine_clear (cache, mag); @@ -1467,7 +1467,7 @@ rtl_cache_wsupdate ( rtl_cache_type * cache ) { - if (cache->m_magazine_cache != 0) + if (cache->m_magazine_cache != nullptr) { RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock)); @@ -1522,7 +1522,7 @@ rtl_cache_wsupdate_all (void * arg) } RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock)); - return 0; + return nullptr; } /* ================================================================= * @@ -1541,27 +1541,27 @@ rtl_cache_init() } { /* cache: internal arena */ - assert(gp_cache_arena == 0); + assert(gp_cache_arena == nullptr); gp_cache_arena = rtl_arena_create ( "rtl_cache_internal_arena", 64, /* quantum */ 0, /* no quantum caching */ - NULL, /* default source */ + nullptr, /* default source */ rtl_arena_alloc, rtl_arena_free, 0 /* flags */ ); - assert(gp_cache_arena != 0); + assert(gp_cache_arena != nullptr); /* check 'gp_default_arena' initialization */ - assert(gp_default_arena != 0); + assert(gp_default_arena != nullptr); } { /* cache: magazine cache */ static rtl_cache_type g_cache_magazine_cache; - assert(gp_cache_magazine_cache == 0); + assert(gp_cache_magazine_cache == nullptr); (void) rtl_cache_constructor (&g_cache_magazine_cache); gp_cache_magazine_cache = rtl_cache_activate ( @@ -1571,12 +1571,12 @@ rtl_cache_init() 0, /* objalign */ rtl_cache_magazine_constructor, rtl_cache_magazine_destructor, - 0, /* reclaim */ - 0, /* userarg: NYI */ + nullptr, /* reclaim */ + nullptr, /* userarg: NYI */ gp_default_arena, /* source */ RTL_CACHE_FLAG_NOMAGAZINE /* during bootstrap; activated below */ ); - assert(gp_cache_magazine_cache != 0); + assert(gp_cache_magazine_cache != nullptr); /* activate magazine layer */ g_cache_magazine_cache.m_magazine_cache = gp_cache_magazine_cache; @@ -1585,7 +1585,7 @@ rtl_cache_init() /* cache: slab (struct) cache */ static rtl_cache_type g_cache_slab_cache; - assert(gp_cache_slab_cache == 0); + assert(gp_cache_slab_cache == nullptr); (void) rtl_cache_constructor (&g_cache_slab_cache); gp_cache_slab_cache = rtl_cache_activate ( @@ -1595,18 +1595,18 @@ rtl_cache_init() 0, /* objalign */ rtl_cache_slab_constructor, rtl_cache_slab_destructor, - 0, /* reclaim */ - 0, /* userarg: none */ + nullptr, /* reclaim */ + nullptr, /* userarg: none */ gp_default_arena, /* source */ 0 /* flags: none */ ); - assert(gp_cache_slab_cache != 0); + assert(gp_cache_slab_cache != nullptr); } { /* cache: bufctl cache */ static rtl_cache_type g_cache_bufctl_cache; - assert(gp_cache_bufctl_cache == 0); + assert(gp_cache_bufctl_cache == nullptr); (void) rtl_cache_constructor (&g_cache_bufctl_cache); gp_cache_bufctl_cache = rtl_cache_activate ( @@ -1614,14 +1614,14 @@ rtl_cache_init() "rtl_cache_bufctl_cache", sizeof(rtl_cache_bufctl_type), /* objsize */ 0, /* objalign */ - 0, /* constructor */ - 0, /* destructor */ - 0, /* reclaim */ - 0, /* userarg */ + nullptr, /* constructor */ + nullptr, /* destructor */ + nullptr, /* reclaim */ + nullptr, /* userarg */ gp_default_arena, /* source */ 0 /* flags: none */ ); - assert(gp_cache_bufctl_cache != 0); + assert(gp_cache_bufctl_cache != nullptr); } rtl_cache_wsupdate_init(); @@ -1633,34 +1633,34 @@ rtl_cache_init() void rtl_cache_fini() { - if (gp_cache_arena != 0) + if (gp_cache_arena != nullptr) { rtl_cache_type * cache, * head; rtl_cache_wsupdate_fini(); - if (gp_cache_bufctl_cache != 0) + if (gp_cache_bufctl_cache != nullptr) { - cache = gp_cache_bufctl_cache, gp_cache_bufctl_cache = 0; + cache = gp_cache_bufctl_cache, gp_cache_bufctl_cache = nullptr; rtl_cache_deactivate (cache); rtl_cache_destructor (cache); } - if (gp_cache_slab_cache != 0) + if (gp_cache_slab_cache != nullptr) { - cache = gp_cache_slab_cache, gp_cache_slab_cache = 0; + cache = gp_cache_slab_cache, gp_cache_slab_cache = nullptr; rtl_cache_deactivate (cache); rtl_cache_destructor (cache); } - if (gp_cache_magazine_cache != 0) + if (gp_cache_magazine_cache != nullptr) { - cache = gp_cache_magazine_cache, gp_cache_magazine_cache = 0; + cache = gp_cache_magazine_cache, gp_cache_magazine_cache = nullptr; rtl_cache_deactivate (cache); rtl_cache_destructor (cache); } - if (gp_cache_arena != 0) + if (gp_cache_arena != nullptr) { rtl_arena_destroy (gp_cache_arena); - gp_cache_arena = 0; + gp_cache_arena = nullptr; } RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock)); diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index 60dbc9c85b78..ca6601bfd213 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -35,7 +35,7 @@ AllocMode alloc_mode = AMode_UNSET; static void determine_alloc_mode() { assert(alloc_mode == AMode_UNSET); - alloc_mode = (getenv("G_SLICE") == NULL ? AMode_CUSTOM : AMode_SYSTEM); + alloc_mode = (getenv("G_SLICE") == nullptr ? AMode_CUSTOM : AMode_SYSTEM); } /* ================================================================= * @@ -73,7 +73,7 @@ static const sal_Size g_alloc_sizes[] = static rtl_cache_type * g_alloc_caches[RTL_MEMORY_CACHED_SIZES] = { - 0, + nullptr, }; #define RTL_MEMALIGN 8 @@ -81,10 +81,10 @@ static rtl_cache_type * g_alloc_caches[RTL_MEMORY_CACHED_SIZES] = static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SHIFT] = { - 0, + nullptr, }; -static rtl_arena_type * gp_alloc_arena = 0; +static rtl_arena_type * gp_alloc_arena = nullptr; /* ================================================================= * * @@ -95,7 +95,7 @@ static rtl_arena_type * gp_alloc_arena = 0; void * SAL_CALL rtl_allocateMemory_CUSTOM (sal_Size n) SAL_THROW_EXTERN_C() { - void * p = 0; + void * p = nullptr; if (n > 0) { char * addr; @@ -105,7 +105,7 @@ SAL_CALL rtl_allocateMemory_CUSTOM (sal_Size n) SAL_THROW_EXTERN_C() if (n >= SAL_MAX_SIZE - (RTL_MEMALIGN + RTL_MEMALIGN - 1)) { /* requested size too large for roundup alignment */ - return 0; + return nullptr; } try_alloc: @@ -114,12 +114,12 @@ try_alloc: else addr = static_cast<char*>(rtl_arena_alloc (gp_alloc_arena, &size)); - if (addr != 0) + if (addr != nullptr) { reinterpret_cast<sal_Size*>(addr)[0] = size; p = addr + RTL_MEMALIGN; } - else if (gp_alloc_arena == 0) + else if (gp_alloc_arena == nullptr) { ensureMemorySingleton(); if (gp_alloc_arena) @@ -136,7 +136,7 @@ try_alloc: void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C() { - if (p != 0) + if (p != nullptr) { char * addr = static_cast<char*>(p) - RTL_MEMALIGN; sal_Size size = reinterpret_cast<sal_Size*>(addr)[0]; @@ -154,13 +154,13 @@ void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXT { if (n > 0) { - if (p != 0) + if (p != nullptr) { void * p_old = p; sal_Size n_old = reinterpret_cast<sal_Size*>( static_cast<char*>(p) - RTL_MEMALIGN )[0] - RTL_MEMALIGN; p = rtl_allocateMemory (n); - if (p != 0) + if (p != nullptr) { memcpy (p, p_old, (n < n_old) ? n : n_old); rtl_freeMemory (p_old); @@ -171,9 +171,9 @@ void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXT p = rtl_allocateMemory (n); } } - else if (p != 0) + else if (p != nullptr) { - rtl_freeMemory (p), p = 0; + rtl_freeMemory (p), p = nullptr; } return p; } @@ -191,18 +191,18 @@ void rtl_memory_init() #if !defined(FORCE_SYSALLOC) { /* global memory arena */ - assert(gp_alloc_arena == 0); + assert(gp_alloc_arena == nullptr); gp_alloc_arena = rtl_arena_create ( "rtl_alloc_arena", 2048, /* quantum */ 0, /* w/o quantum caching */ - 0, /* default source */ + nullptr, /* default source */ rtl_arena_alloc, rtl_arena_free, 0 /* flags */ ); - assert(gp_alloc_arena != 0); + assert(gp_alloc_arena != nullptr); } { sal_Size size; @@ -212,7 +212,7 @@ void rtl_memory_init() { char name[RTL_CACHE_NAME_LENGTH + 1]; (void) snprintf (name, sizeof(name), "rtl_alloc_%" SAL_PRIuUINTPTR, g_alloc_sizes[i]); - g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, NULL, NULL, NULL, NULL, NULL, 0); + g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0); } size = RTL_MEMALIGN; @@ -242,18 +242,18 @@ void rtl_memory_fini() /* cleanup g_alloc_caches */ for (i = 0, n = RTL_MEMORY_CACHED_SIZES; i < n; i++) { - if (g_alloc_caches[i] != 0) + if (g_alloc_caches[i] != nullptr) { rtl_cache_destroy (g_alloc_caches[i]); - g_alloc_caches[i] = 0; + g_alloc_caches[i] = nullptr; } } /* cleanup gp_alloc_arena */ - if (gp_alloc_arena != 0) + if (gp_alloc_arena != nullptr) { rtl_arena_destroy (gp_alloc_arena); - gp_alloc_arena = 0; + gp_alloc_arena = nullptr; } #endif // SAL_INFO("sal.rtl", "rtl_memory_fini completed"); @@ -363,7 +363,7 @@ void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C() void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) SAL_THROW_EXTERN_C() { void * p = rtl_allocateMemory (n); - if (p != 0) + if (p != nullptr) memset (p, 0, n); return p; } @@ -372,7 +372,7 @@ void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) SAL_THROW_EXTERN_C() void SAL_CALL rtl_freeZeroMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C() { - if (p != 0) + if (p != nullptr) { rtl_secureZeroMemory (p, n); rtl_freeMemory (p); diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx index 05ec242889a7..61c0e88100e5 100644 --- a/sal/rtl/alloc_impl.hxx +++ b/sal/rtl/alloc_impl.hxx @@ -163,7 +163,7 @@ lowbit(sal_Size n) typedef pthread_mutex_t rtl_memory_lock_type; -#define RTL_MEMORY_LOCK_INIT(lock) pthread_mutex_init((lock), NULL) +#define RTL_MEMORY_LOCK_INIT(lock) pthread_mutex_init((lock), nullptr) #define RTL_MEMORY_LOCK_DESTROY(lock) pthread_mutex_destroy((lock)) #define RTL_MEMORY_LOCK_ACQUIRE(lock) pthread_mutex_lock((lock)) diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index e41b89aae062..bd1e948f8c92 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -74,7 +74,7 @@ bool isPathnameUrl(rtl::OUString const & url) { } bool resolvePathnameUrl(rtl::OUString * url) { - OSL_ASSERT(url != NULL); + OSL_ASSERT(url != nullptr); if (!isPathnameUrl(*url) || (osl::FileBase::getFileURLFromSystemPath( url->copy(RTL_CONSTASCII_LENGTH(VND_SUN_STAR_PATHNAME)), *url) == @@ -106,7 +106,7 @@ rtl::OUString recursivelyExpandMacros( Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey, ExpandRequestLink const * requestStack) { - for (; requestStack != NULL; requestStack = requestStack->next) { + for (; requestStack != nullptr; requestStack = requestStack->next) { if (requestStack->file == requestFile && requestStack->key == requestKey) { @@ -139,7 +139,7 @@ bool find( NameValueList const & list, rtl::OUString const & key, rtl::OUString * value) { - OSL_ASSERT(value != NULL); + OSL_ASSERT(value != nullptr); for (NameValueList::const_iterator i(list.begin()); i != list.end(); ++i) { if (i->sName == key) { *value = i->sValue; @@ -157,8 +157,8 @@ namespace { static bool getFromCommandLineArgs( rtl::OUString const & key, rtl::OUString * value ) { - OSL_ASSERT(value != NULL); - static NameValueList *pNameValueList = 0; + OSL_ASSERT(value != nullptr); + static NameValueList *pNameValueList = nullptr; if( ! pNameValueList ) { static NameValueList nameValueList; @@ -166,7 +166,7 @@ static bool getFromCommandLineArgs( sal_Int32 nArgCount = osl_getCommandArgCount(); for(sal_Int32 i = 0; i < nArgCount; ++ i) { - rtl_uString *pArg = 0; + rtl_uString *pArg = nullptr; osl_getCommandArg( i, &pArg ); if( ('-' == pArg->buffer[0] || '/' == pArg->buffer[0] ) && 'e' == pArg->buffer[1] && @@ -229,7 +229,7 @@ static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL) static OUString & getIniFileName_Impl() { osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); - static OUString *pStaticName = 0; + static OUString *pStaticName = nullptr; if( ! pStaticName ) { OUString fileName; @@ -335,7 +335,7 @@ struct Bootstrap_Impl Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) : _nRefCount( 0 ), - _base_ini( 0 ), + _base_ini( nullptr ), _iniName (rIniName) { OUString base_ini( getIniFileName_Impl() ); @@ -400,7 +400,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) Bootstrap_Impl::~Bootstrap_Impl() { - if (_base_ini != 0) + if (_base_ini != nullptr) rtl_bootstrap_args_close( _base_ini ); } @@ -409,13 +409,13 @@ namespace { Bootstrap_Impl * get_static_bootstrap_handle() { osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); - static Bootstrap_Impl * s_handle = 0; - if (s_handle == 0) + static Bootstrap_Impl * s_handle = nullptr; + if (s_handle == nullptr) { OUString iniName (getIniFileName_Impl()); s_handle = static_cast< Bootstrap_Impl * >( rtl_bootstrap_args_open( iniName.pData ) ); - if (s_handle == 0) + if (s_handle == nullptr) { Bootstrap_Impl * that = new Bootstrap_Impl( iniName ); ++that->_nRefCount; @@ -434,9 +434,9 @@ struct FundamentalIniData: private boost::noncopyable { ((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())-> getValue( "URE_BOOTSTRAP", - &uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) && + &uri.pData, nullptr, LOOKUP_MODE_NORMAL, false, nullptr)) && resolvePathnameUrl(&uri)) - ? rtl_bootstrap_args_open(uri.pData) : NULL; + ? rtl_bootstrap_args_open(uri.pData) : nullptr; } ~FundamentalIniData() { rtl_bootstrap_args_close(ini); } @@ -520,7 +520,7 @@ bool Bootstrap_Impl::getValue( getExecutableDirectory_Impl(value); return true; } - if (_base_ini != NULL && + if (_base_ini != nullptr && _base_ini->getDirectValue(key, value, mode, requestStack)) { return true; @@ -531,13 +531,13 @@ bool Bootstrap_Impl::getValue( if (mode == LOOKUP_MODE_NORMAL) { FundamentalIniData const & d = FundamentalIni::get(); Bootstrap_Impl const * b = static_cast<Bootstrap_Impl const *>(d.ini); - if (b != NULL && b != this && + if (b != nullptr && b != this && b->getDirectValue(key, value, mode, requestStack)) { return true; } } - if (defaultValue != NULL) { + if (defaultValue != nullptr) { rtl_uString_assign(value, defaultValue); return true; } @@ -571,7 +571,7 @@ bool Bootstrap_Impl::getAmbienceValue( if (f || getFromCommandLineArgs(key, &v) || osl_getEnvironment(key.pData, &v.pData) == osl_Process_E_None) { - expandValue(value, v, mode, NULL, key, requestStack); + expandValue(value, v, mode, nullptr, key, requestStack); return true; } else { return false; @@ -605,16 +605,16 @@ struct bootstrap_map: private boost::noncopyable { // (e.g., osl::Mutex::getGlobalMutex()): static t * get() { - if (m_map == NULL) { + if (m_map == nullptr) { m_map = new t; } return m_map; } static void release() { - if (m_map != NULL && m_map->empty()) { + if (m_map != nullptr && m_map->empty()) { delete m_map; - m_map = NULL; + m_map = nullptr; } } @@ -622,7 +622,7 @@ private: static t * m_map; }; -bootstrap_map::t * bootstrap_map::m_map = NULL; +bootstrap_map::t * bootstrap_map::m_map = nullptr; } @@ -638,7 +638,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( if (DirectoryItem::E_None != DirectoryItem::get( iniName, dirItem ) || DirectoryItem::E_None != dirItem.getFileStatus( status )) { - return 0; + return nullptr; } iniName = status.getFileURL(); @@ -684,7 +684,7 @@ void SAL_CALL rtl_bootstrap_args_close ( rtlBootstrapHandle handle ) SAL_THROW_EXTERN_C() { - if (handle == 0) + if (handle == nullptr) return; Bootstrap_Impl * that = static_cast< Bootstrap_Impl * >( handle ); @@ -727,10 +727,10 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from_handle( bool found = false; if(ppValue && pName) { - if (handle == 0) + if (handle == nullptr) handle = get_static_bootstrap_handle(); found = static_cast< Bootstrap_Impl * >( handle )->getValue( - pName, ppValue, pDefault, LOOKUP_MODE_NORMAL, false, NULL ); + pName, ppValue, pDefault, LOOKUP_MODE_NORMAL, false, nullptr ); } return found; @@ -771,7 +771,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get ( rtl_uString * pDefault ) { - return rtl_bootstrap_get_from_handle(0, pName, ppValue, pDefault); + return rtl_bootstrap_get_from_handle(nullptr, pName, ppValue, pDefault); } void SAL_CALL rtl_bootstrap_set ( @@ -811,23 +811,23 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle( rtlBootstrapHandle handle, rtl_uString ** macro) { - if (handle == NULL) { + if (handle == nullptr) { handle = get_static_bootstrap_handle(); } OUString expanded( expandMacros( static_cast< Bootstrap_Impl * >( handle ), OUString::unacquired( macro ), - LOOKUP_MODE_NORMAL, NULL ) ); + LOOKUP_MODE_NORMAL, nullptr ) ); rtl_uString_assign( macro, expanded.pData ); } void SAL_CALL rtl_bootstrap_expandMacros(rtl_uString ** macro) { - rtl_bootstrap_expandMacros_from_handle(NULL, macro); + rtl_bootstrap_expandMacros_from_handle(nullptr, macro); } void rtl_bootstrap_encode( rtl_uString const * value, rtl_uString ** encoded ) { - OSL_ASSERT(value != NULL); + OSL_ASSERT(value != nullptr); rtl::OUStringBuffer b; for (sal_Int32 i = 0; i < value->length; ++i) { sal_Unicode c = value->buffer[i]; @@ -850,7 +850,7 @@ int hex(sal_Unicode c) { sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped) { OSL_ASSERT( - pos != NULL && *pos >= 0 && *pos < text.getLength() && escaped != NULL); + pos != nullptr && *pos >= 0 && *pos < text.getLength() && escaped != nullptr); sal_Unicode c = text[(*pos)++]; if (c == '\\') { int n1, n2, n3, n4; @@ -878,8 +878,8 @@ rtl::OUString lookup( rtl::OUString const & key, ExpandRequestLink const * requestStack) { rtl::OUString v; - (file == NULL ? get_static_bootstrap_handle() : file)->getValue( - key, &v.pData, NULL, mode, override, requestStack); + (file == nullptr ? get_static_bootstrap_handle() : file)->getValue( + key, &v.pData, nullptr, mode, override, requestStack); return v; } @@ -937,7 +937,7 @@ rtl::OUString expandMacros( Bootstrap_Impl * f = static_cast< Bootstrap_Impl * >( b.getHandle()); buf.append( - lookup(f, mode, f != NULL, seg[2], requestStack)); + lookup(f, mode, f != nullptr, seg[2], requestStack)); } else { if (n == 3 && seg[1].isEmpty()) { // For backward compatibility, treat ${file::key} the diff --git a/sal/rtl/byteseq.cxx b/sal/rtl/byteseq.cxx index 024719adaff0..891c492f2db2 100644 --- a/sal/rtl/byteseq.cxx +++ b/sal/rtl/byteseq.cxx @@ -52,7 +52,7 @@ void SAL_CALL rtl_byte_sequence_reference2One( { pNew = static_cast<sal_Sequence *>(rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nElements )); - if ( pNew != 0 ) + if ( pNew != nullptr ) memcpy( pNew->elements, pSequence->elements, nElements ); if (! osl_atomic_decrement( &pSequence->nRefCount )) @@ -63,7 +63,7 @@ void SAL_CALL rtl_byte_sequence_reference2One( pNew = static_cast<sal_Sequence *>(rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE )); } - if ( pNew != 0 ) + if ( pNew != nullptr ) { pNew->nRefCount = 1; pNew->nElements = nElements; @@ -90,7 +90,7 @@ void SAL_CALL rtl_byte_sequence_realloc( { pNew = static_cast<sal_Sequence *>(rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nSize )); - if ( pNew != 0 ) + if ( pNew != nullptr ) { if (nSize > nElements) { @@ -113,7 +113,7 @@ void SAL_CALL rtl_byte_sequence_realloc( pSequence, SAL_SEQUENCE_HEADER_SIZE + nSize )); } - if ( pSequence != 0 ) + if ( pSequence != nullptr ) { pSequence->nRefCount = 1; pSequence->nElements = nSize; @@ -132,7 +132,7 @@ void SAL_CALL rtl_byte_sequence_acquire( sal_Sequence *pSequence ) void SAL_CALL rtl_byte_sequence_release( sal_Sequence *pSequence ) SAL_THROW_EXTERN_C() { - if ( pSequence != 0 ) + if ( pSequence != nullptr ) { if (! osl_atomic_decrement( &(pSequence->nRefCount )) ) { @@ -148,14 +148,14 @@ void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32 if( *ppSequence ) { rtl_byte_sequence_release( *ppSequence ); - *ppSequence = 0; + *ppSequence = nullptr; } if( nLength ) { *ppSequence = static_cast<sal_Sequence *>(rtl_allocateZeroMemory( SAL_SEQUENCE_HEADER_SIZE + nLength )); - if ( *ppSequence != 0 ) + if ( *ppSequence != nullptr ) { (*ppSequence)->nRefCount = 1; (*ppSequence)->nElements = nLength; @@ -175,12 +175,12 @@ void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , if( *ppSequence ) { rtl_byte_sequence_release( *ppSequence ); - *ppSequence = 0; + *ppSequence = nullptr; } *ppSequence = static_cast<sal_Sequence *>(rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE + nLength )); - if ( *ppSequence != 0 ) + if ( *ppSequence != nullptr ) { (*ppSequence)->nRefCount = 1; (*ppSequence)->nElements = nLength; @@ -192,7 +192,7 @@ void SAL_CALL rtl_byte_sequence_constructFromArray( SAL_THROW_EXTERN_C() { rtl_byte_sequence_constructNoDefault( ppSequence , nLength ); - if ( *ppSequence != 0 && nLength != 0 ) + if ( *ppSequence != nullptr && nLength != 0 ) memcpy( (*ppSequence)->elements, pData, nLength ); } diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index c5bd0f24d834..0bcaa49f5038 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -139,9 +139,9 @@ rtlCipherError SAL_CALL rtl_cipher_init ( const sal_uInt8 *pArgData, sal_Size nArgLen) SAL_THROW_EXTERN_C() { Cipher_Impl *pImpl = static_cast<Cipher_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; - if (pImpl->m_init == NULL) + if (pImpl->m_init == nullptr) return rtl_Cipher_E_Unknown; return (pImpl->m_init)( @@ -157,9 +157,9 @@ rtlCipherError SAL_CALL rtl_cipher_encode ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { Cipher_Impl *pImpl = static_cast<Cipher_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; - if (pImpl->m_encode == NULL) + if (pImpl->m_encode == nullptr) return rtl_Cipher_E_Unknown; return (pImpl->m_encode)(Cipher, pData, nDatLen, pBuffer, nBufLen); @@ -174,9 +174,9 @@ rtlCipherError SAL_CALL rtl_cipher_decode ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { Cipher_Impl *pImpl = static_cast<Cipher_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; - if (pImpl->m_decode == NULL) + if (pImpl->m_decode == nullptr) return rtl_Cipher_E_Unknown; return (pImpl->m_decode)(Cipher, pData, nDatLen, pBuffer, nBufLen); @@ -726,7 +726,7 @@ static rtlCipherError __rtl_cipherBF_update ( sal_uInt8 *pBuffer, sal_Size nBufLen) { /* Check arguments. */ - if ((pData == NULL) || (pBuffer == NULL)) + if ((pData == nullptr) || (pBuffer == nullptr)) return rtl_Cipher_E_Argument; if (!((0 < nDatLen) && (nDatLen <= nBufLen))) @@ -897,7 +897,7 @@ static void __rtl_cipherBF_updateCFB ( } ctx->m_offset = ((k + 1) & 0x07); - iv = NULL; + iv = nullptr; } /* @@ -1036,7 +1036,7 @@ rtlCipherError SAL_CALL rtl_cipher_initBF ( { CipherBF_Impl *pImpl = static_cast<CipherBF_Impl*>(Cipher); - if ((pImpl == NULL) || (pKeyData == NULL)) + if ((pImpl == nullptr) || (pKeyData == nullptr)) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmBF)) @@ -1061,7 +1061,7 @@ rtlCipherError SAL_CALL rtl_cipher_encodeBF ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { CipherBF_Impl *pImpl = static_cast<CipherBF_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmBF)) @@ -1087,7 +1087,7 @@ rtlCipherError SAL_CALL rtl_cipher_decodeBF ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { CipherBF_Impl *pImpl = static_cast<CipherBF_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmBF)) @@ -1198,7 +1198,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl ( sal_Size k; /* Check arguments. */ - if ((pData == NULL) || (pBuffer == NULL)) + if ((pData == nullptr) || (pBuffer == nullptr)) return rtl_Cipher_E_Argument; if (!((0 < nDatLen) && (nDatLen <= nBufLen))) @@ -1273,7 +1273,7 @@ rtlCipherError SAL_CALL rtl_cipher_initARCFOUR ( { CipherARCFOUR_Impl *pImpl = static_cast<CipherARCFOUR_Impl*>(Cipher); - if ((pImpl == NULL) || (pKeyData == NULL)) + if ((pImpl == nullptr) || (pKeyData == nullptr)) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmARCFOUR)) @@ -1296,7 +1296,7 @@ rtlCipherError SAL_CALL rtl_cipher_encodeARCFOUR ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { CipherARCFOUR_Impl *pImpl = static_cast<CipherARCFOUR_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmARCFOUR)) @@ -1319,7 +1319,7 @@ rtlCipherError SAL_CALL rtl_cipher_decodeARCFOUR ( sal_uInt8 *pBuffer, sal_Size nBufLen) SAL_THROW_EXTERN_C() { CipherARCFOUR_Impl *pImpl = static_cast<CipherARCFOUR_Impl*>(Cipher); - if (pImpl == NULL) + if (pImpl == nullptr) return rtl_Cipher_E_Argument; if (!(pImpl->m_cipher.m_algorithm == rtl_Cipher_AlgorithmARCFOUR)) diff --git a/sal/rtl/cmdargs.cxx b/sal/rtl/cmdargs.cxx index 0baae609efdf..ee4bead37c10 100644 --- a/sal/rtl/cmdargs.cxx +++ b/sal/rtl/cmdargs.cxx @@ -23,7 +23,7 @@ namespace { -rtl_uString ** g_ppCommandArgs = 0; +rtl_uString ** g_ppCommandArgs = nullptr; sal_uInt32 g_nCommandArgCount = 0; struct ArgHolder @@ -37,7 +37,7 @@ ArgHolder::~ArgHolder() rtl_uString_release (g_ppCommandArgs[--g_nCommandArgCount]); rtl_freeMemory (g_ppCommandArgs); - g_ppCommandArgs = 0; + g_ppCommandArgs = nullptr; } // The destructor of this static ArgHolder is "activated" by the assignments to @@ -55,7 +55,7 @@ void init() static_cast<rtl_uString**>(rtl_allocateZeroMemory (n * sizeof(rtl_uString*))); for (i = 0; i < n; i++) { - rtl_uString * pArg = 0; + rtl_uString * pArg = nullptr; osl_getCommandArg (i, &pArg); if (('-' == pArg->buffer[0] || '/' == pArg->buffer[0]) && 'e' == pArg->buffer[1] && diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index b997dcfc9357..da6df0ef2e32 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -278,7 +278,7 @@ static const Digest_Impl __rtl_digest_MD2 = rtl_Digest_AlgorithmMD2, RTL_DIGEST_LENGTH_MD2, - NULL, + nullptr, rtl_digest_destroyMD2, rtl_digest_updateMD2, rtl_digest_getMD2 @@ -412,7 +412,7 @@ rtlDigestError SAL_CALL rtl_digest_updateMD2 ( DigestContextMD2 *ctx; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmMD2)) @@ -471,7 +471,7 @@ rtlDigestError SAL_CALL rtl_digest_getMD2 ( DigestContextMD2 *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmMD2)) @@ -564,7 +564,7 @@ static const Digest_Impl __rtl_digest_MD5 = rtl_Digest_AlgorithmMD5, RTL_DIGEST_LENGTH_MD5, - NULL, + nullptr, rtl_digest_destroyMD5, rtl_digest_updateMD5, rtl_digest_getMD5 @@ -784,7 +784,7 @@ rtlDigestError SAL_CALL rtl_digest_updateMD5 ( DigestContextMD5 *ctx; sal_uInt32 len; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmMD5)) @@ -856,7 +856,7 @@ rtlDigestError SAL_CALL rtl_digest_getMD5 ( DigestContextMD5 *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmMD5)) @@ -889,7 +889,7 @@ rtlDigestError SAL_CALL rtl_digest_rawMD5 ( DigestContextMD5 *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmMD5)) @@ -1200,7 +1200,7 @@ static const Digest_Impl __rtl_digest_SHA_0 = rtl_Digest_AlgorithmSHA, RTL_DIGEST_LENGTH_SHA, - NULL, + nullptr, rtl_digest_destroySHA, rtl_digest_updateSHA, rtl_digest_getSHA @@ -1268,7 +1268,7 @@ rtlDigestError SAL_CALL rtl_digest_updateSHA ( DigestContextSHA *ctx; sal_uInt32 len; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmSHA)) @@ -1340,7 +1340,7 @@ rtlDigestError SAL_CALL rtl_digest_getSHA ( DigestContextSHA *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmSHA)) @@ -1390,7 +1390,7 @@ static const Digest_Impl __rtl_digest_SHA_1 = rtl_Digest_AlgorithmSHA1, RTL_DIGEST_LENGTH_SHA1, - NULL, + nullptr, rtl_digest_destroySHA1, rtl_digest_updateSHA1, rtl_digest_getSHA1 @@ -1458,7 +1458,7 @@ rtlDigestError SAL_CALL rtl_digest_updateSHA1 ( DigestContextSHA *ctx; sal_uInt32 len; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmSHA1)) @@ -1530,7 +1530,7 @@ rtlDigestError SAL_CALL rtl_digest_getSHA1 ( DigestContextSHA *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmSHA1)) @@ -1698,7 +1698,7 @@ rtlDigestError SAL_CALL rtl_digest_initHMAC_MD5 ( DigestHMAC_MD5_Impl *pImpl = static_cast<DigestHMAC_MD5_Impl*>(Digest); ContextHMAC_MD5 *ctx; - if ((pImpl == NULL) || (pKeyData == NULL)) + if ((pImpl == nullptr) || (pKeyData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_MD5)) @@ -1737,7 +1737,7 @@ rtlDigestError SAL_CALL rtl_digest_updateHMAC_MD5 ( DigestHMAC_MD5_Impl *pImpl = static_cast<DigestHMAC_MD5_Impl*>(Digest); ContextHMAC_MD5 *ctx; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_MD5)) @@ -1759,7 +1759,7 @@ rtlDigestError SAL_CALL rtl_digest_getHMAC_MD5 ( DigestHMAC_MD5_Impl *pImpl = static_cast<DigestHMAC_MD5_Impl*>(Digest); ContextHMAC_MD5 *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_MD5)) @@ -1930,7 +1930,7 @@ rtlDigestError SAL_CALL rtl_digest_initHMAC_SHA1 ( DigestHMAC_SHA1_Impl *pImpl = static_cast<DigestHMAC_SHA1_Impl*>(Digest); ContextHMAC_SHA1 *ctx; - if ((pImpl == NULL) || (pKeyData == NULL)) + if ((pImpl == nullptr) || (pKeyData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_SHA1)) @@ -1969,7 +1969,7 @@ rtlDigestError SAL_CALL rtl_digest_updateHMAC_SHA1 ( DigestHMAC_SHA1_Impl *pImpl = static_cast<DigestHMAC_SHA1_Impl*>(Digest); ContextHMAC_SHA1 *ctx; - if ((pImpl == NULL) || (pData == NULL)) + if ((pImpl == nullptr) || (pData == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_SHA1)) @@ -1991,7 +1991,7 @@ rtlDigestError SAL_CALL rtl_digest_getHMAC_SHA1 ( DigestHMAC_SHA1_Impl *pImpl = static_cast<DigestHMAC_SHA1_Impl*>(Digest); ContextHMAC_SHA1 *ctx; - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Digest_E_Argument; if (!(pImpl->m_digest.m_algorithm == rtl_Digest_AlgorithmHMAC_SHA1)) @@ -2091,7 +2091,7 @@ rtlDigestError SAL_CALL rtl_digest_PBKDF2 ( DigestHMAC_SHA1_Impl digest; sal_uInt32 i = 1; - if ((pKeyData == NULL) || (pPassData == NULL) || (pSaltData == NULL)) + if ((pKeyData == nullptr) || (pPassData == nullptr) || (pSaltData == nullptr)) return rtl_Digest_E_Argument; digest.m_digest = __rtl_digest_HMAC_SHA1; diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx index 03ae02dcc4ee..9df367f25f7d 100644 --- a/sal/rtl/hash.cxx +++ b/sal/rtl/hash.cxx @@ -37,8 +37,8 @@ static void rtl_str_hash_free (StringHashTable *pHash); StringHashTable * getHashTable () { - static StringHashTable *pInternPool = NULL; - if (pInternPool == NULL) { + static StringHashTable *pInternPool = nullptr; + if (pInternPool == nullptr) { static StringHashTable* pHash = rtl_str_hash_new(1024); pInternPool = pHash; } @@ -103,7 +103,7 @@ rtl_str_hash_insert_nonequal (StringHashTable *pHash, sal_uInt32 n; n = nHash % pHash->nSize; - while (pHash->pData[n] != NULL) { + while (pHash->pData[n] != nullptr) { n++; if (n >= pHash->nSize) n = 0; @@ -124,13 +124,13 @@ rtl_str_hash_resize (sal_uInt32 nNewSize) for (i = 0; i < pHash->nSize; i++) { - if (pHash->pData[i] != NULL) + if (pHash->pData[i] != nullptr) rtl_str_hash_insert_nonequal (pNewHash, pHash->pData[i]); } pNewHash->nEntries = pHash->nEntries; free (pHash->pData); *pHash = *pNewHash; - pNewHash->pData = NULL; + pNewHash->pData = nullptr; rtl_str_hash_free (pNewHash); } @@ -160,7 +160,7 @@ rtl_str_hash_intern (rtl_uString *pString, rtl_str_hash_resize (getNextSize(pHash->nSize)); n = nHash % pHash->nSize; - while ((pHashStr = pHash->pData[n]) != NULL) { + while ((pHashStr = pHash->pData[n]) != nullptr) { if (compareEqual (pHashStr, pString)) { rtl_uString_acquire (pHashStr); @@ -173,11 +173,11 @@ rtl_str_hash_intern (rtl_uString *pString, if (!can_return) { - rtl_uString *pCopy = NULL; + rtl_uString *pCopy = nullptr; rtl_uString_newFromString( &pCopy, pString ); pString = pCopy; if (!pString) - return NULL; + return nullptr; } if (!SAL_STRING_IS_STATIC (pString)) @@ -198,25 +198,25 @@ rtl_str_hash_remove (rtl_uString *pString) StringHashTable *pHash = getHashTable(); n = nHash % pHash->nSize; - while ((pHashStr = pHash->pData[n]) != NULL) { + while ((pHashStr = pHash->pData[n]) != nullptr) { if (compareEqual (pHashStr, pString)) break; n++; if (n >= pHash->nSize) n = 0; } - OSL_ASSERT (pHash->pData[n] != 0); - if (pHash->pData[n] == NULL) + OSL_ASSERT (pHash->pData[n] != nullptr); + if (pHash->pData[n] == nullptr) return; - pHash->pData[n++] = NULL; + pHash->pData[n++] = nullptr; pHash->nEntries--; if (n >= pHash->nSize) n = 0; - while ((pHashStr = pHash->pData[n]) != NULL) { - pHash->pData[n] = NULL; + while ((pHashStr = pHash->pData[n]) != nullptr) { + pHash->pData[n] = nullptr; // FIXME: rather unsophisticated and N^2 in chain-length, but robust. rtl_str_hash_insert_nonequal (pHash, pHashStr); n++; diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx index 8cdff09738fa..8274dde80099 100644 --- a/sal/rtl/locale.cxx +++ b/sal/rtl/locale.cxx @@ -43,9 +43,9 @@ struct RTL_HASHTABLE RTL_HASHENTRY** Table; }; -static RTL_HASHTABLE* g_pLocaleTable = NULL; +static RTL_HASHTABLE* g_pLocaleTable = nullptr; -static rtl_Locale* g_pDefaultLocale = NULL; +static rtl_Locale* g_pDefaultLocale = nullptr; /************************************************************************* */ @@ -97,7 +97,7 @@ extern "C" void rtl_hashtable_init(RTL_HASHTABLE** table, sal_Int8 sizeIndex) while (nSize) { - (*table)->Table[nSize - 1] = NULL; + (*table)->Table[nSize - 1] = nullptr; nSize--; } } @@ -114,7 +114,7 @@ extern "C" rtl_Locale* rtl_hashtable_add(RTL_HASHTABLE** table, rtl_Locale* valu sal_Int32 key = 0; if (!(*table)) - return NULL; + return nullptr; if ((*table)->Elements > ((*table)->Size / 2)) rtl_hashtable_grow(table); @@ -131,15 +131,15 @@ extern "C" rtl_Locale* rtl_hashtable_add(RTL_HASHTABLE** table, rtl_Locale* valu RTL_HASHENTRY *newEntry = static_cast<RTL_HASHENTRY*>(rtl_allocateMemory( sizeof(RTL_HASHENTRY) )); newEntry->Entry = value; - newEntry->Next = NULL; + newEntry->Next = nullptr; *pEntry = newEntry; (*table)->Elements++; - return NULL; + return nullptr; } sal_Bool rtl_hashtable_grow(RTL_HASHTABLE** table) { - RTL_HASHTABLE* pNewTable = NULL; + RTL_HASHTABLE* pNewTable = nullptr; sal_Int32 i = 0; rtl_hashtable_init(&pNewTable, (sal_Int8)((*table)->iSize + 1)); @@ -200,7 +200,7 @@ extern "C" sal_Bool rtl_hashtable_find(RTL_HASHTABLE * table, sal_Int32 key, sal */ void rtl_locale_init() { - OSL_ASSERT(g_pLocaleTable == 0); + OSL_ASSERT(g_pLocaleTable == nullptr); rtl_hashtable_init(&g_pLocaleTable, 1); } @@ -209,10 +209,10 @@ void rtl_locale_init() */ void rtl_locale_fini() { - if (g_pLocaleTable != 0) + if (g_pLocaleTable != nullptr) { rtl_hashtable_destroy (g_pLocaleTable); - g_pLocaleTable = 0; + g_pLocaleTable = nullptr; } } @@ -222,10 +222,10 @@ void rtl_locale_fini() rtl_Locale * SAL_CALL rtl_locale_register( const sal_Unicode * language, const sal_Unicode * country, const sal_Unicode * variant ) { sal_Unicode c = 0; - rtl_uString* sLanguage = NULL; - rtl_uString* sCountry = NULL; - rtl_uString* sVariant = NULL; - rtl_Locale *newLocale = NULL; + rtl_uString* sLanguage = nullptr; + rtl_uString* sCountry = nullptr; + rtl_uString* sVariant = nullptr; + rtl_Locale *newLocale = nullptr; sal_Int32 hashCode = -1; sal_Int32 key = 0; @@ -236,7 +236,7 @@ rtl_Locale * SAL_CALL rtl_locale_register( const sal_Unicode * language, const s ensureLocaleSingleton(); if (!g_pLocaleTable) - return NULL; + return nullptr; hashCode = rtl_ustr_hashCode(language) ^ rtl_ustr_hashCode(country) ^ rtl_ustr_hashCode(variant); key = rtl_hashfunc(g_pLocaleTable, hashCode); diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 3713247db95d..fd33130706e1 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -175,7 +175,7 @@ inline void doubleToString(StringT ** pResult, { // #i112652# XMLSchema-2 sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH("NaN"); - if (pResultCapacity == 0) + if (pResultCapacity == nullptr) { pResultCapacity = &nCapacity; T::createBuffer(pResult, pResultCapacity); @@ -192,7 +192,7 @@ inline void doubleToString(StringT ** pResult, { // #i112652# XMLSchema-2 sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH("-INF"); - if (pResultCapacity == 0) + if (pResultCapacity == nullptr) { pResultCapacity = &nCapacity; T::createBuffer(pResult, pResultCapacity); @@ -501,7 +501,7 @@ inline void doubleToString(StringT ** pResult, nExp % 10 + static_cast< typename T::Char >('0') ); } - if (pResultCapacity == 0) + if (pResultCapacity == nullptr) T::createString(pResult, pBuf, p - pBuf); else T::appendChars(pResult, pResultCapacity, &nResultOffset, pBuf, @@ -785,7 +785,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd, if ( bSign ) fVal = -fVal; - if (pStatus != 0) + if (pStatus != nullptr) *pStatus = eStatus; if (pParsedEnd != 0) *pParsedEnd = p == p0 ? pBegin : p; diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx index 6a8142ebf11d..d96f74d6be0f 100644 --- a/sal/rtl/random.cxx +++ b/sal/rtl/random.cxx @@ -312,7 +312,7 @@ rtlRandomError SAL_CALL rtl_random_addBytes ( RandomPool_Impl *pImpl = static_cast<RandomPool_Impl *>(Pool); const sal_uInt8 *pBuffer = static_cast<const sal_uInt8 *>(Buffer); - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Random_E_Argument; if(pImpl->m_hDigest) { @@ -330,7 +330,7 @@ rtlRandomError SAL_CALL rtl_random_getBytes ( RandomPool_Impl *pImpl = static_cast<RandomPool_Impl *>(Pool); sal_uInt8 *pBuffer = static_cast<sal_uInt8 *>(Buffer); - if ((pImpl == NULL) || (pBuffer == NULL)) + if ((pImpl == nullptr) || (pBuffer == nullptr)) return rtl_Random_E_Argument; if(pImpl->m_hDigest || !osl_get_system_random_data(static_cast<char*>(Buffer), Bytes)) diff --git a/sal/rtl/rtl_process.cxx b/sal/rtl/rtl_process.cxx index 4a052630dd17..5eb411ba72d5 100644 --- a/sal/rtl/rtl_process.cxx +++ b/sal/rtl/rtl_process.cxx @@ -31,7 +31,7 @@ namespace { class Id: private boost::noncopyable { public: - Id() { rtl_createUuid(uuid_, 0, false); } + Id() { rtl_createUuid(uuid_, nullptr, false); } void copy(sal_uInt8 * target) const { std::memcpy(target, uuid_, UUID_SIZE); } diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx index b88b0d9585c1..374f329f5a55 100644 --- a/sal/rtl/strbuf.cxx +++ b/sal/rtl/strbuf.cxx @@ -78,7 +78,7 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity if (minimumCapacity > *capacity) { rtl_String * pTmp = *This; - rtl_String * pNew = NULL; + rtl_String * pNew = nullptr; *capacity = ((*This)->length + 1) * 2; if (minimumCapacity > *capacity) /* still lower, set to the minimum capacity */ diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 3647908c3ada..98954fab90fa 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -89,11 +89,11 @@ sal_Int32 SAL_CALL rtl_str_valueOfFloat(sal_Char * pStr, float f) SAL_THROW_EXTERN_C() { assert(pStr); - rtl_String * pResult = NULL; + rtl_String * pResult = nullptr; sal_Int32 nLen; rtl_math_doubleToString( - &pResult, 0, 0, f, rtl_math_StringFormat_G, - RTL_STR_MAX_VALUEOFFLOAT - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', 0, 0, + &pResult, nullptr, 0, f, rtl_math_StringFormat_G, + RTL_STR_MAX_VALUEOFFLOAT - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', nullptr, 0, sal_True); nLen = pResult->length; OSL_ASSERT(nLen < RTL_STR_MAX_VALUEOFFLOAT); @@ -106,11 +106,11 @@ sal_Int32 SAL_CALL rtl_str_valueOfDouble(sal_Char * pStr, double d) SAL_THROW_EXTERN_C() { assert(pStr); - rtl_String * pResult = NULL; + rtl_String * pResult = nullptr; sal_Int32 nLen; rtl_math_doubleToString( - &pResult, 0, 0, d, rtl_math_StringFormat_G, - RTL_STR_MAX_VALUEOFDOUBLE - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', 0, + &pResult, nullptr, 0, d, rtl_math_StringFormat_G, + RTL_STR_MAX_VALUEOFDOUBLE - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', nullptr, 0, sal_True); nLen = pResult->length; OSL_ASSERT(nLen < RTL_STR_MAX_VALUEOFDOUBLE); @@ -123,14 +123,14 @@ float SAL_CALL rtl_str_toFloat(sal_Char const * pStr) SAL_THROW_EXTERN_C() { assert(pStr); return (float) rtl_math_stringToDouble(pStr, pStr + rtl_str_getLength(pStr), - '.', 0, 0, 0); + '.', 0, nullptr, nullptr); } double SAL_CALL rtl_str_toDouble(sal_Char const * pStr) SAL_THROW_EXTERN_C() { assert(pStr); return rtl_math_stringToDouble(pStr, pStr + rtl_str_getLength(pStr), '.', 0, - 0, 0); + nullptr, nullptr); } /* ======================================================================= */ @@ -227,7 +227,7 @@ bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget, if ( *pTarget ) rtl_string_release( *pTarget ); *pTarget = rtl_string_ImplAlloc( nLength ); - OSL_ASSERT(*pTarget != NULL); + OSL_ASSERT(*pTarget != nullptr); pBuffer = (*pTarget)->buffer; do { @@ -266,8 +266,8 @@ bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget, for (;;) { pTemp = rtl_string_ImplAlloc( nNewLen ); - OSL_ASSERT(pTemp != NULL); - nDestBytes = rtl_convertUnicodeToText( hConverter, 0, + OSL_ASSERT(pTemp != nullptr); + nDestBytes = rtl_convertUnicodeToText( hConverter, nullptr, pSource, nLength, pTemp->buffer, nNewLen, nFlags, @@ -296,7 +296,7 @@ bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget, if ( nNewLen > nDestBytes+8 ) { rtl_String* pTemp2 = rtl_string_ImplAlloc( nDestBytes ); - OSL_ASSERT(pTemp2 != NULL); + OSL_ASSERT(pTemp2 != nullptr); rtl_str_ImplCopy( pTemp2->buffer, pTemp->buffer, nDestBytes ); rtl_freeMemory( pTemp ); pTemp = pTemp2; @@ -347,8 +347,8 @@ void rtl_string_newReplaceFirst( sal_Int32 fromLength, char const * to, sal_Int32 toLength, sal_Int32 * index) SAL_THROW_EXTERN_C() { - assert(str != 0); - assert(index != 0); + assert(str != nullptr); + assert(index != nullptr); assert(*index >= 0 && *index <= str->length); assert(fromLength >= 0); assert(toLength >= 0); diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx index 58e07585d41b..41ab63fd69bd 100644 --- a/sal/rtl/strtmpl.cxx +++ b/sal/rtl/strtmpl.cxx @@ -1150,8 +1150,8 @@ static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) / sizeof (IMPL_RTL_STRCODE))) ? static_cast<IMPL_RTL_STRINGDATA *>(rtl_allocateMemory( sizeof (IMPL_RTL_STRINGDATA) + nLen * sizeof (IMPL_RTL_STRCODE))) - : NULL; - if (pData != NULL) { + : nullptr; + if (pData != nullptr) { pData->refCount = 1; pData->length = nLen; pData->buffer[nLen] = 0; @@ -1169,7 +1169,7 @@ static IMPL_RTL_STRCODE* IMPL_RTL_STRINGNAME( ImplNewCopy )( IMPL_RTL_STRINGDATA IMPL_RTL_STRCODE* pDest; const IMPL_RTL_STRCODE* pSrc; IMPL_RTL_STRINGDATA* pData = IMPL_RTL_STRINGNAME( ImplAlloc )( pStr->length ); - OSL_ASSERT(pData != NULL); + OSL_ASSERT(pData != nullptr); pDest = pData->buffer; pSrc = pStr->buffer; @@ -1251,7 +1251,7 @@ IMPL_RTL_STRINGDATA* SAL_CALL IMPL_RTL_STRINGNAME( alloc )( sal_Int32 nLen ) SAL_THROW_EXTERN_C() { if ( nLen < 0 ) - return NULL; + return nullptr; else return IMPL_RTL_STRINGNAME( ImplAlloc )( nLen ); } @@ -1270,7 +1270,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( new_WithLength )( IMPL_RTL_STRINGDATA** ppThi IMPL_RTL_STRINGNAME( release )( *ppThis ); *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nLen ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); (*ppThis)->length = 0; IMPL_RTL_STRCODE* pTempStr = (*ppThis)->buffer; @@ -1296,7 +1296,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromString )( IMPL_RTL_STRINGDATA** ppThis pOrg = *ppThis; *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( pStr->length ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); rtl_str_ImplCopy( (*ppThis)->buffer, pStr->buffer, pStr->length ); RTL_LOG_STRING_NEW( *ppThis ); @@ -1334,7 +1334,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr )( IMPL_RTL_STRINGDATA** ppThis, pOrg = *ppThis; *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nLen ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); pBuffer = (*ppThis)->buffer; do { @@ -1369,7 +1369,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr_WithLength )( IMPL_RTL_STRINGDATA* pOrg = *ppThis; *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nLen ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); rtl_str_ImplCopy( (*ppThis)->buffer, pCharStr, nLen ); RTL_LOG_STRING_NEW( *ppThis ); @@ -1425,7 +1425,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral )( IMPL_RTL_STRINGDATA** ppThi IMPL_RTL_STRINGNAME( release )( *ppThis ); *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nLen + allocExtra ); - assert( *ppThis != NULL ); + assert( *ppThis != nullptr ); (*ppThis)->length = nLen; // fix after possible allocExtra != 0 (*ppThis)->buffer[nLen] = 0; @@ -1505,7 +1505,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newConcat )( IMPL_RTL_STRINGDATA** ppThis, else { IMPL_RTL_STRINGDATA* pTempStr = IMPL_RTL_STRINGNAME( ImplAlloc )( pLeft->length + pRight->length ); - OSL_ASSERT(pTempStr != NULL); + OSL_ASSERT(pTempStr != nullptr); rtl_str_ImplCopy( pTempStr->buffer, pLeft->buffer, pLeft->length ); rtl_str_ImplCopy( pTempStr->buffer+pLeft->length, pRight->buffer, pRight->length ); *ppThis = pTempStr; @@ -1600,7 +1600,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplaceStrAt )( IMPL_RTL_STRINGDATA** ppTh /* Alloc New Buffer */ *ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nNewLen ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); pBuffer = (*ppThis)->buffer; if ( nIndex ) { diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index ea895e5a8906..b028b3cf6664 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -156,7 +156,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, sal_uInt32 nInfo; sal_Size nConverted; sal_Size nDstSize = rtl_convertTextToUnicode( - aConverter, 0, aBuf.getStr(), aBuf.getLength(), aDst, + aConverter, nullptr, aBuf.getStr(), aBuf.getLength(), aDst, SAL_N_ELEMENTS( aDst ), (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR @@ -289,7 +289,7 @@ bool writeEscapeChar(rtl_uString ** pBuffer, sal_Int32 * pCapacity, sal_uInt32 nInfo; sal_Size nConverted; sal_Size nDstSize = rtl_convertUnicodeToText( - aConverter, 0, aSrc, nSrcSize, aDst, sizeof aDst, + aConverter, nullptr, aSrc, nSrcSize, aDst, sizeof aDst, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR | RTL_UNICODETOTEXT_FLAGS_FLUSH, @@ -318,9 +318,9 @@ struct Component sal_Unicode const * pBegin; sal_Unicode const * pEnd; - inline Component(): pBegin(0), pEnd(0) {} + inline Component(): pBegin(nullptr), pEnd(nullptr) {} - inline bool isPresent() const { return pBegin != 0; } + inline bool isPresent() const { return pBegin != nullptr; } inline sal_Int32 getLength() const; }; diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx index 7f5d698c76ec..89b897f21573 100644 --- a/sal/rtl/ustrbuf.cxx +++ b/sal/rtl/ustrbuf.cxx @@ -62,7 +62,7 @@ rtl_uString * SAL_CALL rtl_uStringBuffer_makeStringAndClear( rtl_uString ** ppTh assert(nCapacity); // avoid an un-necessary atomic ref/unref pair rtl_uString *pStr = *ppThis; - *ppThis = NULL; + *ppThis = nullptr; rtl_uString_new (ppThis); *nCapacity = 0; @@ -103,7 +103,7 @@ void SAL_CALL rtl_uStringbuffer_ensureCapacity if (minimumCapacity > *capacity) { rtl_uString * pTmp = *This; - rtl_uString * pNew = NULL; + rtl_uString * pNew = nullptr; *capacity = ((*This)->length + 1) * 2; if (minimumCapacity > *capacity) /* still lower, set to the minimum capacity */ diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index 9648fc63bfa7..16e9b87b6288 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -149,11 +149,11 @@ sal_Int32 SAL_CALL rtl_ustr_valueOfFloat(sal_Unicode * pStr, float f) SAL_THROW_EXTERN_C() { assert(pStr); - rtl_uString * pResult = NULL; + rtl_uString * pResult = nullptr; sal_Int32 nLen; rtl_math_doubleToUString( - &pResult, 0, 0, f, rtl_math_StringFormat_G, - RTL_USTR_MAX_VALUEOFFLOAT - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', 0, + &pResult, nullptr, 0, f, rtl_math_StringFormat_G, + RTL_USTR_MAX_VALUEOFFLOAT - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', nullptr, 0, sal_True); nLen = pResult->length; OSL_ASSERT(nLen < RTL_USTR_MAX_VALUEOFFLOAT); @@ -166,11 +166,11 @@ sal_Int32 SAL_CALL rtl_ustr_valueOfDouble(sal_Unicode * pStr, double d) SAL_THROW_EXTERN_C() { assert(pStr); - rtl_uString * pResult = NULL; + rtl_uString * pResult = nullptr; sal_Int32 nLen; rtl_math_doubleToUString( - &pResult, 0, 0, d, rtl_math_StringFormat_G, - RTL_USTR_MAX_VALUEOFDOUBLE - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', 0, + &pResult, nullptr, 0, d, rtl_math_StringFormat_G, + RTL_USTR_MAX_VALUEOFDOUBLE - RTL_CONSTASCII_LENGTH("-x.E-xxx"), '.', nullptr, 0, sal_True); nLen = pResult->length; OSL_ASSERT(nLen < RTL_USTR_MAX_VALUEOFDOUBLE); @@ -199,14 +199,14 @@ float SAL_CALL rtl_ustr_toFloat(sal_Unicode const * pStr) SAL_THROW_EXTERN_C() assert(pStr); return doubleToFloat(rtl_math_uStringToDouble(pStr, pStr + rtl_ustr_getLength(pStr), - '.', 0, 0, 0)); + '.', 0, nullptr, nullptr)); } double SAL_CALL rtl_ustr_toDouble(sal_Unicode const * pStr) SAL_THROW_EXTERN_C() { assert(pStr); return rtl_math_uStringToDouble(pStr, pStr + rtl_ustr_getLength(pStr), '.', - 0, 0, 0); + 0, nullptr, nullptr); } /* ======================================================================= */ @@ -543,7 +543,7 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** ppThis, rtl_uString_release( *ppThis ); *ppThis = rtl_uString_ImplAlloc( nLen ); - OSL_ASSERT(*ppThis != NULL); + OSL_ASSERT(*ppThis != nullptr); if ( (*ppThis) ) { sal_Unicode* pBuffer = (*ppThis)->buffer; @@ -573,7 +573,7 @@ void SAL_CALL rtl_uString_newFromCodePoints( rtl_uString_new(newString); return; } - if (*newString != NULL) { + if (*newString != nullptr) { rtl_uString_release(*newString); } n = codePointCount; @@ -589,11 +589,11 @@ void SAL_CALL rtl_uString_newFromCodePoints( sal_Int32 -2): */ if (n < 0) { // coverity[dead_error_begin] - assumes wrap around - *newString = NULL; + *newString = nullptr; return; } *newString = rtl_uString_ImplAlloc(n); - if (*newString == NULL) { + if (*newString == nullptr) { return; } p = (*newString)->buffer; @@ -685,7 +685,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis, if ( !nLen ) { rtl_uString_new( ppThis ); - if (pInfo != NULL) { + if (pInfo != nullptr) { *pInfo = 0; } } @@ -699,8 +699,8 @@ static void rtl_string2UString_status( rtl_uString** ppThis, { sal_Unicode* pBuffer; *ppThis = rtl_uString_ImplAlloc( nLen ); - if (*ppThis == NULL) { - if (pInfo != NULL) { + if (*ppThis == nullptr) { + if (pInfo != nullptr) { *pInfo = RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; } @@ -724,7 +724,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis, nLenCopy--; } while (nLenCopy); - if (pInfo != NULL) { + if (pInfo != nullptr) { *pInfo = 0; } RTL_LOG_STRING_NEW( *ppThis ); @@ -733,7 +733,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis, retry: { rtl_uString* pTemp; - rtl_uString* pTemp2 = NULL; + rtl_uString* pTemp2 = nullptr; rtl_TextToUnicodeConverter hConverter; sal_uInt32 nInfo; sal_Size nSrcBytes; @@ -753,9 +753,9 @@ retry: { sal_Unicode* pBuffer; *ppThis = rtl_uString_ImplAlloc( nLen ); - if (*ppThis == NULL) + if (*ppThis == nullptr) { - if (pInfo != NULL) { + if (pInfo != nullptr) { *pInfo = RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; } @@ -771,7 +771,7 @@ retry: nLen--; } while ( nLen ); - if (pInfo != NULL) { + if (pInfo != nullptr) { *pInfo = 0; } RTL_LOG_STRING_NEW( *ppThis ); @@ -785,14 +785,14 @@ retry: hConverter = rtl_createTextToUnicodeConverter( eTextEncoding ); pTemp = rtl_uString_ImplAlloc( nNewLen ); - if (pTemp == NULL) { - if (pInfo != NULL) { + if (pTemp == nullptr) { + if (pInfo != nullptr) { *pInfo = RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; } return; } - nDestChars = rtl_convertTextToUnicode( hConverter, 0, + nDestChars = rtl_convertTextToUnicode( hConverter, nullptr, pStr, nLen, pTemp->buffer, nNewLen, nCvtFlags, @@ -807,14 +807,14 @@ retry: rtl_freeMemory( pTemp ); nNewLen += 8; pTemp = rtl_uString_ImplAlloc( nNewLen ); - if (pTemp == NULL) { - if (pInfo != NULL) { + if (pTemp == nullptr) { + if (pInfo != nullptr) { *pInfo = RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; } return; } - nDestChars = rtl_convertTextToUnicode( hConverter, 0, + nDestChars = rtl_convertTextToUnicode( hConverter, nullptr, pStr, nLen, pTemp->buffer, nNewLen, nCvtFlags, @@ -830,7 +830,7 @@ retry: { pTemp2 = rtl_uString_ImplAlloc( nDestChars ); } - if (pTemp2 != NULL) + if (pTemp2 != nullptr) { rtl_str_ImplCopy(pTemp2->buffer, pTemp->buffer, nDestChars); rtl_freeMemory(pTemp); @@ -863,7 +863,7 @@ void SAL_CALL rtl_string2UString( rtl_uString** ppThis, assert(ppThis); assert(nLen >= 0); rtl_string2UString_status( ppThis, pStr, nLen, eTextEncoding, - nCvtFlags, NULL ); + nCvtFlags, nullptr ); } /* ----------------------------------------------------------------------- */ @@ -876,7 +876,7 @@ enum StrLifecycle { static oslMutex getInternMutex() { - static oslMutex pPoolGuard = NULL; + static oslMutex pPoolGuard = nullptr; if( !pPoolGuard ) { oslMutex pGlobalGuard; @@ -934,7 +934,7 @@ void SAL_CALL rtl_uString_intern( rtl_uString ** newStr, else { rtl_uString *pOrg = *newStr; - *newStr = NULL; + *newStr = nullptr; rtl_ustring_intern_internal( newStr, str, CANNOT_RETURN ); if (pOrg) rtl_uString_release (pOrg); @@ -979,7 +979,7 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString ** newStr, if (*newStr) { rtl_uString_release (*newStr); - *newStr = NULL; + *newStr = nullptr; } if ( len < 256 ) @@ -1015,7 +1015,7 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString ** newStr, hConverter = rtl_createTextToUnicodeConverter( eTextEncoding ); rtl_convertTextToUnicode( - hConverter, 0, str, len, pScratch->buffer, ulen, convertFlags, &nInfo, &nSrcBytes ); + hConverter, nullptr, str, len, pScratch->buffer, ulen, convertFlags, &nInfo, &nSrcBytes ); rtl_destroyTextToUnicodeConverter( hConverter ); if (pInfo) @@ -1029,7 +1029,7 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString ** newStr, /* FIXME: we want a nice UTF-8 / alloca shortcut here */ } - scratch = NULL; + scratch = nullptr; rtl_string2UString_status( &scratch, str, len, eTextEncoding, convertFlags, pInfo ); if (!scratch) { @@ -1043,7 +1043,7 @@ internRelease (rtl_uString *pThis) { oslMutex pPoolMutex; - rtl_uString *pFree = NULL; + rtl_uString *pFree = nullptr; if ( SAL_STRING_REFCOUNT( osl_atomic_decrement( &(pThis->refCount) ) ) == 0) { @@ -1078,7 +1078,7 @@ sal_uInt32 SAL_CALL rtl_uString_iterateCodePoints( sal_Int32 n; sal_Unicode cu; sal_uInt32 cp; - assert(string != NULL && indexUtf16 != NULL); + assert(string != nullptr && indexUtf16 != nullptr); n = *indexUtf16; assert(n >= 0 && n <= string->length); while (incrementCodePoints < 0) { @@ -1130,11 +1130,11 @@ void rtl_uString_newReplaceFirst( rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, rtl_uString const * to, sal_Int32 * index) SAL_THROW_EXTERN_C() { - assert(str != 0); - assert(index != 0); + assert(str != nullptr); + assert(index != nullptr); assert(*index >= 0 && *index <= str->length); - assert(from != 0); - assert(to != 0); + assert(from != nullptr); + assert(to != nullptr); sal_Int32 i = rtl_ustr_indexOfStr_WithLength( str->buffer + *index, str->length - *index, from->buffer, from->length); if (i == -1) { @@ -1172,11 +1172,11 @@ void rtl_uString_newReplaceFirstAsciiL( sal_Int32 fromLength, rtl_uString const * to, sal_Int32 * index) SAL_THROW_EXTERN_C() { - assert(str != 0); - assert(index != 0); + assert(str != nullptr); + assert(index != nullptr); assert(*index >= 0 && *index <= str->length); assert(fromLength >= 0); - assert(to != 0); + assert(to != nullptr); sal_Int32 i = rtl_ustr_indexOfAscii_WithLength( str->buffer + *index, str->length - *index, from, fromLength); if (i == -1) { @@ -1214,10 +1214,10 @@ void rtl_uString_newReplaceFirstToAsciiL( char const * to, sal_Int32 toLength, sal_Int32 * index) SAL_THROW_EXTERN_C() { - assert(str != 0); - assert(index != 0); + assert(str != nullptr); + assert(index != nullptr); assert(*index >= 0 && *index <= str->length); - assert(from != 0); + assert(from != nullptr); assert(toLength >= 0); sal_Int32 i = rtl_ustr_indexOfStr_WithLength( str->buffer + *index, str->length - *index, from->buffer, from->length); @@ -1257,11 +1257,11 @@ void rtl_uString_newReplaceFirstAsciiLAsciiL( sal_Int32 fromLength, char const * to, sal_Int32 toLength, sal_Int32 * index) SAL_THROW_EXTERN_C() { - assert(str != 0); - assert(index != 0); + assert(str != nullptr); + assert(index != nullptr); assert(*index >= 0 && *index <= str->length); assert(fromLength >= 0); - assert(to != 0); + assert(to != nullptr); assert(toLength >= 0); sal_Int32 i = rtl_ustr_indexOfAscii_WithLength( str->buffer + *index, str->length - *index, from, fromLength); @@ -1307,7 +1307,7 @@ void rtl_uString_newReplaceAllFromIndex( rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, rtl_uString const * to, sal_Int32 fromIndex) SAL_THROW_EXTERN_C() { - assert(to != 0); + assert(to != nullptr); assert(fromIndex >= 0 && fromIndex <= str->length); rtl_uString_assign(newStr, str); for (sal_Int32 i = fromIndex;; i += to->length) { @@ -1322,7 +1322,7 @@ void rtl_uString_newReplaceAllAsciiL( rtl_uString ** newStr, rtl_uString * str, char const * from, sal_Int32 fromLength, rtl_uString const * to) SAL_THROW_EXTERN_C() { - assert(to != 0); + assert(to != nullptr); rtl_uString_assign(newStr, str); for (sal_Int32 i = 0;; i += to->length) { rtl_uString_newReplaceFirstAsciiL( @@ -1337,7 +1337,7 @@ void rtl_uString_newReplaceAllToAsciiL( rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, char const * to, sal_Int32 toLength) SAL_THROW_EXTERN_C() { - assert(from != 0); + assert(from != nullptr); rtl_uString_assign(newStr, str); for (sal_Int32 i = 0;; i += toLength) { rtl_uString_newReplaceFirstToAsciiL( diff --git a/sal/rtl/uuid.cxx b/sal/rtl/uuid.cxx index 8eb0566e9e2f..b3197d14a117 100644 --- a/sal/rtl/uuid.cxx +++ b/sal/rtl/uuid.cxx @@ -94,10 +94,10 @@ extern "C" void SAL_CALL rtl_createUuid( sal_uInt8 *pTargetUUID , { { osl::MutexGuard g(osl::Mutex::getGlobalMutex()); - static rtlRandomPool pool = NULL; - if (pool == NULL) { + static rtlRandomPool pool = nullptr; + if (pool == nullptr) { pool = rtl_random_createPool(); - if (pool == NULL) { + if (pool == nullptr) { abort(); // only possible way to signal failure here (rtl_createUuid // being part of a fixed C API) diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab index bc5917fcb063..37cf080a4130 100644 --- a/sal/textenc/convertadobe.tab +++ b/sal/textenc/convertadobe.tab @@ -288,33 +288,33 @@ ImplTextEncodingData const adobeStandardEncodingData = { { &adobeStandardEncodingConverterData, &rtl_textenc_convertSingleByteToBmpUnicode, &rtl_textenc_convertBmpUnicodeToSingleByte, - 0, 0, 0, + nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, 1, 1, 1, - 0, 0, "Adobe-Standard-Encoding", + 0, nullptr, "Adobe-Standard-Encoding", RTL_TEXTENCODING_INFO_MIME }; ImplTextEncodingData const adobeSymbolEncodingData = { { &adobeSymbolEncodingConverterData, &rtl_textenc_convertSingleByteToBmpUnicode, &rtl_textenc_convertBmpUnicodeToSingleByte, - 0, 0, 0, + nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, 1, 1, 1, - 0, 0, "Adobe-Symbol-Encoding", + 0, nullptr, "Adobe-Symbol-Encoding", RTL_TEXTENCODING_INFO_SYMBOL | RTL_TEXTENCODING_INFO_MIME }; ImplTextEncodingData const adobeDingbatsEncodingData = { { &adobeDingbatsEncodingConverterData, &rtl_textenc_convertSingleByteToBmpUnicode, &rtl_textenc_convertBmpUnicodeToSingleByte, - 0, 0, 0, + nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, 1, 1, 1, - 0, 0, "Adobe-ZapfDingbats-Encoding", + 0, nullptr, "Adobe-ZapfDingbats-Encoding", 0 }; // TODO: RTL_TEXTENCODING_INFO_DINGBATS } diff --git a/sal/textenc/convertbig5hkscs.cxx b/sal/textenc/convertbig5hkscs.cxx index 034b206cb9f0..08b8db6e4252 100644 --- a/sal/textenc/convertbig5hkscs.cxx +++ b/sal/textenc/convertbig5hkscs.cxx @@ -427,7 +427,7 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData, bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( bUndefined, nChar, nFlags, &pDestBufPtr, pDestBufEnd, - &nInfo, NULL, 0, NULL)) + &nInfo, nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: nHighSurrogate = 0; @@ -458,7 +458,7 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData, else switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, - NULL, 0, NULL)) + nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: diff --git a/sal/textenc/converteuctw.cxx b/sal/textenc/converteuctw.cxx index e871306a1b25..9fdd97e05a21 100644 --- a/sal/textenc/converteuctw.cxx +++ b/sal/textenc/converteuctw.cxx @@ -386,7 +386,7 @@ sal_Size ImplConvertUnicodeToEucTw(void const * pData, bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( bUndefined, nChar, nFlags, &pDestBufPtr, pDestBufEnd, - &nInfo, NULL, 0, NULL)) + &nInfo, nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: nHighSurrogate = 0; @@ -417,7 +417,7 @@ sal_Size ImplConvertUnicodeToEucTw(void const * pData, else switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, - NULL, 0, NULL)) + nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: diff --git a/sal/textenc/convertgb18030.cxx b/sal/textenc/convertgb18030.cxx index 87ede87a0830..ee52a98f99c5 100644 --- a/sal/textenc/convertgb18030.cxx +++ b/sal/textenc/convertgb18030.cxx @@ -401,7 +401,7 @@ sal_Size ImplConvertUnicodeToGb18030(void const * pData, bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( bUndefined, nChar, nFlags, &pDestBufPtr, pDestBufEnd, - &nInfo, NULL, 0, NULL)) + &nInfo, nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: nHighSurrogate = 0; @@ -432,7 +432,7 @@ sal_Size ImplConvertUnicodeToGb18030(void const * pData, else switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, - NULL, 0, NULL)) + nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx index 4fea41d8ef60..8a025ef4b4bd 100644 --- a/sal/textenc/convertisciidevangari.cxx +++ b/sal/textenc/convertisciidevangari.cxx @@ -377,8 +377,8 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size continue; bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( - bUndefined, c, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, 0, - 0, 0)) + bUndefined, c, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, nullptr, + 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: cHighSurrogate = 0; @@ -411,8 +411,8 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size else { switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( - false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, 0, - 0, 0)) + false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, nullptr, + 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 19fbca1891ce..80a29e853df8 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -15,7 +15,7 @@ #include "convertisciidevangari.hxx" static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData - = { { NULL, + = { { nullptr, &ImplConvertIsciiDevanagariToUnicode, &ImplConvertUnicodeToIsciiDevanagari, &ImplCreateIsciiDevanagariToUnicodeContext, @@ -28,7 +28,7 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData 2, 2, 1, - NULL, + nullptr, "x-iscii-de ", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE }; diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index b5c7f0e1bb63..11c5bf5758b5 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -440,7 +440,7 @@ const sal_uInt16* ImplGetReplaceString( sal_Unicode c ) } while ( nLow <= nHigh ); - return 0; + return nullptr; } // Writes 0--2 characters to dest: diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx index 8464b82328c2..2cfbb83728ba 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.cxx +++ b/sal/textenc/convertsinglebytetobmpunicode.cxx @@ -73,10 +73,10 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( infoFlags |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; break; } - if (info != 0) { + if (info != nullptr) { *info = infoFlags; } - if (srcCvtBytes != 0) { + if (srcCvtBytes != nullptr) { *srcCvtBytes = converted; } return destBufPtr - destBuf; @@ -99,7 +99,7 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( sal_Size converted = 0; sal_Char * destBufPtr = destBuf; sal_Char * destBufEnd = destBuf + destBytes; - if (context != 0) { + if (context != nullptr) { highSurrogate = static_cast< ImplUnicodeToTextContext * >(context)-> m_nHighSurrogate; } @@ -143,8 +143,8 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( continue; bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( - undefined, c, flags, &destBufPtr, destBufEnd, &infoFlags, 0, - 0, 0)) + undefined, c, flags, &destBufPtr, destBufEnd, &infoFlags, nullptr, + 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: highSurrogate = 0; @@ -173,8 +173,8 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( infoFlags |= RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL; } else { switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( - false, 0, flags, &destBufPtr, destBufEnd, &infoFlags, 0, - 0, 0)) + false, 0, flags, &destBufPtr, destBufEnd, &infoFlags, nullptr, + 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: @@ -187,14 +187,14 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( } } } - if (context != 0) { + if (context != nullptr) { static_cast< ImplUnicodeToTextContext * >(context)->m_nHighSurrogate = highSurrogate; } - if (info != 0) { + if (info != nullptr) { *info = infoFlags; } - if (srcCvtChars != 0) { + if (srcCvtChars != nullptr) { *srcCvtChars = converted; } return destBufPtr - destBuf; diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index 4468bbb900eb..f5f6ce37bef1 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -102,8 +102,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * nEncoding != RTL_TEXTENCODING_UTF8); // handled by Impl_getTextEncodingData static ImplTextEncodingData const * const aData[] - = { NULL, /* DONTKNOW */ - NULL, /* MS_1252, see above */ + = { nullptr, /* DONTKNOW */ + nullptr, /* MS_1252, see above */ &aImplAPPLEROMANTextEncodingData, /* APPLE_ROMAN */ &aImplIBM437TextEncodingData, /* IBM_437 */ &aImplIBM850TextEncodingData, /* IBM_850 */ @@ -111,10 +111,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * &aImplIBM861TextEncodingData, /* IBM_861 */ &aImplIBM863TextEncodingData, /* IBM_863 */ &aImplIBM865TextEncodingData, /* IBM_865 */ - NULL, /* reserved (SYSTEM) */ + nullptr, /* reserved (SYSTEM) */ &aImplSYMBOLTextEncodingData, /* SYMBOL */ - NULL, /* ASCII_US, see above */ - NULL, /* ISO_8859_1, see above */ + nullptr, /* ASCII_US, see above */ + nullptr, /* ISO_8859_1, see above */ &aImplISO88592TextEncodingData, /* ISO_8859_2 */ &aImplISO88593TextEncodingData, /* ISO_8859_3 */ &aImplISO88594TextEncodingData, /* ISO_8859_4 */ @@ -143,19 +143,19 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * &aImplMS1256TextEncodingData, /* MS_1256 */ &aImplMS1257TextEncodingData, /* MS_1257 */ &aImplMS1258TextEncodingData, /* MS_1258 */ - NULL, /* TODO! APPLE_ARABIC */ + nullptr, /* TODO! APPLE_ARABIC */ &aImplAPPLECENTEUROTextEncodingData, /* APPLE_CENTEURO */ &aImplAPPLECROATIANTextEncodingData, /* APPLE_CROATIAN */ &aImplAPPLECYRILLICTextEncodingData, /* APPLE_CYRILLIC */ - NULL, /* TODO! APPLE_DEVANAGARI */ - NULL, /* TODO! APPLE_FARSI */ + nullptr, /* TODO! APPLE_DEVANAGARI */ + nullptr, /* TODO! APPLE_FARSI */ &aImplAPPLEGREEKTextEncodingData, /* APPLE_GREEK */ - NULL, /* TODO! APPLE_GUJARATI */ - NULL, /* TODO! APPLE_GURMUKHI */ - NULL, /* TODO! APPLE_HEBREW */ + nullptr, /* TODO! APPLE_GUJARATI */ + nullptr, /* TODO! APPLE_GURMUKHI */ + nullptr, /* TODO! APPLE_HEBREW */ &aImplAPPLEICELANDTextEncodingData, /* APPLE_ICELAND */ &aImplAPPLEROMANIANTextEncodingData, /* APPLE_ROMANIAN */ - NULL, /* TODO! APPLE_THAI */ + nullptr, /* TODO! APPLE_THAI */ &aImplAPPLETURKISHTextEncodingData, /* APPLE_TURKISH */ &aImplAPPLEUKRAINIANTextEncodingData, /* APPLE_UKRAINIAN */ #if WITH_LOCALE_ALL || WITH_LOCALE_zh @@ -219,7 +219,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * #endif &aImplKOI8RTextEncodingData, /* KOI8_R */ &aImplUTF7TextEncodingData, /* UTF7 */ - NULL, /* UTF8, see above */ + nullptr, /* UTF8, see above */ &aImplISO885910TextEncodingData, /* ISO_8859_10 */ &aImplISO885913TextEncodingData, /* ISO_8859_13 */ #if WITH_LOCALE_ALL || WITH_LOCALE_ko @@ -253,7 +253,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * #else NULL, #endif - NULL, /* JAVA_UTF8, see above */ + nullptr, /* JAVA_UTF8, see above */ &adobeStandardEncodingData, /* ADOBE_STANDARD */ &adobeSymbolEncodingData, /* ADOBE_SYMBOL */ &aImplPT154TextEncodingData, /* PT154 */ @@ -264,7 +264,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * "update table above if a new encoding is added"); return - nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : NULL; + nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab index c12b96deaa74..e346a7deff91 100644 --- a/sal/textenc/tcvtarb1.tab +++ b/sal/textenc/tcvtarb1.tab @@ -187,11 +187,11 @@ static ImplUniCharTabData const aImplIBM862ToCharTabEx[IBM862TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM862ByteCvtData = { aImplIBM862ToUniTab, - NULL, + nullptr, IBM862UNI_START, IBM862UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM862ToCharTab, - NULL, + nullptr, aImplIBM862ToCharTabEx, IBM862CHAR_START, IBM862CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -204,12 +204,12 @@ static ImplTextEncodingData const aImplIBM862TextEncodingData = { { &aImplIBM862ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -345,11 +345,11 @@ static ImplUniCharTabData const aImplIBM864ToCharTabEx[IBM864TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM864ByteCvtData = { aImplIBM864ToUniTab, - NULL, + nullptr, IBM864UNI_START, IBM864UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM864ToCharTab, - NULL, + nullptr, aImplIBM864ToCharTabEx, IBM864CHAR_START, IBM864CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -362,12 +362,12 @@ static ImplTextEncodingData const aImplIBM864TextEncodingData = { { &aImplIBM864ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -498,11 +498,11 @@ static ImplUniCharTabData const aImplMS1255ToCharTabEx[MS1255TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1255ByteCvtData = { aImplMS1255ToUniTab, - NULL, + nullptr, MS1255UNI_START, MS1255UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1255ToCharTab, - NULL, + nullptr, aImplMS1255ToCharTabEx, MS1255CHAR_START, MS1255CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -515,12 +515,12 @@ static ImplTextEncodingData const aImplMS1255TextEncodingData = { { &aImplMS1255ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -676,11 +676,11 @@ static ImplUniCharTabData const aImplMS1256ToCharTabEx[MS1256TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1256ByteCvtData = { aImplMS1256ToUniTab, - NULL, + nullptr, MS1256UNI_START, MS1256UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1256ToCharTab, - NULL, + nullptr, aImplMS1256ToCharTabEx, MS1256CHAR_START, MS1256CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -693,12 +693,12 @@ static ImplTextEncodingData const aImplMS1256TextEncodingData = { { &aImplMS1256ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -793,12 +793,12 @@ static ImplTextEncodingData const aImplISO88596TextEncodingData = { { &aImplISO88596ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -914,12 +914,12 @@ static ImplTextEncodingData const aImplISO88598TextEncodingData = { { &aImplISO88598ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab index 71551694cfeb..ec6c346b1848 100644 --- a/sal/textenc/tcvteas1.tab +++ b/sal/textenc/tcvteas1.tab @@ -104,11 +104,11 @@ static ImplUniCharTabData const aImplMS874ToCharTabEx[MS874TOCHARTABEX_COUNT] = static ImplByteConvertData const aImplMS874ByteCvtData = { aImplMS874ToUniTab, - NULL, + nullptr, MS874UNI_START, MS874UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS874ToCharTab, - NULL, + nullptr, aImplMS874ToCharTabEx, MS874CHAR_START, MS874CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -121,12 +121,12 @@ static ImplTextEncodingData const aImplMS874TextEncodingData = { { &aImplMS874ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -173,12 +173,12 @@ static ImplTextEncodingData const aImplTis620TextEncodingData = { { &aImplTis620ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -399,11 +399,11 @@ static ImplUniCharTabData const aImplMS1258ToCharTabEx[MS1258TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1258ByteCvtData = { aImplMS1258ToUniTab, - NULL, + nullptr, MS1258UNI_START, MS1258UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1258ToCharTab, - NULL, + nullptr, aImplMS1258ToCharTabEx, MS1258CHAR_START, MS1258CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -416,12 +416,12 @@ static ImplTextEncodingData const aImplMS1258TextEncodingData = { { &aImplMS1258ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 1, diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index bd308ec777ea..22a145d110f3 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -153,11 +153,11 @@ static ImplUniCharTabData const aImplIBM737ToCharTabEx[IBM737TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM737ByteCvtData = { aImplIBM737ToUniTab, - NULL, + nullptr, IBM737UNI_START, IBM737UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM737ToCharTab, - NULL, + nullptr, aImplIBM737ToCharTabEx, IBM737CHAR_START, IBM737CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -170,12 +170,12 @@ static ImplTextEncodingData const aImplIBM737TextEncodingData = { { &aImplIBM737ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -359,11 +359,11 @@ static ImplUniCharTabData const aImplIBM775ToCharTabEx[IBM775TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM775ByteCvtData = { aImplIBM775ToUniTab, - NULL, + nullptr, IBM775UNI_START, IBM775UNI_END, NOTABUNI_START, NOTABUNI_END, - NULL, - NULL, + nullptr, + nullptr, aImplIBM775ToCharTabEx, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -376,12 +376,12 @@ static ImplTextEncodingData const aImplIBM775TextEncodingData = { { &aImplIBM775ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -565,11 +565,11 @@ static ImplUniCharTabData const aImplIBM852ToCharTabEx[IBM852TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM852ByteCvtData = { aImplIBM852ToUniTab, - NULL, + nullptr, IBM852UNI_START, IBM852UNI_END, NOTABUNI_START, NOTABUNI_END, - NULL, - NULL, + nullptr, + nullptr, aImplIBM852ToCharTabEx, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -582,12 +582,12 @@ static ImplTextEncodingData const aImplIBM852TextEncodingData = { { &aImplIBM852ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -701,11 +701,11 @@ static ImplUniCharTabData const aImplIBM855ToCharTabEx[IBM855TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM855ByteCvtData = { aImplIBM855ToUniTab, - NULL, + nullptr, IBM855UNI_START, IBM855UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM855ToCharTab, - NULL, + nullptr, aImplIBM855ToCharTabEx, IBM855CHAR_START, IBM855CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -718,12 +718,12 @@ static ImplTextEncodingData const aImplIBM855TextEncodingData = { { &aImplIBM855ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -836,11 +836,11 @@ static ImplUniCharTabData const aImplIBM857ToCharTabEx[IBM857TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM857ByteCvtData = { aImplIBM857ToUniTab, - NULL, + nullptr, IBM857UNI_START, IBM857UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM857ToCharTab, - NULL, + nullptr, aImplIBM857ToCharTabEx, IBM857CHAR_START, IBM857CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -853,12 +853,12 @@ static ImplTextEncodingData const aImplIBM857TextEncodingData = { { &aImplIBM857ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -992,11 +992,11 @@ static ImplUniCharTabData const aImplIBM866ToCharTabEx[IBM866TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM866ByteCvtData = { aImplIBM866ToUniTab, - NULL, + nullptr, IBM866UNI_START, IBM866UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM866ToCharTab, - NULL, + nullptr, aImplIBM866ToCharTabEx, IBM866CHAR_START, IBM866CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1009,12 +1009,12 @@ static ImplTextEncodingData const aImplIBM866TextEncodingData = { { &aImplIBM866ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1138,11 +1138,11 @@ static ImplUniCharTabData const aImplIBM869ToCharTabEx[IBM869TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM869ByteCvtData = { aImplIBM869ToUniTab, - NULL, + nullptr, IBM869UNI_START, IBM869UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM869ToCharTab, - NULL, + nullptr, aImplIBM869ToCharTabEx, IBM869CHAR_START, IBM869CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1155,12 +1155,12 @@ static ImplTextEncodingData const aImplIBM869TextEncodingData = { { &aImplIBM869ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1339,11 +1339,11 @@ static ImplUniCharTabData const aImplMS1250ToCharTabEx[MS1250TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1250ByteCvtData = { aImplMS1250ToUniTab, - NULL, + nullptr, MS1250UNI_START, MS1250UNI_END, NOTABUNI_START, NOTABUNI_END, - NULL, - NULL, + nullptr, + nullptr, aImplMS1250ToCharTabEx, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1356,12 +1356,12 @@ static ImplTextEncodingData const aImplMS1250TextEncodingData = { { &aImplMS1250ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1474,11 +1474,11 @@ static ImplUniCharTabData const aImplMS1251ToCharTabEx[MS1251TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1251ByteCvtData = { aImplMS1251ToUniTab, - NULL, + nullptr, MS1251UNI_START, MS1251UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1251ToCharTab, - NULL, + nullptr, aImplMS1251ToCharTabEx, MS1251CHAR_START, MS1251CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1491,12 +1491,12 @@ static ImplTextEncodingData const aImplMS1251TextEncodingData = { { &aImplMS1251ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1612,11 +1612,11 @@ static ImplUniCharTabData const aImplMS1253ToCharTabEx[MS1253TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1253ByteCvtData = { aImplMS1253ToUniTab, - NULL, + nullptr, MS1253UNI_START, MS1253UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1253ToCharTab, - NULL, + nullptr, aImplMS1253ToCharTabEx, MS1253CHAR_START, MS1253CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1629,12 +1629,12 @@ static ImplTextEncodingData const aImplMS1253TextEncodingData = { { &aImplMS1253ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1743,11 +1743,11 @@ static ImplUniCharTabData const aImplMS1254ToCharTabEx[MS1254TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1254ByteCvtData = { aImplMS1254ToUniTab, - NULL, + nullptr, MS1254UNI_START, MS1254UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1254ToCharTab, - NULL, + nullptr, aImplMS1254ToCharTabEx, MS1254CHAR_START, MS1254CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1760,12 +1760,12 @@ static ImplTextEncodingData const aImplMS1254TextEncodingData = { { &aImplMS1254ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1879,11 +1879,11 @@ static ImplUniCharTabData const aImplMS1257ToCharTabEx[MS1257TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1257ByteCvtData = { aImplMS1257ToUniTab, - NULL, + nullptr, MS1257UNI_START, MS1257UNI_END, NOTABUNI_START, NOTABUNI_END, aImplMS1257ToCharTab, - NULL, + nullptr, aImplMS1257ToCharTabEx, MS1257CHAR_START, MS1257CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1896,12 +1896,12 @@ static ImplTextEncodingData const aImplMS1257TextEncodingData = { { &aImplMS1257ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2051,7 +2051,7 @@ static ImplByteConvertData const aImplISO88592ByteCvtData = ISO88592UNI_START, ISO88592UNI_END, SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, - NULL, + nullptr, aImplISO88592ToCharTabEx, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -2064,12 +2064,12 @@ static ImplTextEncodingData const aImplISO88592TextEncodingData = { { &aImplISO88592ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2212,7 +2212,7 @@ static ImplByteConvertData const aImplISO88593ByteCvtData = ISO88593UNI_START, ISO88593UNI_END, SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, - NULL, + nullptr, aImplISO88593ToCharTabEx, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -2225,12 +2225,12 @@ static ImplTextEncodingData const aImplISO88593TextEncodingData = { { &aImplISO88593ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2380,7 +2380,7 @@ static ImplByteConvertData const aImplISO88594ByteCvtData = ISO88594UNI_START, ISO88594UNI_END, SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, - NULL, + nullptr, aImplISO88594ToCharTabEx, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -2393,12 +2393,12 @@ static ImplTextEncodingData const aImplISO88594TextEncodingData = { { &aImplISO88594ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2491,12 +2491,12 @@ static ImplTextEncodingData const aImplISO88595TextEncodingData = { { &aImplISO88595ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2602,12 +2602,12 @@ static ImplTextEncodingData const aImplISO88597TextEncodingData = { { &aImplISO88597ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2702,12 +2702,12 @@ static ImplTextEncodingData const aImplISO88599TextEncodingData = { { &aImplISO88599ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2843,12 +2843,12 @@ static ImplTextEncodingData const aImplISO885910TextEncodingData = { { &aImplISO885910ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2998,7 +2998,7 @@ static ImplByteConvertData const aImplISO885913ByteCvtData = ISO885913UNI_START, ISO885913UNI_END, SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, - NULL, + nullptr, aImplISO885913ToCharTabEx, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3011,12 +3011,12 @@ static ImplTextEncodingData const aImplISO885913TextEncodingData = { { &aImplISO885913ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3199,11 +3199,11 @@ static ImplUniCharTabData const aImplAPPLECENTEUROToCharTabEx[APPLECENTEUROTOCHA static ImplByteConvertData const aImplAPPLECENTEUROByteCvtData = { aImplAPPLECENTEUROToUniTab, - NULL, + nullptr, APPLECENTEUROUNI_START, APPLECENTEUROUNI_END, NOTABUNI_START, NOTABUNI_END, - NULL, - NULL, + nullptr, + nullptr, aImplAPPLECENTEUROToCharTabEx, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3216,12 +3216,12 @@ static ImplTextEncodingData const aImplAPPLECENTEUROTextEncodingData = { { &aImplAPPLECENTEUROByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3347,11 +3347,11 @@ static ImplUniCharTabData const aImplAPPLECROATIANToCharTabEx[APPLECROATIANTOCHA static ImplByteConvertData const aImplAPPLECROATIANByteCvtData = { aImplAPPLECROATIANToUniTab, - NULL, + nullptr, APPLECROATIANUNI_START, APPLECROATIANUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLECROATIANToCharTab, - NULL, + nullptr, aImplAPPLECROATIANToCharTabEx, APPLECROATIANCHAR_START, APPLECROATIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3364,12 +3364,12 @@ static ImplTextEncodingData const aImplAPPLECROATIANTextEncodingData = { { &aImplAPPLECROATIANByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3482,11 +3482,11 @@ static ImplUniCharTabData const aImplAPPLECYRILLICToCharTabEx[APPLECYRILLICTOCHA static ImplByteConvertData const aImplAPPLECYRILLICByteCvtData = { aImplAPPLECYRILLICToUniTab, - NULL, + nullptr, APPLECYRILLICUNI_START, APPLECYRILLICUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLECYRILLICToCharTab, - NULL, + nullptr, aImplAPPLECYRILLICToCharTabEx, APPLECYRILLICCHAR_START, APPLECYRILLICCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3499,12 +3499,12 @@ static ImplTextEncodingData const aImplAPPLECYRILLICTextEncodingData = { { &aImplAPPLECYRILLICByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3636,11 +3636,11 @@ static ImplUniCharTabData const aImplAPPLEGREEKToCharTabEx[APPLEGREEKTOCHARTABEX static ImplByteConvertData const aImplAPPLEGREEKByteCvtData = { aImplAPPLEGREEKToUniTab, - NULL, + nullptr, APPLEGREEKUNI_START, APPLEGREEKUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLEGREEKToCharTab, - NULL, + nullptr, aImplAPPLEGREEKToCharTabEx, APPLEGREEKCHAR_START, APPLEGREEKCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3653,12 +3653,12 @@ static ImplTextEncodingData const aImplAPPLEGREEKTextEncodingData = { { &aImplAPPLEGREEKByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3790,11 +3790,11 @@ static ImplUniCharTabData const aImplAPPLEROMANIANToCharTabEx[APPLEROMANIANTOCHA static ImplByteConvertData const aImplAPPLEROMANIANByteCvtData = { aImplAPPLEROMANIANToUniTab, - NULL, + nullptr, APPLEROMANIANUNI_START, APPLEROMANIANUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLEROMANIANToCharTab, - NULL, + nullptr, aImplAPPLEROMANIANToCharTabEx, APPLEROMANIANCHAR_START, APPLEROMANIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3807,12 +3807,12 @@ static ImplTextEncodingData const aImplAPPLEROMANIANTextEncodingData = { { &aImplAPPLEROMANIANByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -3937,11 +3937,11 @@ static ImplUniCharTabData const aImplAPPLETURKISHToCharTabEx[APPLETURKISHTOCHART static ImplByteConvertData const aImplAPPLETURKISHByteCvtData = { aImplAPPLETURKISHToUniTab, - NULL, + nullptr, APPLETURKISHUNI_START, APPLETURKISHUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLETURKISHToCharTab, - NULL, + nullptr, aImplAPPLETURKISHToCharTabEx, APPLETURKISHCHAR_START, APPLETURKISHCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -3954,12 +3954,12 @@ static ImplTextEncodingData const aImplAPPLETURKISHTextEncodingData = { { &aImplAPPLETURKISHByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -4072,11 +4072,11 @@ static ImplUniCharTabData const aImplAPPLEUKRAINIANToCharTabEx[APPLEUKRAINIANTOC static ImplByteConvertData const aImplAPPLEUKRAINIANByteCvtData = { aImplAPPLEUKRAINIANToUniTab, - NULL, + nullptr, APPLEUKRAINIANUNI_START, APPLEUKRAINIANUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLEUKRAINIANToCharTab, - NULL, + nullptr, aImplAPPLEUKRAINIANToCharTabEx, APPLEUKRAINIANCHAR_START, APPLEUKRAINIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -4089,12 +4089,12 @@ static ImplTextEncodingData const aImplAPPLEUKRAINIANTextEncodingData = { { &aImplAPPLEUKRAINIANByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -4231,11 +4231,11 @@ static ImplUniCharTabData const aImplKOI8RToCharTabEx[KOI8RTOCHARTABEX_COUNT] = static ImplByteConvertData const aImplKOI8RByteCvtData = { aImplKOI8RToUniTab, - NULL, + nullptr, KOI8RUNI_START, KOI8RUNI_END, NOTABUNI_START, NOTABUNI_END, aImplKOI8RToCharTab, - NULL, + nullptr, aImplKOI8RToCharTabEx, KOI8RCHAR_START, KOI8RCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -4248,12 +4248,12 @@ static ImplTextEncodingData const aImplKOI8RTextEncodingData = { { &aImplKOI8RByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -4391,11 +4391,11 @@ static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] = static ImplByteConvertData const aImplKOI8UByteCvtData = { aImplKOI8UToUniTab, - NULL, + nullptr, KOI8UUNI_START, KOI8UUNI_END, NOTABUNI_START, NOTABUNI_END, aImplKOI8UToCharTab, - NULL, + nullptr, aImplKOI8UToCharTabEx, KOI8UCHAR_START, KOI8UCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -4406,12 +4406,12 @@ static ImplTextEncodingData const aImplKoi8UTextEncodingData = { { &aImplKOI8UByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -4547,11 +4547,11 @@ static ImplUniCharTabData const aImplPT154ToCharTabEx[PT154TOCHARTABEX_COUNT] = static ImplByteConvertData const aImplPT154ByteCvtData = { aImplPT154ToUniTab, - NULL, + nullptr, PT154UNI_START, PT154UNI_END, NOTABUNI_START, NOTABUNI_END, aImplPT154ToCharTab, - NULL, + nullptr, aImplPT154ToCharTabEx, PT154CHAR_START, PT154CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -4564,12 +4564,12 @@ static ImplTextEncodingData const aImplPT154TextEncodingData = { { &aImplPT154ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab index 4b260ce30b82..3b98079cdae8 100644 --- a/sal/textenc/tcvtjp6.tab +++ b/sal/textenc/tcvtjp6.tab @@ -30,135 +30,135 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ /* is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C (SLASH) like MS CP392 */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ /* is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x005C, 0, 0, NULL }, /* 0x80 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ /* is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C (SLASH) like MS CP392 */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ /* is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x005C, 0, 0, nullptr }, /* 0x80 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ @@ -190,70 +190,70 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9D }, /* 0x9D */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9E }, /* 0x9E */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9F }, /* 0x9F */ - { 0x00A0, 0, 0, NULL }, /* 0xA0 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0xFF61, 0, 0, NULL }, /* 0xA1 */ - { 0xFF62, 0, 0, NULL }, /* 0xA2 */ - { 0xFF63, 0, 0, NULL }, /* 0xA3 */ - { 0xFF64, 0, 0, NULL }, /* 0xA4 */ - { 0xFF65, 0, 0, NULL }, /* 0xA5 */ - { 0xFF66, 0, 0, NULL }, /* 0xA6 */ - { 0xFF67, 0, 0, NULL }, /* 0xA7 */ - { 0xFF68, 0, 0, NULL }, /* 0xA8 */ - { 0xFF69, 0, 0, NULL }, /* 0xA9 */ - { 0xFF6A, 0, 0, NULL }, /* 0xAA */ - { 0xFF6B, 0, 0, NULL }, /* 0xAB */ - { 0xFF6C, 0, 0, NULL }, /* 0xAC */ - { 0xFF6D, 0, 0, NULL }, /* 0xAD */ - { 0xFF6E, 0, 0, NULL }, /* 0xAE */ - { 0xFF6F, 0, 0, NULL }, /* 0xAF */ - { 0xFF70, 0, 0, NULL }, /* 0xB0 */ - { 0xFF71, 0, 0, NULL }, /* 0xB1 */ - { 0xFF72, 0, 0, NULL }, /* 0xB2 */ - { 0xFF73, 0, 0, NULL }, /* 0xB3 */ - { 0xFF74, 0, 0, NULL }, /* 0xB4 */ - { 0xFF75, 0, 0, NULL }, /* 0xB5 */ - { 0xFF76, 0, 0, NULL }, /* 0xB6 */ - { 0xFF77, 0, 0, NULL }, /* 0xB7 */ - { 0xFF78, 0, 0, NULL }, /* 0xB8 */ - { 0xFF79, 0, 0, NULL }, /* 0xB9 */ - { 0xFF7A, 0, 0, NULL }, /* 0xBA */ - { 0xFF7B, 0, 0, NULL }, /* 0xBB */ - { 0xFF7C, 0, 0, NULL }, /* 0xBC */ - { 0xFF7D, 0, 0, NULL }, /* 0xBD */ - { 0xFF7E, 0, 0, NULL }, /* 0xBE */ - { 0xFF7F, 0, 0, NULL }, /* 0xBF */ - { 0xFF80, 0, 0, NULL }, /* 0xC0 */ - { 0xFF81, 0, 0, NULL }, /* 0xC1 */ - { 0xFF82, 0, 0, NULL }, /* 0xC2 */ - { 0xFF83, 0, 0, NULL }, /* 0xC3 */ - { 0xFF84, 0, 0, NULL }, /* 0xC4 */ - { 0xFF85, 0, 0, NULL }, /* 0xC5 */ - { 0xFF86, 0, 0, NULL }, /* 0xC6 */ - { 0xFF87, 0, 0, NULL }, /* 0xC7 */ - { 0xFF88, 0, 0, NULL }, /* 0xC8 */ - { 0xFF89, 0, 0, NULL }, /* 0xC9 */ - { 0xFF8A, 0, 0, NULL }, /* 0xCA */ - { 0xFF8B, 0, 0, NULL }, /* 0xCB */ - { 0xFF8C, 0, 0, NULL }, /* 0xCC */ - { 0xFF8D, 0, 0, NULL }, /* 0xCD */ - { 0xFF8E, 0, 0, NULL }, /* 0xCE */ - { 0xFF8F, 0, 0, NULL }, /* 0xCF */ - { 0xFF90, 0, 0, NULL }, /* 0xD0 */ - { 0xFF91, 0, 0, NULL }, /* 0xD1 */ - { 0xFF92, 0, 0, NULL }, /* 0xD2 */ - { 0xFF93, 0, 0, NULL }, /* 0xD3 */ - { 0xFF94, 0, 0, NULL }, /* 0xD4 */ - { 0xFF95, 0, 0, NULL }, /* 0xD5 */ - { 0xFF96, 0, 0, NULL }, /* 0xD6 */ - { 0xFF97, 0, 0, NULL }, /* 0xD7 */ - { 0xFF98, 0, 0, NULL }, /* 0xD8 */ - { 0xFF99, 0, 0, NULL }, /* 0xD9 */ - { 0xFF9A, 0, 0, NULL }, /* 0xDA */ - { 0xFF9B, 0, 0, NULL }, /* 0xDB */ - { 0xFF9C, 0, 0, NULL }, /* 0xDC */ - { 0xFF9D, 0, 0, NULL }, /* 0xDD */ - { 0xFF9E, 0, 0, NULL }, /* 0xDE */ - { 0xFF9F, 0, 0, NULL }, /* 0xDF */ + { 0x00A0, 0, 0, nullptr }, /* 0xA0 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0xFF61, 0, 0, nullptr }, /* 0xA1 */ + { 0xFF62, 0, 0, nullptr }, /* 0xA2 */ + { 0xFF63, 0, 0, nullptr }, /* 0xA3 */ + { 0xFF64, 0, 0, nullptr }, /* 0xA4 */ + { 0xFF65, 0, 0, nullptr }, /* 0xA5 */ + { 0xFF66, 0, 0, nullptr }, /* 0xA6 */ + { 0xFF67, 0, 0, nullptr }, /* 0xA7 */ + { 0xFF68, 0, 0, nullptr }, /* 0xA8 */ + { 0xFF69, 0, 0, nullptr }, /* 0xA9 */ + { 0xFF6A, 0, 0, nullptr }, /* 0xAA */ + { 0xFF6B, 0, 0, nullptr }, /* 0xAB */ + { 0xFF6C, 0, 0, nullptr }, /* 0xAC */ + { 0xFF6D, 0, 0, nullptr }, /* 0xAD */ + { 0xFF6E, 0, 0, nullptr }, /* 0xAE */ + { 0xFF6F, 0, 0, nullptr }, /* 0xAF */ + { 0xFF70, 0, 0, nullptr }, /* 0xB0 */ + { 0xFF71, 0, 0, nullptr }, /* 0xB1 */ + { 0xFF72, 0, 0, nullptr }, /* 0xB2 */ + { 0xFF73, 0, 0, nullptr }, /* 0xB3 */ + { 0xFF74, 0, 0, nullptr }, /* 0xB4 */ + { 0xFF75, 0, 0, nullptr }, /* 0xB5 */ + { 0xFF76, 0, 0, nullptr }, /* 0xB6 */ + { 0xFF77, 0, 0, nullptr }, /* 0xB7 */ + { 0xFF78, 0, 0, nullptr }, /* 0xB8 */ + { 0xFF79, 0, 0, nullptr }, /* 0xB9 */ + { 0xFF7A, 0, 0, nullptr }, /* 0xBA */ + { 0xFF7B, 0, 0, nullptr }, /* 0xBB */ + { 0xFF7C, 0, 0, nullptr }, /* 0xBC */ + { 0xFF7D, 0, 0, nullptr }, /* 0xBD */ + { 0xFF7E, 0, 0, nullptr }, /* 0xBE */ + { 0xFF7F, 0, 0, nullptr }, /* 0xBF */ + { 0xFF80, 0, 0, nullptr }, /* 0xC0 */ + { 0xFF81, 0, 0, nullptr }, /* 0xC1 */ + { 0xFF82, 0, 0, nullptr }, /* 0xC2 */ + { 0xFF83, 0, 0, nullptr }, /* 0xC3 */ + { 0xFF84, 0, 0, nullptr }, /* 0xC4 */ + { 0xFF85, 0, 0, nullptr }, /* 0xC5 */ + { 0xFF86, 0, 0, nullptr }, /* 0xC6 */ + { 0xFF87, 0, 0, nullptr }, /* 0xC7 */ + { 0xFF88, 0, 0, nullptr }, /* 0xC8 */ + { 0xFF89, 0, 0, nullptr }, /* 0xC9 */ + { 0xFF8A, 0, 0, nullptr }, /* 0xCA */ + { 0xFF8B, 0, 0, nullptr }, /* 0xCB */ + { 0xFF8C, 0, 0, nullptr }, /* 0xCC */ + { 0xFF8D, 0, 0, nullptr }, /* 0xCD */ + { 0xFF8E, 0, 0, nullptr }, /* 0xCE */ + { 0xFF8F, 0, 0, nullptr }, /* 0xCF */ + { 0xFF90, 0, 0, nullptr }, /* 0xD0 */ + { 0xFF91, 0, 0, nullptr }, /* 0xD1 */ + { 0xFF92, 0, 0, nullptr }, /* 0xD2 */ + { 0xFF93, 0, 0, nullptr }, /* 0xD3 */ + { 0xFF94, 0, 0, nullptr }, /* 0xD4 */ + { 0xFF95, 0, 0, nullptr }, /* 0xD5 */ + { 0xFF96, 0, 0, nullptr }, /* 0xD6 */ + { 0xFF97, 0, 0, nullptr }, /* 0xD7 */ + { 0xFF98, 0, 0, nullptr }, /* 0xD8 */ + { 0xFF99, 0, 0, nullptr }, /* 0xD9 */ + { 0xFF9A, 0, 0, nullptr }, /* 0xDA */ + { 0xFF9B, 0, 0, nullptr }, /* 0xDB */ + { 0xFF9C, 0, 0, nullptr }, /* 0xDC */ + { 0xFF9D, 0, 0, nullptr }, /* 0xDD */ + { 0xFF9E, 0, 0, nullptr }, /* 0xDE */ + { 0xFF9F, 0, 0, nullptr }, /* 0xDF */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E0 }, /* 0xE0 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E1 }, /* 0xE1 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E2 }, /* 0xE2 */ @@ -283,9 +283,9 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA }, /* 0xFA */ /* We use the MS table for better MS compatibility */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB }, /* 0xFB */ /* We use the MS table for better MS compatibility */ { 0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC }, /* 0xFC */ /* We use the MS table for better MS compatibility */ - { 0x00A9, 0, 0, NULL }, /* 0xFD */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0x2122, 0, 0, NULL }, /* 0xFE */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0x2026, 0, 0, NULL } /* 0xFF */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x00A9, 0, 0, nullptr }, /* 0xFD */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x2122, 0, 0, nullptr }, /* 0xFE */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x2026, 0, 0, nullptr } /* 0xFF */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ }; /* ----------------------------------------------------------------------- */ @@ -295,37 +295,37 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] = static ImplUniToDBCSHighTab const aSJISDBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_SJIS_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ - { 1, 0, NULL }, /* 0x02 */ + { 1, 0, nullptr }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_SJIS_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_SJIS_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0x3E, aImplUniToDBCSTab_SJIS_20 }, /* 0x20 */ { 0x03, 0xD4, aImplUniToDBCSTab_MS932_21 }, /* 0x21 */ { 0x00, 0xBF, aImplUniToDBCSTab_MS932_22 }, /* 0x22 */ @@ -333,45 +333,45 @@ static ImplUniToDBCSHighTab const aSJISDBCSHighTab[256] = { 0x60, 0x73, aImplUniToDBCSTab_MS932_24 }, /* 0x24 */ { 0x00, 0xEF, aImplUniToDBCSTab_SJIS_25 }, /* 0x25 */ { 0x05, 0x6F, aImplUniToDBCSTab_SJIS_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_SJIS_30 }, /* 0x30 */ - { 1, 0, NULL }, /* 0x31 */ + { 1, 0, nullptr }, /* 0x31 */ { 0x31, 0xA8, aImplUniToDBCSTab_MS932_32 }, /* 0x32 */ { 0x03, 0xCD, aImplUniToDBCSTab_MS932_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFC, aImplUniToDBCSTab_SJIS_4E }, /* 0x4E */ { 0x00, 0xFF, aImplUniToDBCSTab_SJIS_4F }, /* 0x4F */ { 0x05, 0xFB, aImplUniToDBCSTab_SJIS_50 }, /* 0x50 */ @@ -454,101 +454,101 @@ static ImplUniToDBCSHighTab const aSJISDBCSHighTab[256] = { 0x03, 0xFD, aImplUniToDBCSTab_SJIS_9D }, /* 0x9D */ { 0x19, 0xFD, aImplUniToDBCSTab_SJIS_9E }, /* 0x9E */ { 0x07, 0xA0, aImplUniToDBCSTab_SJIS_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x29, 0xDC, aImplUniToDBCSTab_MS932_F9 }, /* 0xF9 */ { 0x0E, 0x2D, aImplUniToDBCSTab_MS932_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_SJIS_FF } /* 0xFF */ }; @@ -583,12 +583,12 @@ static ImplTextEncodingData const aImplSJISTextEncodingData = { { &aImplSJISDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -602,135 +602,135 @@ static ImplTextEncodingData const aImplSJISTextEncodingData static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ /* in SJIS this is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C like MS CP392 */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ /* in SJIS this is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x005C, 0, 0, NULL }, /* 0x80 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ /* in SJIS this is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C like MS CP392 */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ /* in SJIS this is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x005C, 0, 0, nullptr }, /* 0x80 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ @@ -762,70 +762,70 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9D }, /* 0x9D */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9E }, /* 0x9E */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9F }, /* 0x9F */ - { 0x00A0, 0, 0, NULL }, /* 0xA0 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0xFF61, 0, 0, NULL }, /* 0xA1 */ - { 0xFF62, 0, 0, NULL }, /* 0xA2 */ - { 0xFF63, 0, 0, NULL }, /* 0xA3 */ - { 0xFF64, 0, 0, NULL }, /* 0xA4 */ - { 0xFF65, 0, 0, NULL }, /* 0xA5 */ - { 0xFF66, 0, 0, NULL }, /* 0xA6 */ - { 0xFF67, 0, 0, NULL }, /* 0xA7 */ - { 0xFF68, 0, 0, NULL }, /* 0xA8 */ - { 0xFF69, 0, 0, NULL }, /* 0xA9 */ - { 0xFF6A, 0, 0, NULL }, /* 0xAA */ - { 0xFF6B, 0, 0, NULL }, /* 0xAB */ - { 0xFF6C, 0, 0, NULL }, /* 0xAC */ - { 0xFF6D, 0, 0, NULL }, /* 0xAD */ - { 0xFF6E, 0, 0, NULL }, /* 0xAE */ - { 0xFF6F, 0, 0, NULL }, /* 0xAF */ - { 0xFF70, 0, 0, NULL }, /* 0xB0 */ - { 0xFF71, 0, 0, NULL }, /* 0xB1 */ - { 0xFF72, 0, 0, NULL }, /* 0xB2 */ - { 0xFF73, 0, 0, NULL }, /* 0xB3 */ - { 0xFF74, 0, 0, NULL }, /* 0xB4 */ - { 0xFF75, 0, 0, NULL }, /* 0xB5 */ - { 0xFF76, 0, 0, NULL }, /* 0xB6 */ - { 0xFF77, 0, 0, NULL }, /* 0xB7 */ - { 0xFF78, 0, 0, NULL }, /* 0xB8 */ - { 0xFF79, 0, 0, NULL }, /* 0xB9 */ - { 0xFF7A, 0, 0, NULL }, /* 0xBA */ - { 0xFF7B, 0, 0, NULL }, /* 0xBB */ - { 0xFF7C, 0, 0, NULL }, /* 0xBC */ - { 0xFF7D, 0, 0, NULL }, /* 0xBD */ - { 0xFF7E, 0, 0, NULL }, /* 0xBE */ - { 0xFF7F, 0, 0, NULL }, /* 0xBF */ - { 0xFF80, 0, 0, NULL }, /* 0xC0 */ - { 0xFF81, 0, 0, NULL }, /* 0xC1 */ - { 0xFF82, 0, 0, NULL }, /* 0xC2 */ - { 0xFF83, 0, 0, NULL }, /* 0xC3 */ - { 0xFF84, 0, 0, NULL }, /* 0xC4 */ - { 0xFF85, 0, 0, NULL }, /* 0xC5 */ - { 0xFF86, 0, 0, NULL }, /* 0xC6 */ - { 0xFF87, 0, 0, NULL }, /* 0xC7 */ - { 0xFF88, 0, 0, NULL }, /* 0xC8 */ - { 0xFF89, 0, 0, NULL }, /* 0xC9 */ - { 0xFF8A, 0, 0, NULL }, /* 0xCA */ - { 0xFF8B, 0, 0, NULL }, /* 0xCB */ - { 0xFF8C, 0, 0, NULL }, /* 0xCC */ - { 0xFF8D, 0, 0, NULL }, /* 0xCD */ - { 0xFF8E, 0, 0, NULL }, /* 0xCE */ - { 0xFF8F, 0, 0, NULL }, /* 0xCF */ - { 0xFF90, 0, 0, NULL }, /* 0xD0 */ - { 0xFF91, 0, 0, NULL }, /* 0xD1 */ - { 0xFF92, 0, 0, NULL }, /* 0xD2 */ - { 0xFF93, 0, 0, NULL }, /* 0xD3 */ - { 0xFF94, 0, 0, NULL }, /* 0xD4 */ - { 0xFF95, 0, 0, NULL }, /* 0xD5 */ - { 0xFF96, 0, 0, NULL }, /* 0xD6 */ - { 0xFF97, 0, 0, NULL }, /* 0xD7 */ - { 0xFF98, 0, 0, NULL }, /* 0xD8 */ - { 0xFF99, 0, 0, NULL }, /* 0xD9 */ - { 0xFF9A, 0, 0, NULL }, /* 0xDA */ - { 0xFF9B, 0, 0, NULL }, /* 0xDB */ - { 0xFF9C, 0, 0, NULL }, /* 0xDC */ - { 0xFF9D, 0, 0, NULL }, /* 0xDD */ - { 0xFF9E, 0, 0, NULL }, /* 0xDE */ - { 0xFF9F, 0, 0, NULL }, /* 0xDF */ + { 0x00A0, 0, 0, nullptr }, /* 0xA0 */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0xFF61, 0, 0, nullptr }, /* 0xA1 */ + { 0xFF62, 0, 0, nullptr }, /* 0xA2 */ + { 0xFF63, 0, 0, nullptr }, /* 0xA3 */ + { 0xFF64, 0, 0, nullptr }, /* 0xA4 */ + { 0xFF65, 0, 0, nullptr }, /* 0xA5 */ + { 0xFF66, 0, 0, nullptr }, /* 0xA6 */ + { 0xFF67, 0, 0, nullptr }, /* 0xA7 */ + { 0xFF68, 0, 0, nullptr }, /* 0xA8 */ + { 0xFF69, 0, 0, nullptr }, /* 0xA9 */ + { 0xFF6A, 0, 0, nullptr }, /* 0xAA */ + { 0xFF6B, 0, 0, nullptr }, /* 0xAB */ + { 0xFF6C, 0, 0, nullptr }, /* 0xAC */ + { 0xFF6D, 0, 0, nullptr }, /* 0xAD */ + { 0xFF6E, 0, 0, nullptr }, /* 0xAE */ + { 0xFF6F, 0, 0, nullptr }, /* 0xAF */ + { 0xFF70, 0, 0, nullptr }, /* 0xB0 */ + { 0xFF71, 0, 0, nullptr }, /* 0xB1 */ + { 0xFF72, 0, 0, nullptr }, /* 0xB2 */ + { 0xFF73, 0, 0, nullptr }, /* 0xB3 */ + { 0xFF74, 0, 0, nullptr }, /* 0xB4 */ + { 0xFF75, 0, 0, nullptr }, /* 0xB5 */ + { 0xFF76, 0, 0, nullptr }, /* 0xB6 */ + { 0xFF77, 0, 0, nullptr }, /* 0xB7 */ + { 0xFF78, 0, 0, nullptr }, /* 0xB8 */ + { 0xFF79, 0, 0, nullptr }, /* 0xB9 */ + { 0xFF7A, 0, 0, nullptr }, /* 0xBA */ + { 0xFF7B, 0, 0, nullptr }, /* 0xBB */ + { 0xFF7C, 0, 0, nullptr }, /* 0xBC */ + { 0xFF7D, 0, 0, nullptr }, /* 0xBD */ + { 0xFF7E, 0, 0, nullptr }, /* 0xBE */ + { 0xFF7F, 0, 0, nullptr }, /* 0xBF */ + { 0xFF80, 0, 0, nullptr }, /* 0xC0 */ + { 0xFF81, 0, 0, nullptr }, /* 0xC1 */ + { 0xFF82, 0, 0, nullptr }, /* 0xC2 */ + { 0xFF83, 0, 0, nullptr }, /* 0xC3 */ + { 0xFF84, 0, 0, nullptr }, /* 0xC4 */ + { 0xFF85, 0, 0, nullptr }, /* 0xC5 */ + { 0xFF86, 0, 0, nullptr }, /* 0xC6 */ + { 0xFF87, 0, 0, nullptr }, /* 0xC7 */ + { 0xFF88, 0, 0, nullptr }, /* 0xC8 */ + { 0xFF89, 0, 0, nullptr }, /* 0xC9 */ + { 0xFF8A, 0, 0, nullptr }, /* 0xCA */ + { 0xFF8B, 0, 0, nullptr }, /* 0xCB */ + { 0xFF8C, 0, 0, nullptr }, /* 0xCC */ + { 0xFF8D, 0, 0, nullptr }, /* 0xCD */ + { 0xFF8E, 0, 0, nullptr }, /* 0xCE */ + { 0xFF8F, 0, 0, nullptr }, /* 0xCF */ + { 0xFF90, 0, 0, nullptr }, /* 0xD0 */ + { 0xFF91, 0, 0, nullptr }, /* 0xD1 */ + { 0xFF92, 0, 0, nullptr }, /* 0xD2 */ + { 0xFF93, 0, 0, nullptr }, /* 0xD3 */ + { 0xFF94, 0, 0, nullptr }, /* 0xD4 */ + { 0xFF95, 0, 0, nullptr }, /* 0xD5 */ + { 0xFF96, 0, 0, nullptr }, /* 0xD6 */ + { 0xFF97, 0, 0, nullptr }, /* 0xD7 */ + { 0xFF98, 0, 0, nullptr }, /* 0xD8 */ + { 0xFF99, 0, 0, nullptr }, /* 0xD9 */ + { 0xFF9A, 0, 0, nullptr }, /* 0xDA */ + { 0xFF9B, 0, 0, nullptr }, /* 0xDB */ + { 0xFF9C, 0, 0, nullptr }, /* 0xDC */ + { 0xFF9D, 0, 0, nullptr }, /* 0xDD */ + { 0xFF9E, 0, 0, nullptr }, /* 0xDE */ + { 0xFF9F, 0, 0, nullptr }, /* 0xDF */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E0 }, /* 0xE0 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E1 }, /* 0xE1 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E2 }, /* 0xE2 */ @@ -855,9 +855,9 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA }, /* 0xFA */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB }, /* 0xFB */ { 0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC }, /* 0xFC */ - { 0x00A9, 0, 0, NULL }, /* 0xFD */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0x2122, 0, 0, NULL }, /* 0xFE */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ - { 0x2026, 0, 0, NULL } /* 0xFF */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x00A9, 0, 0, nullptr }, /* 0xFD */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x2122, 0, 0, nullptr }, /* 0xFE */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ + { 0x2026, 0, 0, nullptr } /* 0xFF */ /* APPLE additions over SJIS, we convert this like apple, because I think, this gives better result, than we take a replacement char */ }; /* ----------------------------------------------------------------------- */ @@ -865,37 +865,37 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] = static ImplUniToDBCSHighTab const aMS932DBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_SJIS_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ - { 1, 0, NULL }, /* 0x02 */ + { 1, 0, nullptr }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_SJIS_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_SJIS_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0x3E, aImplUniToDBCSTab_SJIS_20 }, /* 0x20 */ { 0x03, 0xD4, aImplUniToDBCSTab_MS932_21 }, /* 0x21 */ { 0x00, 0xBF, aImplUniToDBCSTab_MS932_22 }, /* 0x22 */ @@ -903,45 +903,45 @@ static ImplUniToDBCSHighTab const aMS932DBCSHighTab[256] = { 0x60, 0x73, aImplUniToDBCSTab_MS932_24 }, /* 0x24 */ { 0x00, 0xEF, aImplUniToDBCSTab_SJIS_25 }, /* 0x25 */ { 0x05, 0x6F, aImplUniToDBCSTab_SJIS_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_SJIS_30 }, /* 0x30 */ - { 1, 0, NULL }, /* 0x31 */ + { 1, 0, nullptr }, /* 0x31 */ { 0x31, 0xA8, aImplUniToDBCSTab_MS932_32 }, /* 0x32 */ { 0x03, 0xCD, aImplUniToDBCSTab_MS932_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFC, aImplUniToDBCSTab_SJIS_4E }, /* 0x4E */ { 0x00, 0xFF, aImplUniToDBCSTab_SJIS_4F }, /* 0x4F */ { 0x05, 0xFB, aImplUniToDBCSTab_SJIS_50 }, /* 0x50 */ @@ -1024,101 +1024,101 @@ static ImplUniToDBCSHighTab const aMS932DBCSHighTab[256] = { 0x03, 0xFD, aImplUniToDBCSTab_SJIS_9D }, /* 0x9D */ { 0x19, 0xFD, aImplUniToDBCSTab_SJIS_9E }, /* 0x9E */ { 0x07, 0xA0, aImplUniToDBCSTab_SJIS_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x29, 0xDC, aImplUniToDBCSTab_MS932_F9 }, /* 0xF9 */ { 0x0E, 0x2D, aImplUniToDBCSTab_MS932_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_SJIS_FF } /* 0xFF */ }; @@ -1140,12 +1140,12 @@ static ImplTextEncodingData const aImplMS932TextEncodingData = { { &aImplMS932DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -1159,135 +1159,135 @@ static ImplTextEncodingData const aImplMS932TextEncodingData static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ /* is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C like MS CP392 */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ /* in SJIS this is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x005C, 0, 0, NULL }, /* 0x80 */ /* APPLE additions over SJIS */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ /* is A5 (YEN SIGN), but for compatibiliy with ascii, we use 0x5C like MS CP392 */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ /* in SJIS this is 0x0203E (SPACING OVERSCORE), but for compatibiliy with ascii, we use 0x7E (TILDE) like MS CP392 */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x005C, 0, 0, nullptr }, /* 0x80 */ /* APPLE additions over SJIS */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ @@ -1319,70 +1319,70 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9D }, /* 0x9D */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9E }, /* 0x9E */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9F }, /* 0x9F */ - { 0x00A0, 0, 0, NULL }, /* 0xA0 */ /* APPLE additions over SJIS */ - { 0xFF61, 0, 0, NULL }, /* 0xA1 */ - { 0xFF62, 0, 0, NULL }, /* 0xA2 */ - { 0xFF63, 0, 0, NULL }, /* 0xA3 */ - { 0xFF64, 0, 0, NULL }, /* 0xA4 */ - { 0xFF65, 0, 0, NULL }, /* 0xA5 */ - { 0xFF66, 0, 0, NULL }, /* 0xA6 */ - { 0xFF67, 0, 0, NULL }, /* 0xA7 */ - { 0xFF68, 0, 0, NULL }, /* 0xA8 */ - { 0xFF69, 0, 0, NULL }, /* 0xA9 */ - { 0xFF6A, 0, 0, NULL }, /* 0xAA */ - { 0xFF6B, 0, 0, NULL }, /* 0xAB */ - { 0xFF6C, 0, 0, NULL }, /* 0xAC */ - { 0xFF6D, 0, 0, NULL }, /* 0xAD */ - { 0xFF6E, 0, 0, NULL }, /* 0xAE */ - { 0xFF6F, 0, 0, NULL }, /* 0xAF */ - { 0xFF70, 0, 0, NULL }, /* 0xB0 */ - { 0xFF71, 0, 0, NULL }, /* 0xB1 */ - { 0xFF72, 0, 0, NULL }, /* 0xB2 */ - { 0xFF73, 0, 0, NULL }, /* 0xB3 */ - { 0xFF74, 0, 0, NULL }, /* 0xB4 */ - { 0xFF75, 0, 0, NULL }, /* 0xB5 */ - { 0xFF76, 0, 0, NULL }, /* 0xB6 */ - { 0xFF77, 0, 0, NULL }, /* 0xB7 */ - { 0xFF78, 0, 0, NULL }, /* 0xB8 */ - { 0xFF79, 0, 0, NULL }, /* 0xB9 */ - { 0xFF7A, 0, 0, NULL }, /* 0xBA */ - { 0xFF7B, 0, 0, NULL }, /* 0xBB */ - { 0xFF7C, 0, 0, NULL }, /* 0xBC */ - { 0xFF7D, 0, 0, NULL }, /* 0xBD */ - { 0xFF7E, 0, 0, NULL }, /* 0xBE */ - { 0xFF7F, 0, 0, NULL }, /* 0xBF */ - { 0xFF80, 0, 0, NULL }, /* 0xC0 */ - { 0xFF81, 0, 0, NULL }, /* 0xC1 */ - { 0xFF82, 0, 0, NULL }, /* 0xC2 */ - { 0xFF83, 0, 0, NULL }, /* 0xC3 */ - { 0xFF84, 0, 0, NULL }, /* 0xC4 */ - { 0xFF85, 0, 0, NULL }, /* 0xC5 */ - { 0xFF86, 0, 0, NULL }, /* 0xC6 */ - { 0xFF87, 0, 0, NULL }, /* 0xC7 */ - { 0xFF88, 0, 0, NULL }, /* 0xC8 */ - { 0xFF89, 0, 0, NULL }, /* 0xC9 */ - { 0xFF8A, 0, 0, NULL }, /* 0xCA */ - { 0xFF8B, 0, 0, NULL }, /* 0xCB */ - { 0xFF8C, 0, 0, NULL }, /* 0xCC */ - { 0xFF8D, 0, 0, NULL }, /* 0xCD */ - { 0xFF8E, 0, 0, NULL }, /* 0xCE */ - { 0xFF8F, 0, 0, NULL }, /* 0xCF */ - { 0xFF90, 0, 0, NULL }, /* 0xD0 */ - { 0xFF91, 0, 0, NULL }, /* 0xD1 */ - { 0xFF92, 0, 0, NULL }, /* 0xD2 */ - { 0xFF93, 0, 0, NULL }, /* 0xD3 */ - { 0xFF94, 0, 0, NULL }, /* 0xD4 */ - { 0xFF95, 0, 0, NULL }, /* 0xD5 */ - { 0xFF96, 0, 0, NULL }, /* 0xD6 */ - { 0xFF97, 0, 0, NULL }, /* 0xD7 */ - { 0xFF98, 0, 0, NULL }, /* 0xD8 */ - { 0xFF99, 0, 0, NULL }, /* 0xD9 */ - { 0xFF9A, 0, 0, NULL }, /* 0xDA */ - { 0xFF9B, 0, 0, NULL }, /* 0xDB */ - { 0xFF9C, 0, 0, NULL }, /* 0xDC */ - { 0xFF9D, 0, 0, NULL }, /* 0xDD */ - { 0xFF9E, 0, 0, NULL }, /* 0xDE */ - { 0xFF9F, 0, 0, NULL }, /* 0xDF */ + { 0x00A0, 0, 0, nullptr }, /* 0xA0 */ /* APPLE additions over SJIS */ + { 0xFF61, 0, 0, nullptr }, /* 0xA1 */ + { 0xFF62, 0, 0, nullptr }, /* 0xA2 */ + { 0xFF63, 0, 0, nullptr }, /* 0xA3 */ + { 0xFF64, 0, 0, nullptr }, /* 0xA4 */ + { 0xFF65, 0, 0, nullptr }, /* 0xA5 */ + { 0xFF66, 0, 0, nullptr }, /* 0xA6 */ + { 0xFF67, 0, 0, nullptr }, /* 0xA7 */ + { 0xFF68, 0, 0, nullptr }, /* 0xA8 */ + { 0xFF69, 0, 0, nullptr }, /* 0xA9 */ + { 0xFF6A, 0, 0, nullptr }, /* 0xAA */ + { 0xFF6B, 0, 0, nullptr }, /* 0xAB */ + { 0xFF6C, 0, 0, nullptr }, /* 0xAC */ + { 0xFF6D, 0, 0, nullptr }, /* 0xAD */ + { 0xFF6E, 0, 0, nullptr }, /* 0xAE */ + { 0xFF6F, 0, 0, nullptr }, /* 0xAF */ + { 0xFF70, 0, 0, nullptr }, /* 0xB0 */ + { 0xFF71, 0, 0, nullptr }, /* 0xB1 */ + { 0xFF72, 0, 0, nullptr }, /* 0xB2 */ + { 0xFF73, 0, 0, nullptr }, /* 0xB3 */ + { 0xFF74, 0, 0, nullptr }, /* 0xB4 */ + { 0xFF75, 0, 0, nullptr }, /* 0xB5 */ + { 0xFF76, 0, 0, nullptr }, /* 0xB6 */ + { 0xFF77, 0, 0, nullptr }, /* 0xB7 */ + { 0xFF78, 0, 0, nullptr }, /* 0xB8 */ + { 0xFF79, 0, 0, nullptr }, /* 0xB9 */ + { 0xFF7A, 0, 0, nullptr }, /* 0xBA */ + { 0xFF7B, 0, 0, nullptr }, /* 0xBB */ + { 0xFF7C, 0, 0, nullptr }, /* 0xBC */ + { 0xFF7D, 0, 0, nullptr }, /* 0xBD */ + { 0xFF7E, 0, 0, nullptr }, /* 0xBE */ + { 0xFF7F, 0, 0, nullptr }, /* 0xBF */ + { 0xFF80, 0, 0, nullptr }, /* 0xC0 */ + { 0xFF81, 0, 0, nullptr }, /* 0xC1 */ + { 0xFF82, 0, 0, nullptr }, /* 0xC2 */ + { 0xFF83, 0, 0, nullptr }, /* 0xC3 */ + { 0xFF84, 0, 0, nullptr }, /* 0xC4 */ + { 0xFF85, 0, 0, nullptr }, /* 0xC5 */ + { 0xFF86, 0, 0, nullptr }, /* 0xC6 */ + { 0xFF87, 0, 0, nullptr }, /* 0xC7 */ + { 0xFF88, 0, 0, nullptr }, /* 0xC8 */ + { 0xFF89, 0, 0, nullptr }, /* 0xC9 */ + { 0xFF8A, 0, 0, nullptr }, /* 0xCA */ + { 0xFF8B, 0, 0, nullptr }, /* 0xCB */ + { 0xFF8C, 0, 0, nullptr }, /* 0xCC */ + { 0xFF8D, 0, 0, nullptr }, /* 0xCD */ + { 0xFF8E, 0, 0, nullptr }, /* 0xCE */ + { 0xFF8F, 0, 0, nullptr }, /* 0xCF */ + { 0xFF90, 0, 0, nullptr }, /* 0xD0 */ + { 0xFF91, 0, 0, nullptr }, /* 0xD1 */ + { 0xFF92, 0, 0, nullptr }, /* 0xD2 */ + { 0xFF93, 0, 0, nullptr }, /* 0xD3 */ + { 0xFF94, 0, 0, nullptr }, /* 0xD4 */ + { 0xFF95, 0, 0, nullptr }, /* 0xD5 */ + { 0xFF96, 0, 0, nullptr }, /* 0xD6 */ + { 0xFF97, 0, 0, nullptr }, /* 0xD7 */ + { 0xFF98, 0, 0, nullptr }, /* 0xD8 */ + { 0xFF99, 0, 0, nullptr }, /* 0xD9 */ + { 0xFF9A, 0, 0, nullptr }, /* 0xDA */ + { 0xFF9B, 0, 0, nullptr }, /* 0xDB */ + { 0xFF9C, 0, 0, nullptr }, /* 0xDC */ + { 0xFF9D, 0, 0, nullptr }, /* 0xDD */ + { 0xFF9E, 0, 0, nullptr }, /* 0xDE */ + { 0xFF9F, 0, 0, nullptr }, /* 0xDF */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E0 }, /* 0xE0 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E1 }, /* 0xE1 */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_E2 }, /* 0xE2 */ @@ -1412,9 +1412,9 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA }, /* 0xFA */ /* We use the MS table for better MS compatibility */ { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB }, /* 0xFB */ /* We use the MS table for better MS compatibility */ { 0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC }, /* 0xFC */ /* We use the MS table for better MS compatibility */ - { 0x00A9, 0, 0, NULL }, /* 0xFD */ /* APPLE additions over SJIS */ - { 0x2122, 0, 0, NULL }, /* 0xFE */ /* APPLE additions over SJIS */ - { 0x2026, 0, 0, NULL } /* 0xFF */ /* APPLE additions over SJIS */ + { 0x00A9, 0, 0, nullptr }, /* 0xFD */ /* APPLE additions over SJIS */ + { 0x2122, 0, 0, nullptr }, /* 0xFE */ /* APPLE additions over SJIS */ + { 0x2026, 0, 0, nullptr } /* 0xFF */ /* APPLE additions over SJIS */ }; /* ----------------------------------------------------------------------- */ @@ -1422,37 +1422,37 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] = static ImplUniToDBCSHighTab const aAPPLEJAPANESEDBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_APPLEJAPANESE_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ - { 1, 0, NULL }, /* 0x02 */ + { 1, 0, nullptr }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_SJIS_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_SJIS_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0x3E, aImplUniToDBCSTab_SJIS_20 }, /* 0x20 */ { 0x03, 0xE9, aImplUniToDBCSTab_APPLEJAPANESE_21 }, /* 0x21 */ { 0x00, 0xEF, aImplUniToDBCSTab_APPLEJAPANESE_22 }, /* 0x22 */ @@ -1461,44 +1461,44 @@ static ImplUniToDBCSHighTab const aAPPLEJAPANESEDBCSHighTab[256] = { 0x00, 0xEF, aImplUniToDBCSTab_SJIS_25 }, /* 0x25 */ { 0x05, 0x6F, aImplUniToDBCSTab_APPLEJAPANESE_26 }, /* 0x26 */ { 0x76, 0x7E, aImplUniToDBCSTab_APPLEJAPANESE_27 }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_APPLEJAPANESE_30 }, /* 0x30 */ - { 1, 0, NULL }, /* 0x31 */ + { 1, 0, nullptr }, /* 0x31 */ { 0x2A, 0xA9, aImplUniToDBCSTab_APPLEJAPANESE_32 }, /* 0x32 */ { 0x00, 0xD4, aImplUniToDBCSTab_APPLEJAPANESE_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFC, aImplUniToDBCSTab_SJIS_4E }, /* 0x4E */ { 0x00, 0xFF, aImplUniToDBCSTab_SJIS_4F }, /* 0x4F */ { 0x05, 0xFB, aImplUniToDBCSTab_SJIS_50 }, /* 0x50 */ @@ -1581,100 +1581,100 @@ static ImplUniToDBCSHighTab const aAPPLEJAPANESEDBCSHighTab[256] = { 0x03, 0xFD, aImplUniToDBCSTab_SJIS_9D }, /* 0x9D */ { 0x19, 0xFD, aImplUniToDBCSTab_SJIS_9E }, /* 0x9E */ { 0x07, 0xA0, aImplUniToDBCSTab_SJIS_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x29, 0xDC, aImplUniToDBCSTab_MS932_F9 }, /* 0xF9 */ { 0x0E, 0x2D, aImplUniToDBCSTab_MS932_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x44, aImplUniToDBCSTab_APPLEJAPANESE_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_SJIS_FF } /* 0xFF */ }; @@ -1697,12 +1697,12 @@ static ImplTextEncodingData const aImplAPPLEJAPANESETextEncodingData = { { &aImplAPPLEJAPANESEDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -1716,22 +1716,22 @@ static ImplTextEncodingData const aImplAPPLEJAPANESETextEncodingData static ImplDBCSToUniLeadTab const aJIS0208UniLeadTab[128] = { - { 0, 1, 0, NULL }, /* 0x00 */ - { 0, 1, 0, NULL }, /* 0x01 */ - { 0, 1, 0, NULL }, /* 0x02 */ - { 0, 1, 0, NULL }, /* 0x03 */ - { 0, 1, 0, NULL }, /* 0x04 */ - { 0, 1, 0, NULL }, /* 0x05 */ - { 0, 1, 0, NULL }, /* 0x06 */ - { 0, 1, 0, NULL }, /* 0x07 */ - { 0, 1, 0, NULL }, /* 0x08 */ - { 0, 1, 0, NULL }, /* 0x09 */ - { 0, 1, 0, NULL }, /* 0x0A */ - { 0, 1, 0, NULL }, /* 0x0B */ - { 0, 1, 0, NULL }, /* 0x0C */ - { 0, 1, 0, NULL }, /* 0x0D */ - { 0, 1, 0, NULL }, /* 0x0E */ - { 0, 1, 0, NULL }, /* 0x0F */ + { 0, 1, 0, nullptr }, /* 0x00 */ + { 0, 1, 0, nullptr }, /* 0x01 */ + { 0, 1, 0, nullptr }, /* 0x02 */ + { 0, 1, 0, nullptr }, /* 0x03 */ + { 0, 1, 0, nullptr }, /* 0x04 */ + { 0, 1, 0, nullptr }, /* 0x05 */ + { 0, 1, 0, nullptr }, /* 0x06 */ + { 0, 1, 0, nullptr }, /* 0x07 */ + { 0, 1, 0, nullptr }, /* 0x08 */ + { 0, 1, 0, nullptr }, /* 0x09 */ + { 0, 1, 0, nullptr }, /* 0x0A */ + { 0, 1, 0, nullptr }, /* 0x0B */ + { 0, 1, 0, nullptr }, /* 0x0C */ + { 0, 1, 0, nullptr }, /* 0x0D */ + { 0, 1, 0, nullptr }, /* 0x0E */ + { 0, 1, 0, nullptr }, /* 0x0F */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x10 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x11 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x12 */ /* We convert this as double byte */ @@ -1843,7 +1843,7 @@ static ImplDBCSToUniLeadTab const aJIS0208UniLeadTab[128] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7C */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7E */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0x7F */ + { 0, 1, 0, nullptr } /* 0x7F */ }; /* ----------------------------------------------------------------------- */ @@ -1851,37 +1851,37 @@ static ImplDBCSToUniLeadTab const aJIS0208UniLeadTab[128] = static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] = { { 0xA2, 0xF7, aImplUniToDBCSTab_JIS0208_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ - { 1, 0, NULL }, /* 0x02 */ + { 1, 0, nullptr }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_JIS0208_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_JIS0208_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0x3B, aImplUniToDBCSTab_JIS0208_20 }, /* 0x20 */ { 0x03, 0xD4, aImplUniToDBCSTab_JIS0208_21 }, /* 0x21 */ { 0x00, 0xBF, aImplUniToDBCSTab_JIS0208_22 }, /* 0x22 */ @@ -1889,45 +1889,45 @@ static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] = { 0x60, 0x73, aImplUniToDBCSTab_JIS0208_24 }, /* 0x24 */ { 0x00, 0xEF, aImplUniToDBCSTab_JIS0208_25 }, /* 0x25 */ { 0x05, 0x6F, aImplUniToDBCSTab_JIS0208_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_JIS0208_30 }, /* 0x30 */ - { 1, 0, NULL }, /* 0x31 */ + { 1, 0, nullptr }, /* 0x31 */ { 0x31, 0xA8, aImplUniToDBCSTab_JIS0208_32 }, /* 0x32 */ { 0x03, 0xCD, aImplUniToDBCSTab_JIS0208_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFB, aImplUniToDBCSTab_JIS0208_4E }, /* 0x4E */ { 0x01, 0xFE, aImplUniToDBCSTab_JIS0208_4F }, /* 0x4F */ { 0x05, 0xFB, aImplUniToDBCSTab_JIS0208_50 }, /* 0x50 */ @@ -2010,101 +2010,101 @@ static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] = { 0x03, 0xFD, aImplUniToDBCSTab_JIS0208_9D }, /* 0x9D */ { 0x1A, 0xFD, aImplUniToDBCSTab_JIS0208_9E }, /* 0x9E */ { 0x07, 0xA0, aImplUniToDBCSTab_JIS0208_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ - { 1, 0, NULL }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xFA */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_JIS0208_FF } /* 0xFF */ }; @@ -2112,22 +2112,22 @@ static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] = static ImplDBCSToUniLeadTab const aJIS0212UniLeadTab[128] = { - { 0, 1, 0, NULL }, /* 0x00 */ - { 0, 1, 0, NULL }, /* 0x01 */ - { 0, 1, 0, NULL }, /* 0x02 */ - { 0, 1, 0, NULL }, /* 0x03 */ - { 0, 1, 0, NULL }, /* 0x04 */ - { 0, 1, 0, NULL }, /* 0x05 */ - { 0, 1, 0, NULL }, /* 0x06 */ - { 0, 1, 0, NULL }, /* 0x07 */ - { 0, 1, 0, NULL }, /* 0x08 */ - { 0, 1, 0, NULL }, /* 0x09 */ - { 0, 1, 0, NULL }, /* 0x0A */ - { 0, 1, 0, NULL }, /* 0x0B */ - { 0, 1, 0, NULL }, /* 0x0C */ - { 0, 1, 0, NULL }, /* 0x0D */ - { 0, 1, 0, NULL }, /* 0x0E */ - { 0, 1, 0, NULL }, /* 0x0F */ + { 0, 1, 0, nullptr }, /* 0x00 */ + { 0, 1, 0, nullptr }, /* 0x01 */ + { 0, 1, 0, nullptr }, /* 0x02 */ + { 0, 1, 0, nullptr }, /* 0x03 */ + { 0, 1, 0, nullptr }, /* 0x04 */ + { 0, 1, 0, nullptr }, /* 0x05 */ + { 0, 1, 0, nullptr }, /* 0x06 */ + { 0, 1, 0, nullptr }, /* 0x07 */ + { 0, 1, 0, nullptr }, /* 0x08 */ + { 0, 1, 0, nullptr }, /* 0x09 */ + { 0, 1, 0, nullptr }, /* 0x0A */ + { 0, 1, 0, nullptr }, /* 0x0B */ + { 0, 1, 0, nullptr }, /* 0x0C */ + { 0, 1, 0, nullptr }, /* 0x0D */ + { 0, 1, 0, nullptr }, /* 0x0E */ + { 0, 1, 0, nullptr }, /* 0x0F */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x10 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x11 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x12 */ /* We convert this as double byte */ @@ -2239,7 +2239,7 @@ static ImplDBCSToUniLeadTab const aJIS0212UniLeadTab[128] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7C */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x7E */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0x7F */ + { 0, 1, 0, nullptr } /* 0x7F */ }; /* ----------------------------------------------------------------------- */ @@ -2251,79 +2251,79 @@ static ImplUniToDBCSHighTab const aJIS0212DBCSHighTab[256] = { 0xC7, 0xDD, aImplUniToDBCSTab_JIS0212_02 }, /* 0x02 */ { 0x84, 0xCE, aImplUniToDBCSTab_JIS0212_03 }, /* 0x03 */ { 0x02, 0x5F, aImplUniToDBCSTab_JIS0212_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ - { 1, 0, NULL }, /* 0x20 */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x20 */ { 0x16, 0x22, aImplUniToDBCSTab_JIS0212_21 }, /* 0x21 */ - { 1, 0, NULL }, /* 0x22 */ - { 1, 0, NULL }, /* 0x23 */ - { 1, 0, NULL }, /* 0x24 */ - { 1, 0, NULL }, /* 0x25 */ - { 1, 0, NULL }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ - { 1, 0, NULL }, /* 0x30 */ - { 1, 0, NULL }, /* 0x31 */ - { 1, 0, NULL }, /* 0x32 */ - { 1, 0, NULL }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x22 */ + { 1, 0, nullptr }, /* 0x23 */ + { 1, 0, nullptr }, /* 0x24 */ + { 1, 0, nullptr }, /* 0x25 */ + { 1, 0, nullptr }, /* 0x26 */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x30 */ + { 1, 0, nullptr }, /* 0x31 */ + { 1, 0, nullptr }, /* 0x32 */ + { 1, 0, nullptr }, /* 0x33 */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x02, 0xFF, aImplUniToDBCSTab_JIS0212_4E }, /* 0x4E */ { 0x00, 0xFF, aImplUniToDBCSTab_JIS0212_4F }, /* 0x4F */ { 0x00, 0xFE, aImplUniToDBCSTab_JIS0212_50 }, /* 0x50 */ @@ -2406,102 +2406,102 @@ static ImplUniToDBCSHighTab const aJIS0212DBCSHighTab[256] = { 0x02, 0xFE, aImplUniToDBCSTab_JIS0212_9D }, /* 0x9D */ { 0x02, 0xFF, aImplUniToDBCSTab_JIS0212_9E }, /* 0x9E */ { 0x02, 0xA5, aImplUniToDBCSTab_JIS0212_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ - { 1, 0, NULL }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ - { 1, 0, NULL } /* 0xFF */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xFA */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ + { 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -2520,12 +2520,12 @@ static ImplTextEncodingData const aImplEUCJPTextEncodingData = { { &aImplEUCJPCvtData, ImplEUCJPToUnicode, ImplUnicodeToEUCJP, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 3, 2, @@ -2556,13 +2556,13 @@ static unsigned char const aImplJISX0201Tab[HALFWIDTHKANA_END - HALFWIDTHKANA_ST static ImplByteConvertData const aImplJISX0201ByteCvtData = { - NULL, - NULL, + nullptr, + nullptr, 0, 0, 0, 0, aImplJISX0201Tab, - NULL, - NULL, + nullptr, + nullptr, HALFWIDTHKANA_START, HALFWIDTHKANA_END, 0, 0, 0 @@ -2572,14 +2572,14 @@ static ImplByteConvertData const aImplJISX0201ByteCvtData = static ImplTextEncodingData const aImplJISX0201TextEncodingData = { { &aImplJISX0201ByteCvtData, - NULL, + nullptr, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -2593,11 +2593,11 @@ static ImplTextEncodingData const aImplJISX0201TextEncodingData static ImplDBCSConvertData const aImplJISX0208DBCSCvtData = { - NULL, + nullptr, aJIS0208DBCSHighTab, 0x00, 0xFF, 0x21, 0x7E, - NULL, + nullptr, 0 }; @@ -2605,14 +2605,14 @@ static ImplDBCSConvertData const aImplJISX0208DBCSCvtData = static ImplTextEncodingData const aImplJISX0208TextEncodingData = { { &aImplJISX0208DBCSCvtData, - NULL, + nullptr, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 2, 2, 2, @@ -2626,11 +2626,11 @@ static ImplTextEncodingData const aImplJISX0208TextEncodingData static ImplDBCSConvertData const aImplJISX0212DBCSCvtData = { - NULL, + nullptr, aJIS0212DBCSHighTab, 0x00, 0xFF, 0x21, 0x7E, - NULL, + nullptr, 0 }; @@ -2638,14 +2638,14 @@ static ImplDBCSConvertData const aImplJISX0212DBCSCvtData = static ImplTextEncodingData const aImplJISX0212TextEncodingData = { { &aImplJISX0212DBCSCvtData, - NULL, + nullptr, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 2, 2, 2, diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 4aef7a108bb7..384c12045956 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -30,135 +30,135 @@ static ImplDBCSToUniLeadTab const aKSC5601UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0, 1, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0, 1, 0, nullptr }, /* 0x80 */ { 0, 0x41, 0xFE, aImplDBCSToUniTab_KSC5601_81 }, /* 0x81 */ { 0, 0x41, 0xFE, aImplDBCSToUniTab_KSC5601_82 }, /* 0x82 */ { 0, 0x41, 0xFE, aImplDBCSToUniTab_KSC5601_83 }, /* 0x83 */ @@ -285,7 +285,7 @@ static ImplDBCSToUniLeadTab const aKSC5601UniLeadTab[256] = { 0, 0xA1, 0xFE, aImplDBCSToUniTab_KSC5601_FC }, /* 0xFC */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_KSC5601_FD }, /* 0xFD */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFE */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -297,33 +297,33 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0xC7, 0xDD, aImplUniToDBCSTab_KSC5601_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_KSC5601_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_KSC5601_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x15, 0xAC, aImplUniToDBCSTab_KSC5601_20 }, /* 0x20 */ { 0x03, 0xD4, aImplUniToDBCSTab_KSC5601_21 }, /* 0x21 */ { 0x00, 0xA5, aImplUniToDBCSTab_KSC5601_22 }, /* 0x22 */ @@ -331,45 +331,45 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0x60, 0xE9, aImplUniToDBCSTab_KSC5601_24 }, /* 0x24 */ { 0x00, 0xD1, aImplUniToDBCSTab_KSC5601_25 }, /* 0x25 */ { 0x05, 0x6D, aImplUniToDBCSTab_KSC5601_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xF6, aImplUniToDBCSTab_KSC5601_30 }, /* 0x30 */ { 0x31, 0x8E, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_KSC5601_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_KSC5601_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFB, aImplUniToDBCSTab_KSC5601_4E }, /* 0x4E */ { 0x01, 0xFA, aImplUniToDBCSTab_KSC5601_4F }, /* 0x4F */ { 0x02, 0xFF, aImplUniToDBCSTab_KSC5601_50 }, /* 0x50 */ @@ -452,18 +452,18 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0x09, 0xFA, aImplUniToDBCSTab_KSC5601_9D }, /* 0x9D */ { 0x1A, 0xF4, aImplUniToDBCSTab_KSC5601_9E }, /* 0x9E */ { 0x07, 0x9C, aImplUniToDBCSTab_KSC5601_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_AC }, /* 0xAC */ { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_AD }, /* 0xAD */ { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_AE }, /* 0xAE */ @@ -508,45 +508,45 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_D5 }, /* 0xD5 */ { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_D6 }, /* 0xD6 */ { 0x00, 0xA3, aImplUniToDBCSTab_KSC5601_D7 }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_F9 }, /* 0xF9 */ { 0x00, 0x0B, aImplUniToDBCSTab_KSC5601_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ { 0x01, 0xE6, aImplUniToDBCSTab_KSC5601_FF } /* 0xFF */ }; @@ -597,12 +597,12 @@ static ImplTextEncodingData const aImplEUCKRTextEncodingData = { { &aImplKSC5601DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -620,12 +620,12 @@ static ImplTextEncodingData const aImplMS949TextEncodingData = { { &aImplMS949DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -643,12 +643,12 @@ static ImplTextEncodingData const aImplAPPLEKOREANTextEncodingData = { { &aImplMS949DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -662,138 +662,138 @@ static ImplTextEncodingData const aImplAPPLEKOREANTextEncodingData static ImplDBCSToUniLeadTab const aJOHABUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x0080, 0, 0, NULL }, /* 0x80 */ - { 0x0081, 0, 0, NULL }, /* 0x81 */ - { 0x0082, 0, 0, NULL }, /* 0x82 */ - { 0x0083, 0, 0, NULL }, /* 0x83 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x0080, 0, 0, nullptr }, /* 0x80 */ + { 0x0081, 0, 0, nullptr }, /* 0x81 */ + { 0x0082, 0, 0, nullptr }, /* 0x82 */ + { 0x0083, 0, 0, nullptr }, /* 0x83 */ { 0, 0x44, 0xE1, aImplDBCSToUniTab_JOHAB_84 }, /* 0x84 */ { 0, 0x41, 0xE1, aImplDBCSToUniTab_JOHAB_85 }, /* 0x85 */ { 0, 0x41, 0xE1, aImplDBCSToUniTab_JOHAB_86 }, /* 0x86 */ @@ -874,10 +874,10 @@ static ImplDBCSToUniLeadTab const aJOHABUniLeadTab[256] = { 0, 0x41, 0xFD, aImplDBCSToUniTab_JOHAB_D1 }, /* 0xD1 */ { 0, 0x41, 0xFD, aImplDBCSToUniTab_JOHAB_D2 }, /* 0xD2 */ { 0, 0x41, 0xBD, aImplDBCSToUniTab_JOHAB_D3 }, /* 0xD3 */ - { 0, 1, 0, NULL }, /* 0xD4 */ - { 0, 1, 0, NULL }, /* 0xD5 */ - { 0, 1, 0, NULL }, /* 0xD6 */ - { 0, 1, 0, NULL }, /* 0xD7 */ + { 0, 1, 0, nullptr }, /* 0xD4 */ + { 0, 1, 0, nullptr }, /* 0xD5 */ + { 0, 1, 0, nullptr }, /* 0xD6 */ + { 0, 1, 0, nullptr }, /* 0xD7 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xD8 */ /* We convert this as double byte */ { 0, 0x31, 0xE5, aImplDBCSToUniTab_JOHAB_D9 }, /* 0xD9 */ { 0, 0x31, 0xFE, aImplDBCSToUniTab_JOHAB_DA }, /* 0xDA */ @@ -912,12 +912,12 @@ static ImplDBCSToUniLeadTab const aJOHABUniLeadTab[256] = { 0, 0x31, 0xFE, aImplDBCSToUniTab_JOHAB_F7 }, /* 0xF7 */ { 0, 0x31, 0xFE, aImplDBCSToUniTab_JOHAB_F8 }, /* 0xF8 */ { 0, 0x31, 0xFE, aImplDBCSToUniTab_JOHAB_F9 }, /* 0xF9 */ - { 0, 1, 0, NULL }, /* 0xFA */ - { 0, 1, 0, NULL }, /* 0xFB */ - { 0, 1, 0, NULL }, /* 0xFC */ - { 0, 1, 0, NULL }, /* 0xFD */ - { 0, 1, 0, NULL }, /* 0xFE */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr }, /* 0xFA */ + { 0, 1, 0, nullptr }, /* 0xFB */ + { 0, 1, 0, nullptr }, /* 0xFC */ + { 0, 1, 0, nullptr }, /* 0xFD */ + { 0, 1, 0, nullptr }, /* 0xFE */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -929,33 +929,33 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0xC7, 0xDD, aImplUniToDBCSTab_JOHAB_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_JOHAB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_JOHAB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x15, 0xA9, aImplUniToDBCSTab_JOHAB_20 }, /* 0x20 */ { 0x03, 0xD4, aImplUniToDBCSTab_JOHAB_21 }, /* 0x21 */ { 0x00, 0xA5, aImplUniToDBCSTab_JOHAB_22 }, /* 0x22 */ @@ -963,45 +963,45 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x60, 0xE9, aImplUniToDBCSTab_JOHAB_24 }, /* 0x24 */ { 0x00, 0xD1, aImplUniToDBCSTab_JOHAB_25 }, /* 0x25 */ { 0x05, 0x6D, aImplUniToDBCSTab_JOHAB_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xF6, aImplUniToDBCSTab_JOHAB_30 }, /* 0x30 */ { 0x31, 0x8E, aImplUniToDBCSTab_JOHAB_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_JOHAB_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_JOHAB_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFB, aImplUniToDBCSTab_JOHAB_4E }, /* 0x4E */ { 0x01, 0xFA, aImplUniToDBCSTab_JOHAB_4F }, /* 0x4F */ { 0x02, 0xFF, aImplUniToDBCSTab_JOHAB_50 }, /* 0x50 */ @@ -1084,18 +1084,18 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x09, 0xFA, aImplUniToDBCSTab_JOHAB_9D }, /* 0x9D */ { 0x1A, 0xF4, aImplUniToDBCSTab_JOHAB_9E }, /* 0x9E */ { 0x07, 0x9C, aImplUniToDBCSTab_JOHAB_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_AC }, /* 0xAC */ { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_AD }, /* 0xAD */ { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_AE }, /* 0xAE */ @@ -1140,45 +1140,45 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_D5 }, /* 0xD5 */ { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_D6 }, /* 0xD6 */ { 0x00, 0xA3, aImplUniToDBCSTab_JOHAB_D7 }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_F9 }, /* 0xF9 */ { 0x00, 0x0B, aImplUniToDBCSTab_JOHAB_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ - { 1, 0, NULL }, /* 0xFE */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFE */ { 0x01, 0xE6, aImplUniToDBCSTab_JOHAB_FF } /* 0xFF */ }; @@ -1217,12 +1217,12 @@ static ImplTextEncodingData const aImplMS1361TextEncodingData = { { &aImplJOHABDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab index b8a396652f6d..ace0c1ced2b8 100644 --- a/sal/textenc/tcvtlat1.tab +++ b/sal/textenc/tcvtlat1.tab @@ -170,11 +170,11 @@ static ImplUniCharTabData const aImplIBM437ToCharTabEx[IBM437TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM437ByteCvtData = { aImplIBM437ToUniTab, - NULL, + nullptr, IBM437UNI_START, IBM437UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM437ToCharTab, - NULL, + nullptr, aImplIBM437ToCharTabEx, IBM437CHAR_START, IBM437CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -187,12 +187,12 @@ static ImplTextEncodingData const aImplIBM437TextEncodingData = { { &aImplIBM437ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -304,11 +304,11 @@ static ImplUniCharTabData const aImplIBM850ToCharTabEx[IBM850TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM850ByteCvtData = { aImplIBM850ToUniTab, - NULL, + nullptr, IBM850UNI_START, IBM850UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM850ToCharTab, - NULL, + nullptr, aImplIBM850ToCharTabEx, IBM850CHAR_START, IBM850CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -321,12 +321,12 @@ static ImplTextEncodingData const aImplIBM850TextEncodingData = { { &aImplIBM850ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -477,11 +477,11 @@ static ImplUniCharTabData const aImplIBM860ToCharTabEx[IBM860TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM860ByteCvtData = { aImplIBM860ToUniTab, - NULL, + nullptr, IBM860UNI_START, IBM860UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM860ToCharTab, - NULL, + nullptr, aImplIBM860ToCharTabEx, IBM860CHAR_START, IBM860CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -494,12 +494,12 @@ static ImplTextEncodingData const aImplIBM860TextEncodingData = { { &aImplIBM860ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -652,11 +652,11 @@ static ImplUniCharTabData const aImplIBM861ToCharTabEx[IBM861TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM861ByteCvtData = { aImplIBM861ToUniTab, - NULL, + nullptr, IBM861UNI_START, IBM861UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM861ToCharTab, - NULL, + nullptr, aImplIBM861ToCharTabEx, IBM861CHAR_START, IBM861CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -669,12 +669,12 @@ static ImplTextEncodingData const aImplIBM861TextEncodingData = { { &aImplIBM861ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -827,11 +827,11 @@ static ImplUniCharTabData const aImplIBM863ToCharTabEx[IBM863TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM863ByteCvtData = { aImplIBM863ToUniTab, - NULL, + nullptr, IBM863UNI_START, IBM863UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM863ToCharTab, - NULL, + nullptr, aImplIBM863ToCharTabEx, IBM863CHAR_START, IBM863CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -844,12 +844,12 @@ static ImplTextEncodingData const aImplIBM863TextEncodingData = { { &aImplIBM863ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1002,11 +1002,11 @@ static ImplUniCharTabData const aImplIBM865ToCharTabEx[IBM865TOCHARTABEX_COUNT] static ImplByteConvertData const aImplIBM865ByteCvtData = { aImplIBM865ToUniTab, - NULL, + nullptr, IBM865UNI_START, IBM865UNI_END, NOTABUNI_START, NOTABUNI_END, aImplIBM865ToCharTab, - NULL, + nullptr, aImplIBM865ToCharTabEx, IBM865CHAR_START, IBM865CHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1019,12 +1019,12 @@ static ImplTextEncodingData const aImplIBM865TextEncodingData = { { &aImplIBM865ByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1147,12 +1147,12 @@ static ImplTextEncodingData const aImplISO885914TextEncodingData = { { &aImplISO885914ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1249,12 +1249,12 @@ static ImplTextEncodingData const aImplISO885915TextEncodingData = { { &aImplISO885915ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1372,11 +1372,11 @@ static ImplUniCharTabData const aImplAPPLEICELANDToCharTabEx[APPLEICELANDTOCHART static ImplByteConvertData const aImplAPPLEICELANDByteCvtData = { aImplAPPLEICELANDToUniTab, - NULL, + nullptr, APPLEICELANDUNI_START, APPLEICELANDUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLEICELANDToCharTab, - NULL, + nullptr, aImplAPPLEICELANDToCharTabEx, APPLEICELANDCHAR_START, APPLEICELANDCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1389,12 +1389,12 @@ static ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData = { { &aImplAPPLEICELANDByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -1519,11 +1519,11 @@ static ImplUniCharTabData const aImplAPPLEROMANToCharTabEx[APPLEROMANTOCHARTABEX static ImplByteConvertData const aImplAPPLEROMANByteCvtData = { aImplAPPLEROMANToUniTab, - NULL, + nullptr, APPLEROMANUNI_START, APPLEROMANUNI_END, NOTABUNI_START, NOTABUNI_END, aImplAPPLEROMANToCharTab, - NULL, + nullptr, aImplAPPLEROMANToCharTabEx, APPLEROMANCHAR_START, APPLEROMANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -1536,12 +1536,12 @@ static ImplTextEncodingData const aImplAPPLEROMANTextEncodingData = { { &aImplAPPLEROMANByteCvtData, ImplUpperCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index cce84c19dbed..d36f5b8a4d17 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -59,7 +59,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, pLeadEntry = pLeadTab+cLead; /* SingleByte char? */ - if (pLeadEntry->mpToUniTrailTab == NULL + if (pLeadEntry->mpToUniTrailTab == nullptr || cLead < pConvertData->mnLeadStart || cLead > pConvertData->mnLeadEnd) { diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab index a50e4a2ec9db..f0a45ae1ebf3 100644 --- a/sal/textenc/tcvtscn6.tab +++ b/sal/textenc/tcvtscn6.tab @@ -39,135 +39,135 @@ static ImplDBCSToUniLeadTab const aGB2312UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x20AC, 0, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x20AC, 0, 0, nullptr }, /* 0x80 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x81 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x82 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ @@ -199,7 +199,7 @@ static ImplDBCSToUniLeadTab const aGB2312UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9E */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9F */ /* We convert this as double byte */ - { 0, 1, 0, NULL }, /* 0xA0 */ + { 0, 1, 0, nullptr }, /* 0xA0 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A1 }, /* 0xA1 */ { 0, 0xA1, 0xFC, aImplDBCSToUniTab_GB_A2 }, /* 0xA2 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A3 }, /* 0xA3 */ @@ -294,7 +294,7 @@ static ImplDBCSToUniLeadTab const aGB2312UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFD */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFE */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -306,33 +306,33 @@ static ImplUniToDBCSHighTab const aGB2312DBCSHighTab[256] = { 0x51, 0xC9, aImplUniToDBCSTab_GB_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_GB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_GB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ { 0x3F, 0x3F, aImplUniToDBCSTab_APPLECHINSIMP_1E }, /* 0x1E */ /* we convert this char also to unicode */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x1F */ { 0x14, 0xAC, aImplUniToDBCSTab_GB_20 }, /* 0x20 */ { 0x03, 0x93, aImplUniToDBCSTab_GB_21 }, /* 0x21 */ { 0x08, 0xEF, aImplUniToDBCSTab_GB_22 }, /* 0x22 */ @@ -340,45 +340,45 @@ static ImplUniToDBCSHighTab const aGB2312DBCSHighTab[256] = { 0x60, 0x9B, aImplUniToDBCSTab_GB_24 }, /* 0x24 */ { 0x00, 0xCF, aImplUniToDBCSTab_GB_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_GB_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFB, aImplUniToDBCSTab_GB_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_GB_31 }, /* 0x31 */ { 0x20, 0x29, aImplUniToDBCSTab_GBK_32 }, /* 0x32 */ - { 1, 0, NULL }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x33 */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_GB_4E }, /* 0x4E */ { 0x01, 0xFE, aImplUniToDBCSTab_GB_4F }, /* 0x4F */ { 0x0C, 0xFB, aImplUniToDBCSTab_GB_50 }, /* 0x50 */ @@ -458,103 +458,103 @@ static ImplUniToDBCSHighTab const aGB2312DBCSHighTab[256] = { 0x6C, 0xFB, aImplUniToDBCSTab_GB_9A }, /* 0x9A */ { 0x03, 0x54, aImplUniToDBCSTab_GB_9B }, /* 0x9B */ { 0x7C, 0xE2, aImplUniToDBCSTab_GB_9C }, /* 0x9C */ - { 1, 0, NULL }, /* 0x9D */ + { 1, 0, nullptr }, /* 0x9D */ { 0x1F, 0xFE, aImplUniToDBCSTab_GB_9E }, /* 0x9E */ { 0x0B, 0xA0, aImplUniToDBCSTab_GB_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ - { 1, 0, NULL }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xFA */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x31, 0x44, aImplUniToDBCSTab_GB_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_GB_FF } /* 0xFF */ }; @@ -595,12 +595,12 @@ static ImplTextEncodingData const aImplGB2312TextEncodingData = { { &aImplGB2312DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -618,12 +618,12 @@ static ImplTextEncodingData const aImplEUCCNTextEncodingData = { { &aImplGB2312DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -637,135 +637,135 @@ static ImplTextEncodingData const aImplEUCCNTextEncodingData static ImplDBCSToUniLeadTab const aGBT12345UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x20AC, 0, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x20AC, 0, 0, nullptr }, /* 0x80 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x81 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x82 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ @@ -797,7 +797,7 @@ static ImplDBCSToUniLeadTab const aGBT12345UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9E */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9F */ /* We convert this as double byte */ - { 0, 1, 0, NULL }, /* 0xA0 */ + { 0, 1, 0, nullptr }, /* 0xA0 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A1 }, /* 0xA1 */ { 0, 0xA1, 0xFC, aImplDBCSToUniTab_GB_A2 }, /* 0xA2 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A3 }, /* 0xA3 */ @@ -892,7 +892,7 @@ static ImplDBCSToUniLeadTab const aGBT12345UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFD */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFE */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -904,33 +904,33 @@ static ImplUniToDBCSHighTab const aGBT12345DBCSHighTab[256] = { 0x51, 0xC9, aImplUniToDBCSTab_GB_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_GB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_GB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ { 0x3F, 0x3F, aImplUniToDBCSTab_APPLECHINSIMP_1E }, /* 0x1E */ /* we convert this char also to unicode */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x1F */ { 0x14, 0xAC, aImplUniToDBCSTab_GB_20 }, /* 0x20 */ { 0x03, 0x93, aImplUniToDBCSTab_GB_21 }, /* 0x21 */ { 0x08, 0xEF, aImplUniToDBCSTab_GB_22 }, /* 0x22 */ @@ -938,45 +938,45 @@ static ImplUniToDBCSHighTab const aGBT12345DBCSHighTab[256] = { 0x60, 0x9B, aImplUniToDBCSTab_GB_24 }, /* 0x24 */ { 0x00, 0xCF, aImplUniToDBCSTab_GB_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_GB_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFB, aImplUniToDBCSTab_GB_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_GB_31 }, /* 0x31 */ { 0x20, 0x29, aImplUniToDBCSTab_GBK_32 }, /* 0x32 */ - { 1, 0, NULL }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x33 */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_GBT_4E }, /* 0x4E */ { 0x01, 0xFE, aImplUniToDBCSTab_GBT_4F }, /* 0x4F */ { 0x00, 0xFB, aImplUniToDBCSTab_GBT_50 }, /* 0x50 */ @@ -1059,100 +1059,100 @@ static ImplUniToDBCSHighTab const aGBT12345DBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_GBT_9D }, /* 0x9D */ { 0x0C, 0xFF, aImplUniToDBCSTab_GBT_9E }, /* 0x9E */ { 0x09, 0xA0, aImplUniToDBCSTab_GBT_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ - { 1, 0, NULL }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xFA */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x31, 0x44, aImplUniToDBCSTab_GB_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_GB_FF } /* 0xFF */ }; @@ -1175,12 +1175,12 @@ static ImplTextEncodingData const aImplGBT12345TextEncodingData = { { &aImplGBT12345DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -1282,135 +1282,135 @@ static ImplTextEncodingData const aImplGBT12345TextEncodingData static ImplDBCSToUniLeadTab const aGBKUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x20AC, 0, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x20AC, 0, 0, nullptr }, /* 0x80 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_81 }, /* 0x81 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_82 }, /* 0x82 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_83 }, /* 0x83 */ @@ -1537,7 +1537,7 @@ static ImplDBCSToUniLeadTab const aGBKUniLeadTab[256] = { 0, 0x40, 0xA0, aImplDBCSToUniTab_GBK_FC }, /* 0xFC */ { 0, 0x40, 0xA0, aImplDBCSToUniTab_GBK_FD }, /* 0xFD */ { 0, 0x40, 0x9F, aImplDBCSToUniTab_GBK_FE }, /* 0xFE */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -1549,33 +1549,33 @@ static ImplUniToDBCSHighTab const aGBKDBCSHighTab[256] = { 0x51, 0xD9, aImplUniToDBCSTab_GBK_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_GB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_GB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ { 0x3F, 0x3F, aImplUniToDBCSTab_APPLECHINSIMP_1E }, /* 0x1E */ /* we convert this char also to unicode */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0xAC, aImplUniToDBCSTab_GBK_20 }, /* 0x20 */ { 0x03, 0x99, aImplUniToDBCSTab_GBK_21 }, /* 0x21 */ { 0x08, 0xEF, aImplUniToDBCSTab_GBK_22 }, /* 0x22 */ @@ -1583,15 +1583,15 @@ static ImplUniToDBCSHighTab const aGBKDBCSHighTab[256] = { 0x60, 0x9B, aImplUniToDBCSTab_GB_24 }, /* 0x24 */ { 0x00, 0xE5, aImplUniToDBCSTab_GBK_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_GBK_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ { 0x81, 0xCA, aImplUniToDBCSTab_GBK_2E }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_GBK_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_GB_31 }, /* 0x31 */ { 0x20, 0xA3, aImplUniToDBCSTab_GBK_32 }, /* 0x32 */ @@ -1599,27 +1599,27 @@ static ImplUniToDBCSHighTab const aGBKDBCSHighTab[256] = { 0x47, 0x73, aImplUniToDBCSTab_GBK_34 }, /* 0x34 */ { 0x9E, 0x9E, aImplUniToDBCSTab_GBK_35 }, /* 0x35 */ { 0x0E, 0x1A, aImplUniToDBCSTab_GBK_36 }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ { 0x18, 0xDF, aImplUniToDBCSTab_GBK_39 }, /* 0x39 */ { 0x73, 0x73, aImplUniToDBCSTab_GBK_3A }, /* 0x3A */ { 0x4E, 0x4E, aImplUniToDBCSTab_GBK_3B }, /* 0x3B */ { 0x6E, 0xE0, aImplUniToDBCSTab_GBK_3C }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ { 0x56, 0x56, aImplUniToDBCSTab_GBK_40 }, /* 0x40 */ { 0x5F, 0x5F, aImplUniToDBCSTab_GBK_41 }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x42 */ { 0x37, 0xDD, aImplUniToDBCSTab_GBK_43 }, /* 0x43 */ { 0xD6, 0xD6, aImplUniToDBCSTab_GBK_44 }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x45 */ { 0x4C, 0x61, aImplUniToDBCSTab_GBK_46 }, /* 0x46 */ { 0x23, 0x8D, aImplUniToDBCSTab_GBK_47 }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x48 */ { 0x47, 0xB7, aImplUniToDBCSTab_GBK_49 }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ { 0x77, 0xA3, aImplUniToDBCSTab_GBK_4C }, /* 0x4C */ { 0x13, 0xAE, aImplUniToDBCSTab_GBK_4D }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_4E }, /* 0x4E */ @@ -1704,100 +1704,100 @@ static ImplUniToDBCSHighTab const aGBKDBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_GBK_9D }, /* 0x9D */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_9E }, /* 0x9E */ { 0x00, 0xA5, aImplUniToDBCSTab_GBK_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x2C, 0xF1, aImplUniToDBCSTab_GBK_F9 }, /* 0xF9 */ { 0x0C, 0x29, aImplUniToDBCSTab_GBK_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x6B, aImplUniToDBCSTab_GBK_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_GBK_FF } /* 0xFF */ }; @@ -1820,12 +1820,12 @@ static ImplTextEncodingData const aImplGBKTextEncodingData = { { &aImplGBKDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -1839,135 +1839,135 @@ static ImplTextEncodingData const aImplGBKTextEncodingData static ImplDBCSToUniLeadTab const aMS936UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0x20AC, 0, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0x20AC, 0, 0, nullptr }, /* 0x80 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_81 }, /* 0x81 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_82 }, /* 0x82 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_GBK_83 }, /* 0x83 */ @@ -2094,7 +2094,7 @@ static ImplDBCSToUniLeadTab const aMS936UniLeadTab[256] = { 0, 0x40, 0xA0, aImplDBCSToUniTab_GBK_FC }, /* 0xFC */ { 0, 0x40, 0xA0, aImplDBCSToUniTab_GBK_FD }, /* 0xFD */ { 0, 0x40, 0x4F, aImplDBCSToUniTab_GBK_FE }, /* 0xFE */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -2106,33 +2106,33 @@ static ImplUniToDBCSHighTab const aMS936DBCSHighTab[256] = { 0x51, 0xD9, aImplUniToDBCSTab_GBK_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_GB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_GB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ { 0x3F, 0x3F, aImplUniToDBCSTab_APPLECHINSIMP_1E }, /* 0x1E */ /* we convert this char also to unicode */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x1F */ { 0x10, 0xAC, aImplUniToDBCSTab_GBK_20 }, /* 0x20 */ { 0x03, 0x99, aImplUniToDBCSTab_GBK_21 }, /* 0x21 */ { 0x08, 0xEF, aImplUniToDBCSTab_GBK_22 }, /* 0x22 */ @@ -2140,45 +2140,45 @@ static ImplUniToDBCSHighTab const aMS936DBCSHighTab[256] = { 0x60, 0x9B, aImplUniToDBCSTab_GB_24 }, /* 0x24 */ { 0x00, 0xE5, aImplUniToDBCSTab_GBK_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_GBK_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_GBK_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_GB_31 }, /* 0x31 */ { 0x20, 0xA3, aImplUniToDBCSTab_GBK_32 }, /* 0x32 */ { 0x8E, 0xD5, aImplUniToDBCSTab_GBK_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_4E }, /* 0x4E */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_4F }, /* 0x4F */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_50 }, /* 0x50 */ @@ -2261,100 +2261,100 @@ static ImplUniToDBCSHighTab const aMS936DBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_GBK_9D }, /* 0x9D */ { 0x00, 0xFF, aImplUniToDBCSTab_GBK_9E }, /* 0x9E */ { 0x00, 0xA5, aImplUniToDBCSTab_GBK_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ { 0x2C, 0xF1, aImplUniToDBCSTab_GBK_F9 }, /* 0xF9 */ { 0x0C, 0x29, aImplUniToDBCSTab_GBK_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x6B, aImplUniToDBCSTab_GBK_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_GBK_FF } /* 0xFF */ }; @@ -2377,12 +2377,12 @@ static ImplTextEncodingData const aImplMS936TextEncodingData = { { &aImplMS936DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -2397,137 +2397,137 @@ static ImplTextEncodingData const aImplMS936TextEncodingData static ImplDBCSToUniLeadTab const aAPPLECHINSIMPUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0, 1, 0, NULL }, /* 0x80 */ - { 0xF880, 0, 0, NULL }, /* 0x81 */ - { 0xF881, 0, 0, NULL }, /* 0x82 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0, 1, 0, nullptr }, /* 0x80 */ + { 0xF880, 0, 0, nullptr }, /* 0x81 */ + { 0xF881, 0, 0, nullptr }, /* 0x82 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x84 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */ @@ -2557,7 +2557,7 @@ static ImplDBCSToUniLeadTab const aAPPLECHINSIMPUniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9E */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9F */ /* We convert this as double byte */ - { 0x00A0, 0, 0, NULL }, /* 0xA0 */ + { 0x00A0, 0, 0, nullptr }, /* 0xA0 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A1 }, /* 0xA1 */ { 0, 0xA1, 0xFC, aImplDBCSToUniTab_GB_A2 }, /* 0xA2 */ { 0, 0xA1, 0xFE, aImplDBCSToUniTab_GB_A3 }, /* 0xA3 */ @@ -2650,9 +2650,9 @@ static ImplDBCSToUniLeadTab const aAPPLECHINSIMPUniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFA */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFB */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ - { 0x00A9, 0, 0, NULL }, /* 0xFD */ - { 0x2122, 0, 0, NULL }, /* 0xFE */ - { 0x2026, 0, 0, NULL } /* 0xFF */ + { 0x00A9, 0, 0, nullptr }, /* 0xFD */ + { 0x2122, 0, 0, nullptr }, /* 0xFE */ + { 0x2026, 0, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -2664,33 +2664,33 @@ static ImplUniToDBCSHighTab const aAPPLECHINSIMPDBCSHighTab[256] = { 0x51, 0xC9, aImplUniToDBCSTab_GB_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_GB_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_GB_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ { 0x3F, 0x3F, aImplUniToDBCSTab_APPLECHINSIMP_1E }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x1F */ { 0x14, 0x3E, aImplUniToDBCSTab_GB_20 }, /* 0x20 */ { 0x03, 0x93, aImplUniToDBCSTab_APPLECHINSIMP_21 }, /* 0x21 */ { 0x08, 0xEF, aImplUniToDBCSTab_GB_22 }, /* 0x22 */ @@ -2698,45 +2698,45 @@ static ImplUniToDBCSHighTab const aAPPLECHINSIMPDBCSHighTab[256] = { 0x60, 0x9B, aImplUniToDBCSTab_GB_24 }, /* 0x24 */ { 0x00, 0xCF, aImplUniToDBCSTab_GB_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_GB_26 }, /* 0x26 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFB, aImplUniToDBCSTab_GB_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_GB_31 }, /* 0x31 */ { 0x20, 0x29, aImplUniToDBCSTab_GBK_32 }, /* 0x32 */ - { 1, 0, NULL }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x33 */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_GB_4E }, /* 0x4E */ { 0x01, 0xFE, aImplUniToDBCSTab_GB_4F }, /* 0x4F */ { 0x0C, 0xFB, aImplUniToDBCSTab_GB_50 }, /* 0x50 */ @@ -2816,103 +2816,103 @@ static ImplUniToDBCSHighTab const aAPPLECHINSIMPDBCSHighTab[256] = { 0x6C, 0xFB, aImplUniToDBCSTab_GB_9A }, /* 0x9A */ { 0x03, 0x54, aImplUniToDBCSTab_GB_9B }, /* 0x9B */ { 0x7C, 0xE2, aImplUniToDBCSTab_GB_9C }, /* 0x9C */ - { 1, 0, NULL }, /* 0x9D */ + { 1, 0, nullptr }, /* 0x9D */ { 0x1F, 0xFE, aImplUniToDBCSTab_GB_9E }, /* 0x9E */ { 0x0B, 0xA0, aImplUniToDBCSTab_GB_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ { 0x80, 0x81, aImplUniToDBCSTab_APPLECHINSIMP_F8 }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ - { 1, 0, NULL }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xFA */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x31, 0x44, aImplUniToDBCSTab_GB_FE }, /* 0xFE */ { 0x01, 0xE5, aImplUniToDBCSTab_GB_FF } /* 0xFF */ }; @@ -2925,7 +2925,7 @@ static ImplDBCSConvertData const aImplAPPLECHINSIMPDBCSCvtData = aAPPLECHINSIMPDBCSHighTab, 0x00, 0xFF, 0xA1, 0xFE, - NULL, + nullptr, 0 }; @@ -2935,12 +2935,12 @@ static ImplTextEncodingData const aImplAPPLECHINSIMPTextEncodingData = { { &aImplAPPLECHINSIMPDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, diff --git a/sal/textenc/tcvtsym1.tab b/sal/textenc/tcvtsym1.tab index 841c4c11fdbb..4ddd89d74fbd 100644 --- a/sal/textenc/tcvtsym1.tab +++ b/sal/textenc/tcvtsym1.tab @@ -23,15 +23,15 @@ /* Symbol Font Encodings */ static ImplTextEncodingData const aImplSYMBOLTextEncodingData - = { { NULL, + = { { nullptr, ImplSymbolToUnicode, ImplUnicodeToSymbol, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, diff --git a/sal/textenc/tcvttcn6.tab b/sal/textenc/tcvttcn6.tab index 544d5108fc25..0dc969ab06a4 100644 --- a/sal/textenc/tcvttcn6.tab +++ b/sal/textenc/tcvttcn6.tab @@ -30,135 +30,135 @@ static ImplDBCSToUniLeadTab const aBIG5UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0, 1, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0, 1, 0, nullptr }, /* 0x80 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x81 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x82 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ @@ -285,7 +285,7 @@ static ImplDBCSToUniLeadTab const aBIG5UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFD */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFE */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -293,83 +293,83 @@ static ImplDBCSToUniLeadTab const aBIG5UniLeadTab[256] = static ImplUniToDBCSHighTab const aBIG5DBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_BIG5_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x01 */ { 0xC7, 0xD9, aImplUniToDBCSTab_BIG5_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_BIG5_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_BIG5_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x13, 0xAC, aImplUniToDBCSTab_BIG5_20 }, /* 0x20 */ { 0x03, 0x99, aImplUniToDBCSTab_BIG5_21 }, /* 0x21 */ { 0x15, 0xEF, aImplUniToDBCSTab_BIG5_22 }, /* 0x22 */ - { 1, 0, NULL }, /* 0x23 */ + { 1, 0, nullptr }, /* 0x23 */ { 0x60, 0x7D, aImplUniToDBCSTab_BIG5_24 }, /* 0x24 */ { 0x00, 0xE5, aImplUniToDBCSTab_BIG5_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_BIG5_26 }, /* 0x25 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_BIG5_31 }, /* 0x31 */ { 0xA3, 0xA3, aImplUniToDBCSTab_BIG5_32 }, /* 0x32 */ { 0x8E, 0xD5, aImplUniToDBCSTab_BIG5_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_4E }, /* 0x4E */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_4F }, /* 0x4F */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_50 }, /* 0x50 */ @@ -452,100 +452,100 @@ static ImplUniToDBCSHighTab const aBIG5DBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9D }, /* 0x9D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9E }, /* 0x9E */ { 0x00, 0xA4, aImplUniToDBCSTab_BIG5_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ { 0x0C, 0x0D, aImplUniToDBCSTab_BIG5_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x6B, aImplUniToDBCSTab_BIG5_FE }, /* 0xFE */ { 0x01, 0xFD, aImplUniToDBCSTab_BIG5_FF } /* 0xFF */ }; @@ -597,12 +597,12 @@ static ImplTextEncodingData const aImplBIG5TextEncodingData = { { &aImplBIG5DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -616,135 +616,135 @@ static ImplTextEncodingData const aImplBIG5TextEncodingData static ImplDBCSToUniLeadTab const aMS950UniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0, 1, 0, NULL }, /* 0x80 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0, 1, 0, nullptr }, /* 0x80 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x81 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x82 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ @@ -871,7 +871,7 @@ static ImplDBCSToUniLeadTab const aMS950UniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFD */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFE */ /* We convert this as double byte */ - { 0, 1, 0, NULL } /* 0xFF */ + { 0, 1, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -879,83 +879,83 @@ static ImplDBCSToUniLeadTab const aMS950UniLeadTab[256] = static ImplUniToDBCSHighTab const aMS950DBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_BIG5_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x01 */ { 0xC7, 0xD9, aImplUniToDBCSTab_BIG5_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_BIG5_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_BIG5_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x13, 0xAC, aImplUniToDBCSTab_BIG5_20 }, /* 0x20 */ { 0x03, 0x99, aImplUniToDBCSTab_BIG5_21 }, /* 0x21 */ { 0x15, 0xEF, aImplUniToDBCSTab_BIG5_22 }, /* 0x22 */ - { 1, 0, NULL }, /* 0x23 */ + { 1, 0, nullptr }, /* 0x23 */ { 0x60, 0x7D, aImplUniToDBCSTab_BIG5_24 }, /* 0x24 */ { 0x00, 0xE5, aImplUniToDBCSTab_BIG5_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_BIG5_26 }, /* 0x25 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_BIG5_31 }, /* 0x31 */ { 0xA3, 0xA3, aImplUniToDBCSTab_BIG5_32 }, /* 0x32 */ { 0x8E, 0xD5, aImplUniToDBCSTab_BIG5_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_4E }, /* 0x4E */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_4F }, /* 0x4F */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_50 }, /* 0x50 */ @@ -1038,100 +1038,100 @@ static ImplUniToDBCSHighTab const aMS950DBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9D }, /* 0x9D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9E }, /* 0x9E */ { 0x00, 0xA4, aImplUniToDBCSTab_BIG5_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ - { 1, 0, NULL }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xF8 */ + { 1, 0, nullptr }, /* 0xF9 */ { 0x0C, 0x0D, aImplUniToDBCSTab_BIG5_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x6B, aImplUniToDBCSTab_BIG5_FE }, /* 0xFE */ { 0x01, 0xFD, aImplUniToDBCSTab_BIG5_FF } /* 0xFF */ }; @@ -1154,12 +1154,12 @@ static ImplTextEncodingData const aImplMS950TextEncodingData = { { &aImplMS950DBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, @@ -1174,137 +1174,137 @@ static ImplTextEncodingData const aImplMS950TextEncodingData static ImplDBCSToUniLeadTab const aAPPLECHINTRADUniLeadTab[256] = { - { 0x0000, 0, 0, NULL }, /* 0x00 */ - { 0x0001, 0, 0, NULL }, /* 0x01 */ - { 0x0002, 0, 0, NULL }, /* 0x02 */ - { 0x0003, 0, 0, NULL }, /* 0x03 */ - { 0x0004, 0, 0, NULL }, /* 0x04 */ - { 0x0005, 0, 0, NULL }, /* 0x05 */ - { 0x0006, 0, 0, NULL }, /* 0x06 */ - { 0x0007, 0, 0, NULL }, /* 0x07 */ - { 0x0008, 0, 0, NULL }, /* 0x08 */ - { 0x0009, 0, 0, NULL }, /* 0x09 */ - { 0x000A, 0, 0, NULL }, /* 0x0A */ - { 0x000B, 0, 0, NULL }, /* 0x0B */ - { 0x000C, 0, 0, NULL }, /* 0x0C */ - { 0x000D, 0, 0, NULL }, /* 0x0D */ - { 0x000E, 0, 0, NULL }, /* 0x0E */ - { 0x000F, 0, 0, NULL }, /* 0x0F */ - { 0x0010, 0, 0, NULL }, /* 0x10 */ - { 0x0011, 0, 0, NULL }, /* 0x11 */ - { 0x0012, 0, 0, NULL }, /* 0x12 */ - { 0x0013, 0, 0, NULL }, /* 0x13 */ - { 0x0014, 0, 0, NULL }, /* 0x14 */ - { 0x0015, 0, 0, NULL }, /* 0x15 */ - { 0x0016, 0, 0, NULL }, /* 0x16 */ - { 0x0017, 0, 0, NULL }, /* 0x17 */ - { 0x0018, 0, 0, NULL }, /* 0x18 */ - { 0x0019, 0, 0, NULL }, /* 0x19 */ - { 0x001A, 0, 0, NULL }, /* 0x1A */ - { 0x001B, 0, 0, NULL }, /* 0x1B */ - { 0x001C, 0, 0, NULL }, /* 0x1C */ - { 0x001D, 0, 0, NULL }, /* 0x1D */ - { 0x001E, 0, 0, NULL }, /* 0x1E */ - { 0x001F, 0, 0, NULL }, /* 0x1F */ - { 0x0020, 0, 0, NULL }, /* 0x20 */ - { 0x0021, 0, 0, NULL }, /* 0x21 */ - { 0x0022, 0, 0, NULL }, /* 0x22 */ - { 0x0023, 0, 0, NULL }, /* 0x23 */ - { 0x0024, 0, 0, NULL }, /* 0x24 */ - { 0x0025, 0, 0, NULL }, /* 0x25 */ - { 0x0026, 0, 0, NULL }, /* 0x26 */ - { 0x0027, 0, 0, NULL }, /* 0x27 */ - { 0x0028, 0, 0, NULL }, /* 0x28 */ - { 0x0029, 0, 0, NULL }, /* 0x29 */ - { 0x002A, 0, 0, NULL }, /* 0x2A */ - { 0x002B, 0, 0, NULL }, /* 0x2B */ - { 0x002C, 0, 0, NULL }, /* 0x2C */ - { 0x002D, 0, 0, NULL }, /* 0x2D */ - { 0x002E, 0, 0, NULL }, /* 0x2E */ - { 0x002F, 0, 0, NULL }, /* 0x2F */ - { 0x0030, 0, 0, NULL }, /* 0x30 */ - { 0x0031, 0, 0, NULL }, /* 0x31 */ - { 0x0032, 0, 0, NULL }, /* 0x32 */ - { 0x0033, 0, 0, NULL }, /* 0x33 */ - { 0x0034, 0, 0, NULL }, /* 0x34 */ - { 0x0035, 0, 0, NULL }, /* 0x35 */ - { 0x0036, 0, 0, NULL }, /* 0x36 */ - { 0x0037, 0, 0, NULL }, /* 0x37 */ - { 0x0038, 0, 0, NULL }, /* 0x38 */ - { 0x0039, 0, 0, NULL }, /* 0x39 */ - { 0x003A, 0, 0, NULL }, /* 0x3A */ - { 0x003B, 0, 0, NULL }, /* 0x3B */ - { 0x003C, 0, 0, NULL }, /* 0x3C */ - { 0x003D, 0, 0, NULL }, /* 0x3D */ - { 0x003E, 0, 0, NULL }, /* 0x3E */ - { 0x003F, 0, 0, NULL }, /* 0x3F */ - { 0x0040, 0, 0, NULL }, /* 0x40 */ - { 0x0041, 0, 0, NULL }, /* 0x41 */ - { 0x0042, 0, 0, NULL }, /* 0x42 */ - { 0x0043, 0, 0, NULL }, /* 0x43 */ - { 0x0044, 0, 0, NULL }, /* 0x44 */ - { 0x0045, 0, 0, NULL }, /* 0x45 */ - { 0x0046, 0, 0, NULL }, /* 0x46 */ - { 0x0047, 0, 0, NULL }, /* 0x47 */ - { 0x0048, 0, 0, NULL }, /* 0x48 */ - { 0x0049, 0, 0, NULL }, /* 0x49 */ - { 0x004A, 0, 0, NULL }, /* 0x4A */ - { 0x004B, 0, 0, NULL }, /* 0x4B */ - { 0x004C, 0, 0, NULL }, /* 0x4C */ - { 0x004D, 0, 0, NULL }, /* 0x4D */ - { 0x004E, 0, 0, NULL }, /* 0x4E */ - { 0x004F, 0, 0, NULL }, /* 0x4F */ - { 0x0050, 0, 0, NULL }, /* 0x50 */ - { 0x0051, 0, 0, NULL }, /* 0x51 */ - { 0x0052, 0, 0, NULL }, /* 0x52 */ - { 0x0053, 0, 0, NULL }, /* 0x53 */ - { 0x0054, 0, 0, NULL }, /* 0x54 */ - { 0x0055, 0, 0, NULL }, /* 0x55 */ - { 0x0056, 0, 0, NULL }, /* 0x56 */ - { 0x0057, 0, 0, NULL }, /* 0x57 */ - { 0x0058, 0, 0, NULL }, /* 0x58 */ - { 0x0059, 0, 0, NULL }, /* 0x59 */ - { 0x005A, 0, 0, NULL }, /* 0x5A */ - { 0x005B, 0, 0, NULL }, /* 0x5B */ - { 0x005C, 0, 0, NULL }, /* 0x5C */ - { 0x005D, 0, 0, NULL }, /* 0x5D */ - { 0x005E, 0, 0, NULL }, /* 0x5E */ - { 0x005F, 0, 0, NULL }, /* 0x5F */ - { 0x0060, 0, 0, NULL }, /* 0x60 */ - { 0x0061, 0, 0, NULL }, /* 0x61 */ - { 0x0062, 0, 0, NULL }, /* 0x62 */ - { 0x0063, 0, 0, NULL }, /* 0x63 */ - { 0x0064, 0, 0, NULL }, /* 0x64 */ - { 0x0065, 0, 0, NULL }, /* 0x65 */ - { 0x0066, 0, 0, NULL }, /* 0x66 */ - { 0x0067, 0, 0, NULL }, /* 0x67 */ - { 0x0068, 0, 0, NULL }, /* 0x68 */ - { 0x0069, 0, 0, NULL }, /* 0x69 */ - { 0x006A, 0, 0, NULL }, /* 0x6A */ - { 0x006B, 0, 0, NULL }, /* 0x6B */ - { 0x006C, 0, 0, NULL }, /* 0x6C */ - { 0x006D, 0, 0, NULL }, /* 0x6D */ - { 0x006E, 0, 0, NULL }, /* 0x6E */ - { 0x006F, 0, 0, NULL }, /* 0x6F */ - { 0x0070, 0, 0, NULL }, /* 0x70 */ - { 0x0071, 0, 0, NULL }, /* 0x71 */ - { 0x0072, 0, 0, NULL }, /* 0x72 */ - { 0x0073, 0, 0, NULL }, /* 0x73 */ - { 0x0074, 0, 0, NULL }, /* 0x74 */ - { 0x0075, 0, 0, NULL }, /* 0x75 */ - { 0x0076, 0, 0, NULL }, /* 0x76 */ - { 0x0077, 0, 0, NULL }, /* 0x77 */ - { 0x0078, 0, 0, NULL }, /* 0x78 */ - { 0x0079, 0, 0, NULL }, /* 0x79 */ - { 0x007A, 0, 0, NULL }, /* 0x7A */ - { 0x007B, 0, 0, NULL }, /* 0x7B */ - { 0x007C, 0, 0, NULL }, /* 0x7C */ - { 0x007D, 0, 0, NULL }, /* 0x7D */ - { 0x007E, 0, 0, NULL }, /* 0x7E */ - { 0x007F, 0, 0, NULL }, /* 0x7F */ - { 0, 1, 0, NULL }, /* 0x80 */ - { 0xF880, 0, 0, NULL }, /* 0x81 */ - { 0xF881, 0, 0, NULL }, /* 0x82 */ + { 0x0000, 0, 0, nullptr }, /* 0x00 */ + { 0x0001, 0, 0, nullptr }, /* 0x01 */ + { 0x0002, 0, 0, nullptr }, /* 0x02 */ + { 0x0003, 0, 0, nullptr }, /* 0x03 */ + { 0x0004, 0, 0, nullptr }, /* 0x04 */ + { 0x0005, 0, 0, nullptr }, /* 0x05 */ + { 0x0006, 0, 0, nullptr }, /* 0x06 */ + { 0x0007, 0, 0, nullptr }, /* 0x07 */ + { 0x0008, 0, 0, nullptr }, /* 0x08 */ + { 0x0009, 0, 0, nullptr }, /* 0x09 */ + { 0x000A, 0, 0, nullptr }, /* 0x0A */ + { 0x000B, 0, 0, nullptr }, /* 0x0B */ + { 0x000C, 0, 0, nullptr }, /* 0x0C */ + { 0x000D, 0, 0, nullptr }, /* 0x0D */ + { 0x000E, 0, 0, nullptr }, /* 0x0E */ + { 0x000F, 0, 0, nullptr }, /* 0x0F */ + { 0x0010, 0, 0, nullptr }, /* 0x10 */ + { 0x0011, 0, 0, nullptr }, /* 0x11 */ + { 0x0012, 0, 0, nullptr }, /* 0x12 */ + { 0x0013, 0, 0, nullptr }, /* 0x13 */ + { 0x0014, 0, 0, nullptr }, /* 0x14 */ + { 0x0015, 0, 0, nullptr }, /* 0x15 */ + { 0x0016, 0, 0, nullptr }, /* 0x16 */ + { 0x0017, 0, 0, nullptr }, /* 0x17 */ + { 0x0018, 0, 0, nullptr }, /* 0x18 */ + { 0x0019, 0, 0, nullptr }, /* 0x19 */ + { 0x001A, 0, 0, nullptr }, /* 0x1A */ + { 0x001B, 0, 0, nullptr }, /* 0x1B */ + { 0x001C, 0, 0, nullptr }, /* 0x1C */ + { 0x001D, 0, 0, nullptr }, /* 0x1D */ + { 0x001E, 0, 0, nullptr }, /* 0x1E */ + { 0x001F, 0, 0, nullptr }, /* 0x1F */ + { 0x0020, 0, 0, nullptr }, /* 0x20 */ + { 0x0021, 0, 0, nullptr }, /* 0x21 */ + { 0x0022, 0, 0, nullptr }, /* 0x22 */ + { 0x0023, 0, 0, nullptr }, /* 0x23 */ + { 0x0024, 0, 0, nullptr }, /* 0x24 */ + { 0x0025, 0, 0, nullptr }, /* 0x25 */ + { 0x0026, 0, 0, nullptr }, /* 0x26 */ + { 0x0027, 0, 0, nullptr }, /* 0x27 */ + { 0x0028, 0, 0, nullptr }, /* 0x28 */ + { 0x0029, 0, 0, nullptr }, /* 0x29 */ + { 0x002A, 0, 0, nullptr }, /* 0x2A */ + { 0x002B, 0, 0, nullptr }, /* 0x2B */ + { 0x002C, 0, 0, nullptr }, /* 0x2C */ + { 0x002D, 0, 0, nullptr }, /* 0x2D */ + { 0x002E, 0, 0, nullptr }, /* 0x2E */ + { 0x002F, 0, 0, nullptr }, /* 0x2F */ + { 0x0030, 0, 0, nullptr }, /* 0x30 */ + { 0x0031, 0, 0, nullptr }, /* 0x31 */ + { 0x0032, 0, 0, nullptr }, /* 0x32 */ + { 0x0033, 0, 0, nullptr }, /* 0x33 */ + { 0x0034, 0, 0, nullptr }, /* 0x34 */ + { 0x0035, 0, 0, nullptr }, /* 0x35 */ + { 0x0036, 0, 0, nullptr }, /* 0x36 */ + { 0x0037, 0, 0, nullptr }, /* 0x37 */ + { 0x0038, 0, 0, nullptr }, /* 0x38 */ + { 0x0039, 0, 0, nullptr }, /* 0x39 */ + { 0x003A, 0, 0, nullptr }, /* 0x3A */ + { 0x003B, 0, 0, nullptr }, /* 0x3B */ + { 0x003C, 0, 0, nullptr }, /* 0x3C */ + { 0x003D, 0, 0, nullptr }, /* 0x3D */ + { 0x003E, 0, 0, nullptr }, /* 0x3E */ + { 0x003F, 0, 0, nullptr }, /* 0x3F */ + { 0x0040, 0, 0, nullptr }, /* 0x40 */ + { 0x0041, 0, 0, nullptr }, /* 0x41 */ + { 0x0042, 0, 0, nullptr }, /* 0x42 */ + { 0x0043, 0, 0, nullptr }, /* 0x43 */ + { 0x0044, 0, 0, nullptr }, /* 0x44 */ + { 0x0045, 0, 0, nullptr }, /* 0x45 */ + { 0x0046, 0, 0, nullptr }, /* 0x46 */ + { 0x0047, 0, 0, nullptr }, /* 0x47 */ + { 0x0048, 0, 0, nullptr }, /* 0x48 */ + { 0x0049, 0, 0, nullptr }, /* 0x49 */ + { 0x004A, 0, 0, nullptr }, /* 0x4A */ + { 0x004B, 0, 0, nullptr }, /* 0x4B */ + { 0x004C, 0, 0, nullptr }, /* 0x4C */ + { 0x004D, 0, 0, nullptr }, /* 0x4D */ + { 0x004E, 0, 0, nullptr }, /* 0x4E */ + { 0x004F, 0, 0, nullptr }, /* 0x4F */ + { 0x0050, 0, 0, nullptr }, /* 0x50 */ + { 0x0051, 0, 0, nullptr }, /* 0x51 */ + { 0x0052, 0, 0, nullptr }, /* 0x52 */ + { 0x0053, 0, 0, nullptr }, /* 0x53 */ + { 0x0054, 0, 0, nullptr }, /* 0x54 */ + { 0x0055, 0, 0, nullptr }, /* 0x55 */ + { 0x0056, 0, 0, nullptr }, /* 0x56 */ + { 0x0057, 0, 0, nullptr }, /* 0x57 */ + { 0x0058, 0, 0, nullptr }, /* 0x58 */ + { 0x0059, 0, 0, nullptr }, /* 0x59 */ + { 0x005A, 0, 0, nullptr }, /* 0x5A */ + { 0x005B, 0, 0, nullptr }, /* 0x5B */ + { 0x005C, 0, 0, nullptr }, /* 0x5C */ + { 0x005D, 0, 0, nullptr }, /* 0x5D */ + { 0x005E, 0, 0, nullptr }, /* 0x5E */ + { 0x005F, 0, 0, nullptr }, /* 0x5F */ + { 0x0060, 0, 0, nullptr }, /* 0x60 */ + { 0x0061, 0, 0, nullptr }, /* 0x61 */ + { 0x0062, 0, 0, nullptr }, /* 0x62 */ + { 0x0063, 0, 0, nullptr }, /* 0x63 */ + { 0x0064, 0, 0, nullptr }, /* 0x64 */ + { 0x0065, 0, 0, nullptr }, /* 0x65 */ + { 0x0066, 0, 0, nullptr }, /* 0x66 */ + { 0x0067, 0, 0, nullptr }, /* 0x67 */ + { 0x0068, 0, 0, nullptr }, /* 0x68 */ + { 0x0069, 0, 0, nullptr }, /* 0x69 */ + { 0x006A, 0, 0, nullptr }, /* 0x6A */ + { 0x006B, 0, 0, nullptr }, /* 0x6B */ + { 0x006C, 0, 0, nullptr }, /* 0x6C */ + { 0x006D, 0, 0, nullptr }, /* 0x6D */ + { 0x006E, 0, 0, nullptr }, /* 0x6E */ + { 0x006F, 0, 0, nullptr }, /* 0x6F */ + { 0x0070, 0, 0, nullptr }, /* 0x70 */ + { 0x0071, 0, 0, nullptr }, /* 0x71 */ + { 0x0072, 0, 0, nullptr }, /* 0x72 */ + { 0x0073, 0, 0, nullptr }, /* 0x73 */ + { 0x0074, 0, 0, nullptr }, /* 0x74 */ + { 0x0075, 0, 0, nullptr }, /* 0x75 */ + { 0x0076, 0, 0, nullptr }, /* 0x76 */ + { 0x0077, 0, 0, nullptr }, /* 0x77 */ + { 0x0078, 0, 0, nullptr }, /* 0x78 */ + { 0x0079, 0, 0, nullptr }, /* 0x79 */ + { 0x007A, 0, 0, nullptr }, /* 0x7A */ + { 0x007B, 0, 0, nullptr }, /* 0x7B */ + { 0x007C, 0, 0, nullptr }, /* 0x7C */ + { 0x007D, 0, 0, nullptr }, /* 0x7D */ + { 0x007E, 0, 0, nullptr }, /* 0x7E */ + { 0x007F, 0, 0, nullptr }, /* 0x7F */ + { 0, 1, 0, nullptr }, /* 0x80 */ + { 0xF880, 0, 0, nullptr }, /* 0x81 */ + { 0xF881, 0, 0, nullptr }, /* 0x82 */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x83 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x84 */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */ @@ -1334,7 +1334,7 @@ static ImplDBCSToUniLeadTab const aAPPLECHINTRADUniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9D */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9E */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0x9F */ /* We convert this as double byte */ - { 0x00A0, 0, 0, NULL }, /* 0xA0 */ + { 0x00A0, 0, 0, nullptr }, /* 0xA0 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_BIG5_A1 }, /* 0xA1 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_BIG5_A2 }, /* 0xA2 */ { 0, 0x40, 0xFE, aImplDBCSToUniTab_BIG5_A3 }, /* 0xA3 */ @@ -1427,9 +1427,9 @@ static ImplDBCSToUniLeadTab const aAPPLECHINTRADUniLeadTab[256] = { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFA */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFB */ /* We convert this as double byte */ { 0, 1, 0, aImplDoubleByteIdentifierTab }, /* 0xFC */ /* We convert this as double byte */ - { 0x00A9, 0, 0, NULL }, /* 0xFD */ - { 0x2122, 0, 0, NULL }, /* 0xFE */ - { 0x2026, 0, 0, NULL } /* 0xFF */ + { 0x00A9, 0, 0, nullptr }, /* 0xFD */ + { 0x2122, 0, 0, nullptr }, /* 0xFE */ + { 0x2026, 0, 0, nullptr } /* 0xFF */ }; /* ----------------------------------------------------------------------- */ @@ -1437,83 +1437,83 @@ static ImplDBCSToUniLeadTab const aAPPLECHINTRADUniLeadTab[256] = static ImplUniToDBCSHighTab const aAPPLECHINTRADDBCSHighTab[256] = { { 0x00, 0xF7, aImplUniToDBCSTab_APPLECHINTRAD_00 }, /* 0x00 */ - { 1, 0, NULL }, /* 0x01 */ + { 1, 0, nullptr }, /* 0x01 */ { 0xC7, 0xD9, aImplUniToDBCSTab_BIG5_02 }, /* 0x02 */ { 0x91, 0xC9, aImplUniToDBCSTab_BIG5_03 }, /* 0x03 */ { 0x01, 0x51, aImplUniToDBCSTab_BIG5_04 }, /* 0x04 */ - { 1, 0, NULL }, /* 0x05 */ - { 1, 0, NULL }, /* 0x06 */ - { 1, 0, NULL }, /* 0x07 */ - { 1, 0, NULL }, /* 0x08 */ - { 1, 0, NULL }, /* 0x09 */ - { 1, 0, NULL }, /* 0x0A */ - { 1, 0, NULL }, /* 0x0B */ - { 1, 0, NULL }, /* 0x0C */ - { 1, 0, NULL }, /* 0x0D */ - { 1, 0, NULL }, /* 0x0E */ - { 1, 0, NULL }, /* 0x0F */ - { 1, 0, NULL }, /* 0x10 */ - { 1, 0, NULL }, /* 0x11 */ - { 1, 0, NULL }, /* 0x12 */ - { 1, 0, NULL }, /* 0x13 */ - { 1, 0, NULL }, /* 0x14 */ - { 1, 0, NULL }, /* 0x15 */ - { 1, 0, NULL }, /* 0x16 */ - { 1, 0, NULL }, /* 0x17 */ - { 1, 0, NULL }, /* 0x18 */ - { 1, 0, NULL }, /* 0x19 */ - { 1, 0, NULL }, /* 0x1A */ - { 1, 0, NULL }, /* 0x1B */ - { 1, 0, NULL }, /* 0x1C */ - { 1, 0, NULL }, /* 0x1D */ - { 1, 0, NULL }, /* 0x1E */ - { 1, 0, NULL }, /* 0x1F */ + { 1, 0, nullptr }, /* 0x05 */ + { 1, 0, nullptr }, /* 0x06 */ + { 1, 0, nullptr }, /* 0x07 */ + { 1, 0, nullptr }, /* 0x08 */ + { 1, 0, nullptr }, /* 0x09 */ + { 1, 0, nullptr }, /* 0x0A */ + { 1, 0, nullptr }, /* 0x0B */ + { 1, 0, nullptr }, /* 0x0C */ + { 1, 0, nullptr }, /* 0x0D */ + { 1, 0, nullptr }, /* 0x0E */ + { 1, 0, nullptr }, /* 0x0F */ + { 1, 0, nullptr }, /* 0x10 */ + { 1, 0, nullptr }, /* 0x11 */ + { 1, 0, nullptr }, /* 0x12 */ + { 1, 0, nullptr }, /* 0x13 */ + { 1, 0, nullptr }, /* 0x14 */ + { 1, 0, nullptr }, /* 0x15 */ + { 1, 0, nullptr }, /* 0x16 */ + { 1, 0, nullptr }, /* 0x17 */ + { 1, 0, nullptr }, /* 0x18 */ + { 1, 0, nullptr }, /* 0x19 */ + { 1, 0, nullptr }, /* 0x1A */ + { 1, 0, nullptr }, /* 0x1B */ + { 1, 0, nullptr }, /* 0x1C */ + { 1, 0, nullptr }, /* 0x1D */ + { 1, 0, nullptr }, /* 0x1E */ + { 1, 0, nullptr }, /* 0x1F */ { 0x13, 0xAC, aImplUniToDBCSTab_BIG5_20 }, /* 0x20 */ { 0x03, 0x99, aImplUniToDBCSTab_APPLECHINTRAD_21 }, /* 0x21 */ { 0x15, 0xEF, aImplUniToDBCSTab_BIG5_22 }, /* 0x22 */ - { 1, 0, NULL }, /* 0x23 */ + { 1, 0, nullptr }, /* 0x23 */ { 0x60, 0x7D, aImplUniToDBCSTab_BIG5_24 }, /* 0x24 */ { 0x00, 0xE5, aImplUniToDBCSTab_BIG5_25 }, /* 0x25 */ { 0x05, 0x42, aImplUniToDBCSTab_BIG5_26 }, /* 0x25 */ - { 1, 0, NULL }, /* 0x27 */ - { 1, 0, NULL }, /* 0x28 */ - { 1, 0, NULL }, /* 0x29 */ - { 1, 0, NULL }, /* 0x2A */ - { 1, 0, NULL }, /* 0x2B */ - { 1, 0, NULL }, /* 0x2C */ - { 1, 0, NULL }, /* 0x2D */ - { 1, 0, NULL }, /* 0x2E */ - { 1, 0, NULL }, /* 0x2F */ + { 1, 0, nullptr }, /* 0x27 */ + { 1, 0, nullptr }, /* 0x28 */ + { 1, 0, nullptr }, /* 0x29 */ + { 1, 0, nullptr }, /* 0x2A */ + { 1, 0, nullptr }, /* 0x2B */ + { 1, 0, nullptr }, /* 0x2C */ + { 1, 0, nullptr }, /* 0x2D */ + { 1, 0, nullptr }, /* 0x2E */ + { 1, 0, nullptr }, /* 0x2F */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_30 }, /* 0x30 */ { 0x05, 0x29, aImplUniToDBCSTab_BIG5_31 }, /* 0x31 */ { 0xA3, 0xA3, aImplUniToDBCSTab_BIG5_32 }, /* 0x32 */ { 0x8E, 0xD5, aImplUniToDBCSTab_BIG5_33 }, /* 0x33 */ - { 1, 0, NULL }, /* 0x34 */ - { 1, 0, NULL }, /* 0x35 */ - { 1, 0, NULL }, /* 0x36 */ - { 1, 0, NULL }, /* 0x37 */ - { 1, 0, NULL }, /* 0x38 */ - { 1, 0, NULL }, /* 0x39 */ - { 1, 0, NULL }, /* 0x3A */ - { 1, 0, NULL }, /* 0x3B */ - { 1, 0, NULL }, /* 0x3C */ - { 1, 0, NULL }, /* 0x3D */ - { 1, 0, NULL }, /* 0x3E */ - { 1, 0, NULL }, /* 0x3F */ - { 1, 0, NULL }, /* 0x40 */ - { 1, 0, NULL }, /* 0x41 */ - { 1, 0, NULL }, /* 0x42 */ - { 1, 0, NULL }, /* 0x43 */ - { 1, 0, NULL }, /* 0x44 */ - { 1, 0, NULL }, /* 0x45 */ - { 1, 0, NULL }, /* 0x46 */ - { 1, 0, NULL }, /* 0x47 */ - { 1, 0, NULL }, /* 0x48 */ - { 1, 0, NULL }, /* 0x49 */ - { 1, 0, NULL }, /* 0x4A */ - { 1, 0, NULL }, /* 0x4B */ - { 1, 0, NULL }, /* 0x4C */ - { 1, 0, NULL }, /* 0x4D */ + { 1, 0, nullptr }, /* 0x34 */ + { 1, 0, nullptr }, /* 0x35 */ + { 1, 0, nullptr }, /* 0x36 */ + { 1, 0, nullptr }, /* 0x37 */ + { 1, 0, nullptr }, /* 0x38 */ + { 1, 0, nullptr }, /* 0x39 */ + { 1, 0, nullptr }, /* 0x3A */ + { 1, 0, nullptr }, /* 0x3B */ + { 1, 0, nullptr }, /* 0x3C */ + { 1, 0, nullptr }, /* 0x3D */ + { 1, 0, nullptr }, /* 0x3E */ + { 1, 0, nullptr }, /* 0x3F */ + { 1, 0, nullptr }, /* 0x40 */ + { 1, 0, nullptr }, /* 0x41 */ + { 1, 0, nullptr }, /* 0x42 */ + { 1, 0, nullptr }, /* 0x43 */ + { 1, 0, nullptr }, /* 0x44 */ + { 1, 0, nullptr }, /* 0x45 */ + { 1, 0, nullptr }, /* 0x46 */ + { 1, 0, nullptr }, /* 0x47 */ + { 1, 0, nullptr }, /* 0x48 */ + { 1, 0, nullptr }, /* 0x49 */ + { 1, 0, nullptr }, /* 0x4A */ + { 1, 0, nullptr }, /* 0x4B */ + { 1, 0, nullptr }, /* 0x4C */ + { 1, 0, nullptr }, /* 0x4D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_4E }, /* 0x4E */ { 0x00, 0xFE, aImplUniToDBCSTab_BIG5_4F }, /* 0x4F */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_50 }, /* 0x50 */ @@ -1596,100 +1596,100 @@ static ImplUniToDBCSHighTab const aAPPLECHINTRADDBCSHighTab[256] = { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9D }, /* 0x9D */ { 0x00, 0xFF, aImplUniToDBCSTab_BIG5_9E }, /* 0x9E */ { 0x00, 0xA4, aImplUniToDBCSTab_BIG5_9F }, /* 0x9F */ - { 1, 0, NULL }, /* 0xA0 */ - { 1, 0, NULL }, /* 0xA1 */ - { 1, 0, NULL }, /* 0xA2 */ - { 1, 0, NULL }, /* 0xA3 */ - { 1, 0, NULL }, /* 0xA4 */ - { 1, 0, NULL }, /* 0xA5 */ - { 1, 0, NULL }, /* 0xA6 */ - { 1, 0, NULL }, /* 0xA7 */ - { 1, 0, NULL }, /* 0xA8 */ - { 1, 0, NULL }, /* 0xA9 */ - { 1, 0, NULL }, /* 0xAA */ - { 1, 0, NULL }, /* 0xAB */ - { 1, 0, NULL }, /* 0xAC */ - { 1, 0, NULL }, /* 0xAD */ - { 1, 0, NULL }, /* 0xAE */ - { 1, 0, NULL }, /* 0xAF */ - { 1, 0, NULL }, /* 0xB0 */ - { 1, 0, NULL }, /* 0xB1 */ - { 1, 0, NULL }, /* 0xB2 */ - { 1, 0, NULL }, /* 0xB3 */ - { 1, 0, NULL }, /* 0xB4 */ - { 1, 0, NULL }, /* 0xB5 */ - { 1, 0, NULL }, /* 0xB6 */ - { 1, 0, NULL }, /* 0xB7 */ - { 1, 0, NULL }, /* 0xB8 */ - { 1, 0, NULL }, /* 0xB9 */ - { 1, 0, NULL }, /* 0xBA */ - { 1, 0, NULL }, /* 0xBB */ - { 1, 0, NULL }, /* 0xBC */ - { 1, 0, NULL }, /* 0xBD */ - { 1, 0, NULL }, /* 0xBE */ - { 1, 0, NULL }, /* 0xBF */ - { 1, 0, NULL }, /* 0xC0 */ - { 1, 0, NULL }, /* 0xC1 */ - { 1, 0, NULL }, /* 0xC2 */ - { 1, 0, NULL }, /* 0xC3 */ - { 1, 0, NULL }, /* 0xC4 */ - { 1, 0, NULL }, /* 0xC5 */ - { 1, 0, NULL }, /* 0xC6 */ - { 1, 0, NULL }, /* 0xC7 */ - { 1, 0, NULL }, /* 0xC8 */ - { 1, 0, NULL }, /* 0xC9 */ - { 1, 0, NULL }, /* 0xCA */ - { 1, 0, NULL }, /* 0xCB */ - { 1, 0, NULL }, /* 0xCC */ - { 1, 0, NULL }, /* 0xCD */ - { 1, 0, NULL }, /* 0xCE */ - { 1, 0, NULL }, /* 0xCF */ - { 1, 0, NULL }, /* 0xD0 */ - { 1, 0, NULL }, /* 0xD1 */ - { 1, 0, NULL }, /* 0xD2 */ - { 1, 0, NULL }, /* 0xD3 */ - { 1, 0, NULL }, /* 0xD4 */ - { 1, 0, NULL }, /* 0xD5 */ - { 1, 0, NULL }, /* 0xD6 */ - { 1, 0, NULL }, /* 0xD7 */ - { 1, 0, NULL }, /* 0xD8 */ - { 1, 0, NULL }, /* 0xD9 */ - { 1, 0, NULL }, /* 0xDA */ - { 1, 0, NULL }, /* 0xDB */ - { 1, 0, NULL }, /* 0xDC */ - { 1, 0, NULL }, /* 0xDD */ - { 1, 0, NULL }, /* 0xDE */ - { 1, 0, NULL }, /* 0xDF */ - { 1, 0, NULL }, /* 0xE0 */ - { 1, 0, NULL }, /* 0xE1 */ - { 1, 0, NULL }, /* 0xE2 */ - { 1, 0, NULL }, /* 0xE3 */ - { 1, 0, NULL }, /* 0xE4 */ - { 1, 0, NULL }, /* 0xE5 */ - { 1, 0, NULL }, /* 0xE6 */ - { 1, 0, NULL }, /* 0xE7 */ - { 1, 0, NULL }, /* 0xE8 */ - { 1, 0, NULL }, /* 0xE9 */ - { 1, 0, NULL }, /* 0xEA */ - { 1, 0, NULL }, /* 0xEB */ - { 1, 0, NULL }, /* 0xEC */ - { 1, 0, NULL }, /* 0xED */ - { 1, 0, NULL }, /* 0xEE */ - { 1, 0, NULL }, /* 0xEF */ - { 1, 0, NULL }, /* 0xF0 */ - { 1, 0, NULL }, /* 0xF1 */ - { 1, 0, NULL }, /* 0xF2 */ - { 1, 0, NULL }, /* 0xF3 */ - { 1, 0, NULL }, /* 0xF4 */ - { 1, 0, NULL }, /* 0xF5 */ - { 1, 0, NULL }, /* 0xF6 */ - { 1, 0, NULL }, /* 0xF7 */ + { 1, 0, nullptr }, /* 0xA0 */ + { 1, 0, nullptr }, /* 0xA1 */ + { 1, 0, nullptr }, /* 0xA2 */ + { 1, 0, nullptr }, /* 0xA3 */ + { 1, 0, nullptr }, /* 0xA4 */ + { 1, 0, nullptr }, /* 0xA5 */ + { 1, 0, nullptr }, /* 0xA6 */ + { 1, 0, nullptr }, /* 0xA7 */ + { 1, 0, nullptr }, /* 0xA8 */ + { 1, 0, nullptr }, /* 0xA9 */ + { 1, 0, nullptr }, /* 0xAA */ + { 1, 0, nullptr }, /* 0xAB */ + { 1, 0, nullptr }, /* 0xAC */ + { 1, 0, nullptr }, /* 0xAD */ + { 1, 0, nullptr }, /* 0xAE */ + { 1, 0, nullptr }, /* 0xAF */ + { 1, 0, nullptr }, /* 0xB0 */ + { 1, 0, nullptr }, /* 0xB1 */ + { 1, 0, nullptr }, /* 0xB2 */ + { 1, 0, nullptr }, /* 0xB3 */ + { 1, 0, nullptr }, /* 0xB4 */ + { 1, 0, nullptr }, /* 0xB5 */ + { 1, 0, nullptr }, /* 0xB6 */ + { 1, 0, nullptr }, /* 0xB7 */ + { 1, 0, nullptr }, /* 0xB8 */ + { 1, 0, nullptr }, /* 0xB9 */ + { 1, 0, nullptr }, /* 0xBA */ + { 1, 0, nullptr }, /* 0xBB */ + { 1, 0, nullptr }, /* 0xBC */ + { 1, 0, nullptr }, /* 0xBD */ + { 1, 0, nullptr }, /* 0xBE */ + { 1, 0, nullptr }, /* 0xBF */ + { 1, 0, nullptr }, /* 0xC0 */ + { 1, 0, nullptr }, /* 0xC1 */ + { 1, 0, nullptr }, /* 0xC2 */ + { 1, 0, nullptr }, /* 0xC3 */ + { 1, 0, nullptr }, /* 0xC4 */ + { 1, 0, nullptr }, /* 0xC5 */ + { 1, 0, nullptr }, /* 0xC6 */ + { 1, 0, nullptr }, /* 0xC7 */ + { 1, 0, nullptr }, /* 0xC8 */ + { 1, 0, nullptr }, /* 0xC9 */ + { 1, 0, nullptr }, /* 0xCA */ + { 1, 0, nullptr }, /* 0xCB */ + { 1, 0, nullptr }, /* 0xCC */ + { 1, 0, nullptr }, /* 0xCD */ + { 1, 0, nullptr }, /* 0xCE */ + { 1, 0, nullptr }, /* 0xCF */ + { 1, 0, nullptr }, /* 0xD0 */ + { 1, 0, nullptr }, /* 0xD1 */ + { 1, 0, nullptr }, /* 0xD2 */ + { 1, 0, nullptr }, /* 0xD3 */ + { 1, 0, nullptr }, /* 0xD4 */ + { 1, 0, nullptr }, /* 0xD5 */ + { 1, 0, nullptr }, /* 0xD6 */ + { 1, 0, nullptr }, /* 0xD7 */ + { 1, 0, nullptr }, /* 0xD8 */ + { 1, 0, nullptr }, /* 0xD9 */ + { 1, 0, nullptr }, /* 0xDA */ + { 1, 0, nullptr }, /* 0xDB */ + { 1, 0, nullptr }, /* 0xDC */ + { 1, 0, nullptr }, /* 0xDD */ + { 1, 0, nullptr }, /* 0xDE */ + { 1, 0, nullptr }, /* 0xDF */ + { 1, 0, nullptr }, /* 0xE0 */ + { 1, 0, nullptr }, /* 0xE1 */ + { 1, 0, nullptr }, /* 0xE2 */ + { 1, 0, nullptr }, /* 0xE3 */ + { 1, 0, nullptr }, /* 0xE4 */ + { 1, 0, nullptr }, /* 0xE5 */ + { 1, 0, nullptr }, /* 0xE6 */ + { 1, 0, nullptr }, /* 0xE7 */ + { 1, 0, nullptr }, /* 0xE8 */ + { 1, 0, nullptr }, /* 0xE9 */ + { 1, 0, nullptr }, /* 0xEA */ + { 1, 0, nullptr }, /* 0xEB */ + { 1, 0, nullptr }, /* 0xEC */ + { 1, 0, nullptr }, /* 0xED */ + { 1, 0, nullptr }, /* 0xEE */ + { 1, 0, nullptr }, /* 0xEF */ + { 1, 0, nullptr }, /* 0xF0 */ + { 1, 0, nullptr }, /* 0xF1 */ + { 1, 0, nullptr }, /* 0xF2 */ + { 1, 0, nullptr }, /* 0xF3 */ + { 1, 0, nullptr }, /* 0xF4 */ + { 1, 0, nullptr }, /* 0xF5 */ + { 1, 0, nullptr }, /* 0xF6 */ + { 1, 0, nullptr }, /* 0xF7 */ { 0x80, 0x81, aImplUniToDBCSTab_APPLECHINTRAD_F8 }, /* 0xF8 */ - { 1, 0, NULL }, /* 0xF9 */ + { 1, 0, nullptr }, /* 0xF9 */ { 0x0C, 0x0D, aImplUniToDBCSTab_BIG5_FA }, /* 0xFA */ - { 1, 0, NULL }, /* 0xFB */ - { 1, 0, NULL }, /* 0xFC */ - { 1, 0, NULL }, /* 0xFD */ + { 1, 0, nullptr }, /* 0xFB */ + { 1, 0, nullptr }, /* 0xFC */ + { 1, 0, nullptr }, /* 0xFD */ { 0x30, 0x6B, aImplUniToDBCSTab_BIG5_FE }, /* 0xFE */ { 0x01, 0xFD, aImplUniToDBCSTab_BIG5_FF } /* 0xFF */ }; @@ -1702,7 +1702,7 @@ static ImplDBCSConvertData const aImplAPPLECHINTRADDBCSCvtData = aAPPLECHINTRADDBCSHighTab, 0x00, 0xFF, 0x40, 0xFE, - NULL, + nullptr, 0 }; @@ -1712,12 +1712,12 @@ static ImplTextEncodingData const aImplAPPLECHINTRADTextEncodingData = { { &aImplAPPLECHINTRADDBCSCvtData, ImplDBCSToUnicode, ImplUnicodeToDBCS, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 2, 2, diff --git a/sal/textenc/tcvtuni1.tab b/sal/textenc/tcvtuni1.tab index 1a469c0726ee..2c86c1a9a549 100644 --- a/sal/textenc/tcvtuni1.tab +++ b/sal/textenc/tcvtuni1.tab @@ -19,7 +19,7 @@ /* Unicode Encodings */ static ImplTextEncodingData const aImplUTF7TextEncodingData - = { { NULL, + = { { nullptr, ImplUTF7ToUnicode, ImplUnicodeToUTF7, ImplUTF7CreateUTF7TextToUnicodeContext, diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx index 9fb46dc02d4c..1f0b2bfc96ef 100644 --- a/sal/textenc/tcvtutf8.cxx +++ b/sal/textenc/tcvtutf8.cxx @@ -48,7 +48,7 @@ void * ImplCreateUtf8ToUnicodeContext() void ImplResetUtf8ToUnicodeContext(void * pContext) { - if (pContext != NULL) + if (pContext != nullptr) { static_cast< ImplUtf8ToUnicodeContext * >(pContext)->nShift = -1; static_cast< ImplUtf8ToUnicodeContext * >(pContext)->bCheckBom = true; @@ -75,7 +75,7 @@ sal_Size ImplConvertUtf8ToUnicode( RTL_TEXTENCODING_UTF8 and RTL_TEXTENCODING_JAVA_UTF8. */ - bool bJavaUtf8 = pData != NULL; + bool bJavaUtf8 = pData != nullptr; sal_uInt32 nUtf32 = 0; int nShift = -1; bool bCheckBom = true; @@ -85,7 +85,7 @@ sal_Size ImplConvertUtf8ToUnicode( sal_Unicode * pDestBufPtr = pDestBuf; sal_Unicode * pDestBufEnd = pDestBufPtr + nDestChars; - if (pContext != NULL) + if (pContext != nullptr) { nUtf32 = static_cast< ImplUtf8ToUnicodeContext * >(pContext)->nUtf32; nShift = static_cast< ImplUtf8ToUnicodeContext * >(pContext)->nShift; @@ -235,15 +235,15 @@ sal_Size ImplConvertUtf8ToUnicode( } } - if (pContext != NULL) + if (pContext != nullptr) { static_cast< ImplUtf8ToUnicodeContext * >(pContext)->nUtf32 = nUtf32; static_cast< ImplUtf8ToUnicodeContext * >(pContext)->nShift = nShift; static_cast< ImplUtf8ToUnicodeContext * >(pContext)->bCheckBom = bCheckBom; } - if (pInfo != NULL) + if (pInfo != nullptr) *pInfo = nInfo; - if (pSrcCvtBytes != NULL) + if (pSrcCvtBytes != nullptr) *pSrcCvtBytes = reinterpret_cast< char const * >(pSrcBufPtr) - pSrcBuf; return pDestBufPtr - pDestBuf; } @@ -257,7 +257,7 @@ void * ImplCreateUnicodeToUtf8Context() void ImplResetUnicodeToUtf8Context(void * pContext) { - if (pContext != NULL) + if (pContext != nullptr) static_cast< ImplUnicodeToUtf8Context * >(pContext)->nHighSurrogate = 0xFFFF; } @@ -271,7 +271,7 @@ sal_Size ImplConvertUnicodeToUtf8( sal_Size nSrcChars, char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtChars) { - bool bJavaUtf8 = pData != NULL; + bool bJavaUtf8 = pData != nullptr; sal_Unicode nHighSurrogate = 0xFFFF; sal_uInt32 nInfo = 0; sal_Unicode const * pSrcBufPtr = pSrcBuf; @@ -279,7 +279,7 @@ sal_Size ImplConvertUnicodeToUtf8( char * pDestBufPtr = pDestBuf; char * pDestBufEnd = pDestBufPtr + nDestBytes; - if (pContext != NULL) + if (pContext != nullptr) nHighSurrogate = static_cast< ImplUnicodeToUtf8Context * >(pContext)->nHighSurrogate; @@ -360,8 +360,8 @@ sal_Size ImplConvertUnicodeToUtf8( bad_input: switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( - false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, NULL, - 0, NULL)) + false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, nullptr, + 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: nHighSurrogate = 0; @@ -392,7 +392,7 @@ sal_Size ImplConvertUnicodeToUtf8( else switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, - NULL, 0, NULL)) + nullptr, 0, nullptr)) { case sal::detail::textenc::BAD_INPUT_STOP: case sal::detail::textenc::BAD_INPUT_CONTINUE: @@ -406,12 +406,12 @@ sal_Size ImplConvertUnicodeToUtf8( } done: - if (pContext != NULL) + if (pContext != nullptr) static_cast< ImplUnicodeToUtf8Context * >(pContext)->nHighSurrogate = nHighSurrogate; - if (pInfo != NULL) + if (pInfo != nullptr) *pInfo = nInfo; - if (pSrcCvtChars != NULL) + if (pSrcCvtChars != nullptr) *pSrcCvtChars = pSrcBufPtr - pSrcBuf; return pDestBufPtr - pDestBuf; } diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index af3898335943..b0312bb4f7fc 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -223,13 +223,13 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { "7", RTL_TEXTENCODING_ISO_8859_7 }, { "8", RTL_TEXTENCODING_ISO_8859_8 }, { "9", RTL_TEXTENCODING_ISO_8859_9 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetADOBETab[] = { { "fontspecific", RTL_TEXTENCODING_SYMBOL }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetMSTab[] = @@ -262,7 +262,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { "cp949", RTL_TEXTENCODING_MS_949 }, { "cp950", RTL_TEXTENCODING_MS_950 }, { "cp1361", RTL_TEXTENCODING_MS_1361 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetIBMTab[] = @@ -285,71 +285,71 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { "874", RTL_TEXTENCODING_MS_874 }, { "1004", RTL_TEXTENCODING_MS_1252 }, { "65400", RTL_TEXTENCODING_SYMBOL }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = { { "r", RTL_TEXTENCODING_KOI8_R }, { "u", RTL_TEXTENCODING_KOI8_U }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetJISX0208Tab[] = { - { NULL, RTL_TEXTENCODING_JIS_X_0208 } + { nullptr, RTL_TEXTENCODING_JIS_X_0208 } }; static ImplStrCharsetDef const aUnixCharsetJISX0201Tab[] = { - { NULL, RTL_TEXTENCODING_JIS_X_0201 } + { nullptr, RTL_TEXTENCODING_JIS_X_0201 } }; static ImplStrCharsetDef const aUnixCharsetJISX0212Tab[] = { - { NULL, RTL_TEXTENCODING_JIS_X_0212 } + { nullptr, RTL_TEXTENCODING_JIS_X_0212 } }; static ImplStrCharsetDef const aUnixCharsetGBTab[] = { - { NULL, RTL_TEXTENCODING_GB_2312 } + { nullptr, RTL_TEXTENCODING_GB_2312 } }; static ImplStrCharsetDef const aUnixCharsetGBKTab[] = { - { NULL, RTL_TEXTENCODING_GBK } + { nullptr, RTL_TEXTENCODING_GBK } }; static ImplStrCharsetDef const aUnixCharsetBIG5Tab[] = { - { NULL, RTL_TEXTENCODING_BIG5 } + { nullptr, RTL_TEXTENCODING_BIG5 } }; static ImplStrCharsetDef const aUnixCharsetKSC56011987Tab[] = { - { NULL, RTL_TEXTENCODING_EUC_KR } + { nullptr, RTL_TEXTENCODING_EUC_KR } }; static ImplStrCharsetDef const aUnixCharsetKSC56011992Tab[] = { - { NULL, RTL_TEXTENCODING_MS_1361 } + { nullptr, RTL_TEXTENCODING_MS_1361 } }; static ImplStrCharsetDef const aUnixCharsetISO10646Tab[] = { - { NULL, RTL_TEXTENCODING_UNICODE } + { nullptr, RTL_TEXTENCODING_UNICODE } }; static ImplStrCharsetDef const aUnixCharsetUNICODETab[] = { /* Currently every Unicode Encoding is for us Unicode */ /* { "fontspecific", RTL_TEXTENCODING_UNICODE }, */ - { NULL, RTL_TEXTENCODING_UNICODE } + { nullptr, RTL_TEXTENCODING_UNICODE } }; static ImplStrCharsetDef const aUnixCharsetSymbolTab[] = { - { NULL, RTL_TEXTENCODING_SYMBOL } + { nullptr, RTL_TEXTENCODING_SYMBOL } }; /* See <http://cvs.freedesktop.org/xorg/xc/fonts/encodings/iso8859-11.enc? @@ -359,18 +359,18 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { "0", RTL_TEXTENCODING_TIS_620 }, { "2529", RTL_TEXTENCODING_TIS_620 }, { "2533", RTL_TEXTENCODING_TIS_620 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetTIS6202529Tab[] = { { "1", RTL_TEXTENCODING_TIS_620 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrCharsetDef const aUnixCharsetTIS6202533Tab[] = { { "0", RTL_TEXTENCODING_TIS_620 }, { "1", RTL_TEXTENCODING_TIS_620 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; static ImplStrFirstPartCharsetDef const aUnixCharsetFirstPartTab[] = @@ -404,7 +404,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC /* { "sunudcko.1997", }, */ /* { "sunudczh.1997", }, */ /* { "sunudczhtw.1997", }, */ - { NULL, NULL } + { nullptr, nullptr } }; rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; @@ -419,7 +419,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC /* Search FirstPart */ pFirstPart = pBuf.get(); - pSecondPart = NULL; + pSecondPart = nullptr; pTempBuf = pBuf.get(); while ( *pTempBuf ) { @@ -516,7 +516,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeC { "windows1256", RTL_TEXTENCODING_MS_1256 }, { "windows1257", RTL_TEXTENCODING_MS_1257 }, { "windows1258", RTL_TEXTENCODING_MS_1258 }, - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; /* All Identifiers are in lower case and contain only alphanumeric */ @@ -734,7 +734,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeC { "xisciide", RTL_TEXTENCODING_ISCII_DEVANAGARI }, /* This is not an official MIME character set name, but is in use by various windows APIs. */ - { NULL, RTL_TEXTENCODING_DONTKNOW } + { nullptr, RTL_TEXTENCODING_DONTKNOW } }; rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; @@ -797,7 +797,7 @@ const char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eT else if( eTextEncoding == RTL_TEXTENCODING_UNICODE ) return "iso10646-1"; else - return 0; + return nullptr; } /* ----------------------------------------------------------------------- */ @@ -807,7 +807,7 @@ char const * SAL_CALL rtl_getMimeCharsetFromTextEncoding(rtl_TextEncoding { ImplTextEncodingData const * p = Impl_getTextEncodingData(nEncoding); return p && (p->mnInfoFlags & RTL_TEXTENCODING_INFO_MIME) != 0 ? - p->mpBestMimeCharset : NULL; + p->mpBestMimeCharset : nullptr; } const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ) @@ -816,7 +816,7 @@ const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eT if ( pData ) return pData->mpBestMimeCharset; else - return 0; + return nullptr; } /* The following two functions are based on <http://www.sharmahd.com/tm/ diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index eaabe68b9853..63f261225bf2 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -108,7 +108,7 @@ rtl_TextToUnicodeConverter SAL_CALL rtl_createTextToUnicodeConverter( rtl_TextEn if ( pData ) return static_cast<rtl_TextToUnicodeConverter>(const_cast<ImplTextConverter *>(&pData->maConverter)); else - return 0; + return nullptr; } /* ----------------------------------------------------------------------- */ @@ -123,7 +123,7 @@ rtl_TextToUnicodeContext SAL_CALL rtl_createTextToUnicodeContext( rtl_TextToUnic { const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter); if ( !pConverter ) - return 0; + return nullptr; else if ( pConverter->mpCreateTextToUnicodeContext ) return pConverter->mpCreateTextToUnicodeContext(); else @@ -186,7 +186,7 @@ rtl_UnicodeToTextConverter SAL_CALL rtl_createUnicodeToTextConverter( rtl_TextEn if ( pData ) return static_cast<rtl_TextToUnicodeConverter>(const_cast<ImplTextConverter *>(&pData->maConverter)); else - return 0; + return nullptr; } /* ----------------------------------------------------------------------- */ @@ -201,7 +201,7 @@ rtl_UnicodeToTextContext SAL_CALL rtl_createUnicodeToTextContext( rtl_UnicodeToT { const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter); if ( !pConverter ) - return 0; + return nullptr; else if ( pConverter->mpCreateUnicodeToTextContext ) return pConverter->mpCreateUnicodeToTextContext(); else diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index a0031be95520..e4a6a6c89217 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -160,11 +160,11 @@ static ImplUniCharTabData const aImplMS1252ToCharTabEx[MS1252TOCHARTABEX_COUNT] static ImplByteConvertData const aImplMS1252ByteCvtData = { aImplMS1252ToUniTab, - NULL, + nullptr, MS1252UNI_START, MS1252UNI_END, NOTABUNI_START, NOTABUNI_END, aImplA0FFSameToCharTab, - NULL, + nullptr, aImplMS1252ToCharTabEx, SAMEA0FFCHAR_START, SAMEA0FFCHAR_END, NOTABCHAR_START, NOTABCHAR_END, @@ -177,12 +177,12 @@ static ImplTextEncodingData const aImplMS1252TextEncodingData = { { &aImplMS1252ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -230,7 +230,7 @@ static ImplByteConvertData const aImplISO88591ByteCvtData = SAME8090UNI_START, SAME8090UNI_END, aImplA0FFSameToCharTab, aImpl8090SameToCharTab, - NULL, + nullptr, SAMEA0FFCHAR_START, SAMEA0FFCHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, 0 @@ -242,12 +242,12 @@ static ImplTextEncodingData const aImplISO88591TextEncodingData = { { &aImplISO88591ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -273,12 +273,12 @@ static ImplTextEncodingData const aImplISO88591TextEncodingData static ImplByteConvertData const aImplUSASCIIByteCvtData = { aImplMS1252ToUniTab, - NULL, + nullptr, MS1252UNI_START, MS1252UNI_END, NOTABUNI_START, NOTABUNI_END, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, 0 @@ -290,12 +290,12 @@ static ImplTextEncodingData const aImplUSASCIITextEncodingData = { { &aImplUSASCIIByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL }, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }, 1, 1, 1, @@ -308,7 +308,7 @@ static ImplTextEncodingData const aImplUSASCIITextEncodingData /* SCRIPT_LATIN, pc code page 437 */ static ImplTextEncodingData const aImplUTF8TextEncodingData - = { { NULL, + = { { nullptr, &ImplConvertUtf8ToUnicode, &ImplConvertUnicodeToUtf8, &ImplCreateUtf8ToUnicodeContext, @@ -348,8 +348,8 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData 3, 1, 0, - NULL, - NULL, + nullptr, + nullptr, RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_MULTIBYTE }; namespace { @@ -387,7 +387,7 @@ public: } function_ = reinterpret_cast< TextEncodingFunction * >( module_.getFunctionSymbol("sal_getFullTextEncodingData")); - if (function_ == 0) { + if (function_ == nullptr) { SAL_WARN( "sal.textenc", "Obtaining sal_getFullTextEncodingData function from sal_textenc" " library failed"); std::abort(); |