Resolve '-Wzero-as-null-pointer-constant' warning

kazuho · Mar 24, 2023 · 69d6fdf · 69d6fdf
1 parent 111c9be
commit 69d6fdf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 prefix=/usr/local
 includedir=$(prefix)/include
+CXX_FLAGS=-Wall -Wextra -Wzero-as-null-pointer-constant
 
 check: test
 
@@ -8,10 +9,10 @@ test: test-core test-core-int64
 	./test-core-int64
 
 test-core: picojson.h test.cc picotest/picotest.c picotest/picotest.h
-	$(CXX) -Wall test.cc picotest/picotest.c -o $@
+	$(CXX) $(CXX_FLAGS) test.cc picotest/picotest.c -o $@
 
 test-core-int64: picojson.h test.cc picotest/picotest.c picotest/picotest.h
-	$(CXX) -Wall -DPICOJSON_USE_INT64 test.cc picotest/picotest.c -o $@
+	$(CXX) $(CXX_FLAGS) -DPICOJSON_USE_INT64 test.cc picotest/picotest.c -o $@
 
 clean:
 	rm -f test-core test-core-int64

diff --git a/examples/github-issues.cc b/examples/github-issues.cc
@@ -35,7 +35,7 @@ typedef struct {
 
 MEMFILE *memfopen() {
   MEMFILE *mf = (MEMFILE *)malloc(sizeof(MEMFILE));
-  mf->data = NULL;
+  mf->data = nullptr;
   mf->size = 0;
   return mf;
 }

diff --git a/picojson.h b/picojson.h
@@ -1103,7 +1103,7 @@ template <typename Iter> inline std::string parse(value &out, Iter &pos, const I
 
 template <typename Context, typename Iter> inline Iter _parse(Context &ctx, const Iter &first, const Iter &last, std::string *err) {
   input<Iter> in(first, last);
-  if (!_parse(ctx, in) && err != NULL) {
+  if (!_parse(ctx, in) && err != nullptr) {
     char buf[64];
     SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
     *err = buf;