summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Kong2018-07-16 20:11:34 -0500
committerYi Kong2018-07-16 20:11:34 -0500
commite1731a4f2e05f1abb4a45602067708851eaf1e14 (patch)
tree339c0ce3d3de7d6f5e0fb9bdada9b6210d1d470f /libutils/Unicode.cpp
parent895acebe946e34d2626716c5c4d7d7f2cc28c39d (diff)
downloadplatform-system-core-e1731a4f2e05f1abb4a45602067708851eaf1e14.tar.gz
platform-system-core-e1731a4f2e05f1abb4a45602067708851eaf1e14.tar.xz
platform-system-core-e1731a4f2e05f1abb4a45602067708851eaf1e14.zip
[libutils] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning. Test: m Bug: 68236239 Change-Id: I5e89ec8c42151875439d2656475a8739ab9cb7dc
Diffstat (limited to 'libutils/Unicode.cpp')
-rw-r--r--libutils/Unicode.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index 108683145..e00fb81af 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -159,7 +159,7 @@ int32_t utf32_from_utf8_at(const char *src, size_t src_len, size_t index, size_t
159 return -1; 159 return -1;
160 } 160 }
161 size_t dummy_index; 161 size_t dummy_index;
162 if (next_index == NULL) { 162 if (next_index == nullptr) {
163 next_index = &dummy_index; 163 next_index = &dummy_index;
164 } 164 }
165 size_t num_read; 165 size_t num_read;
@@ -173,7 +173,7 @@ int32_t utf32_from_utf8_at(const char *src, size_t src_len, size_t index, size_t
173 173
174ssize_t utf32_to_utf8_length(const char32_t *src, size_t src_len) 174ssize_t utf32_to_utf8_length(const char32_t *src, size_t src_len)
175{ 175{
176 if (src == NULL || src_len == 0) { 176 if (src == nullptr || src_len == 0) {
177 return -1; 177 return -1;
178 } 178 }
179 179
@@ -195,7 +195,7 @@ ssize_t utf32_to_utf8_length(const char32_t *src, size_t src_len)
195 195
196void utf32_to_utf8(const char32_t* src, size_t src_len, char* dst, size_t dst_len) 196void utf32_to_utf8(const char32_t* src, size_t src_len, char* dst, size_t dst_len)
197{ 197{
198 if (src == NULL || src_len == 0 || dst == NULL) { 198 if (src == nullptr || src_len == 0 || dst == nullptr) {
199 return; 199 return;
200 } 200 }
201 201
@@ -363,7 +363,7 @@ int strzcmp16_h_n(const char16_t *s1H, size_t n1, const char16_t *s2N, size_t n2
363 363
364void utf16_to_utf8(const char16_t* src, size_t src_len, char* dst, size_t dst_len) 364void utf16_to_utf8(const char16_t* src, size_t src_len, char* dst, size_t dst_len)
365{ 365{
366 if (src == NULL || src_len == 0 || dst == NULL) { 366 if (src == nullptr || src_len == 0 || dst == nullptr) {
367 return; 367 return;
368 } 368 }
369 369
@@ -440,7 +440,7 @@ ssize_t utf8_length(const char *src)
440 440
441ssize_t utf16_to_utf8_length(const char16_t *src, size_t src_len) 441ssize_t utf16_to_utf8_length(const char16_t *src, size_t src_len)
442{ 442{
443 if (src == NULL || src_len == 0) { 443 if (src == nullptr || src_len == 0) {
444 return -1; 444 return -1;
445 } 445 }
446 446
@@ -490,7 +490,7 @@ static inline void utf8_shift_and_mask(uint32_t* codePoint, const uint8_t byte)
490 490
491size_t utf8_to_utf32_length(const char *src, size_t src_len) 491size_t utf8_to_utf32_length(const char *src, size_t src_len)
492{ 492{
493 if (src == NULL || src_len == 0) { 493 if (src == nullptr || src_len == 0) {
494 return 0; 494 return 0;
495 } 495 }
496 size_t ret = 0; 496 size_t ret = 0;
@@ -515,7 +515,7 @@ size_t utf8_to_utf32_length(const char *src, size_t src_len)
515 515
516void utf8_to_utf32(const char* src, size_t src_len, char32_t* dst) 516void utf8_to_utf32(const char* src, size_t src_len, char32_t* dst)
517{ 517{
518 if (src == NULL || src_len == 0 || dst == NULL) { 518 if (src == nullptr || src_len == 0 || dst == nullptr) {
519 return; 519 return;
520 } 520 }
521 521