Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: src/core/SkUtils.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkTextBlob.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkUtils.cpp
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp
index eff718b20fbfce51f2c6c4a5416eee273dd5878a..b063071932178b81e62164c08bcbc8208d98e2f7 100644
--- a/src/core/SkUtils.cpp
+++ b/src/core/SkUtils.cpp
@@ -193,7 +193,7 @@ int SkUTF8_CountUnichars(const char utf8[]) {
}
int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
- SkASSERT(NULL != utf8 || 0 == byteLength);
+ SkASSERT(utf8 || 0 == byteLength);
int count = 0;
const char* stop = utf8 + byteLength;
@@ -206,7 +206,7 @@ int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
}
SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
- SkASSERT(NULL != utf8);
+ SkASSERT(utf8);
const uint8_t* p = (const uint8_t*)utf8;
int c = *p;
@@ -227,7 +227,7 @@ SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
}
SkUnichar SkUTF8_NextUnichar(const char** ptr) {
- SkASSERT(NULL != ptr && NULL != *ptr);
+ SkASSERT(ptr && *ptr);
const uint8_t* p = (const uint8_t*)*ptr;
int c = *p;
@@ -249,7 +249,7 @@ SkUnichar SkUTF8_NextUnichar(const char** ptr) {
}
SkUnichar SkUTF8_PrevUnichar(const char** ptr) {
- SkASSERT(NULL != ptr && NULL != *ptr);
+ SkASSERT(ptr && *ptr);
const char* p = *ptr;
« no previous file with comments | « src/core/SkTextBlob.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698