Convert NULL and 0 to nullptr.

This was created by looking at warnings produced by clang's
-Wzero-as-null-pointer-constant. This updates most issues in
Skia code. However, there are places where GL and Vulkan want
pointer values which are explicitly 0, external headers which
use NULL directly, and possibly more uses in un-compiled
sources (for other platforms).

Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345
Reviewed-on: https://skia-review.googlesource.com/39521
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

6 files changed, 9 insertions, 9 deletions

diff --git a/tools/SkShaper_harfbuzz.cpp b/tools/SkShaper_harfbuzz.cpp
index 9c7d69e92d..34fc712829 100644
--- a/tools/SkShaper_harfbuzz.cpp
+++ b/tools/SkShaper_harfbuzz.cpp
@@ -101,9 +101,9 @@ SkScalar SkShaper::shape(SkTextBlobBuilder* builder,
         return 0;
     }
 
-    hb_glyph_info_t* info = hb_buffer_get_glyph_infos(buffer, NULL);
+    hb_glyph_info_t* info = hb_buffer_get_glyph_infos(buffer, nullptr);
     hb_glyph_position_t* pos =
-            hb_buffer_get_glyph_positions(buffer, NULL);
+            hb_buffer_get_glyph_positions(buffer, nullptr);
     auto runBuffer = builder->allocRunTextPos(
             paint, SkToInt(len), SkToInt(textBytes), SkString());
     memcpy(runBuffer.utf8text, utf8text, textBytes);
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index 251604e1d9..8cee07f783 100644
--- a/tools/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
@@ -740,14 +740,14 @@ static void write_png_callback(png_structp png_ptr, png_bytep data, png_size_t l
 
 void SkDrawCommand::WritePNG(const uint8_t* rgba, unsigned width, unsigned height,
                              SkWStream& out, bool isOpaque) {
-    png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+    png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
     SkASSERT(png != nullptr);
     png_infop info_ptr = png_create_info_struct(png);
     SkASSERT(info_ptr != nullptr);
     if (setjmp(png_jmpbuf(png))) {
         SK_ABORT("png encode error");
     }
-    png_set_write_fn(png, &out, write_png_callback, NULL);
+    png_set_write_fn(png, &out, write_png_callback, nullptr);
     int colorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGBA;
     png_set_IHDR(png, info_ptr, width, height, 8, colorType, PNG_INTERLACE_NONE,
                  PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
@@ -770,7 +770,7 @@ void SkDrawCommand::WritePNG(const uint8_t* rgba, unsigned width, unsigned heigh
     }
     png_set_filter(png, 0, PNG_NO_FILTERS);
     png_write_image(png, &rows[0]);
-    png_destroy_write_struct(&png, NULL);
+    png_destroy_write_struct(&png, nullptr);
     sk_free(rows);
     sk_free(pixels);
 }
diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp
index 69382b412e..b4bcf68906 100644
--- a/tools/flags/SkCommandLineFlags.cpp
+++ b/tools/flags/SkCommandLineFlags.cpp
@@ -395,7 +395,7 @@ bool ShouldSkipImpl(const Strings& strings, const char* name) {
                 && strncmp(name, matchName, matchLen) == 0
                 : matchEnd ? matchLen <= testLen
                 && strncmp(name + testLen - matchLen, matchName, matchLen) == 0
-                : strstr(name, matchName) != 0) {
+                : strstr(name, matchName) != nullptr) {
             return matchExclude;
         }
     }
diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h
index fb63ac3140..b5dd9acf8a 100644
--- a/tools/gpu/gl/GLTestContext.h
+++ b/tools/gpu/gl/GLTestContext.h
@@ -30,7 +30,7 @@ public:
     const GrGLInterface *gl() const { return fGL.get(); }
 
     /** Used for testing EGLImage integration. Take a GL_TEXTURE_2D and wraps it in an EGL Image */
-    virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return 0; }
+    virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return nullptr; }
 
     virtual void destroyEGLImage(GrEGLImage) const { }
 
diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index 29dd1b4996..f5c0bc002e 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -110,7 +110,7 @@ int skiaserve_main() {
                               &answer_to_connection, &request,
                               MHD_OPTION_SOCK_ADDR, &address,
                               MHD_OPTION_END);
-    if (NULL == daemon) {
+    if (nullptr == daemon) {
         SkDebugf("Could not initialize daemon\n");
         return 1;
     }
diff --git a/tools/viewer/sk_app/unix/main_unix.cpp b/tools/viewer/sk_app/unix/main_unix.cpp
index beb3eda10e..2837c0332e 100644
--- a/tools/viewer/sk_app/unix/main_unix.cpp
+++ b/tools/viewer/sk_app/unix/main_unix.cpp
@@ -44,7 +44,7 @@ int main(int argc, char**argv) {
 
         while (!XPending(display)) {
             // Wait for an event on the file descriptor or for timer expiration
-            (void) select(count, &in_fds, NULL, NULL, &tv);
+            (void) select(count, &in_fds, nullptr, nullptr, &tv);
         }
 
         // Handle XEvents (if any) and flush the input