Use nullptr instead of 0 or NULL

7 files changed, 12 insertions, 12 deletions

diff --git a/libtests/aes.cc b/libtests/aes.cc
index 4541fffe..5ae8152a 100644
--- a/libtests/aes.cc
+++ b/libtests/aes.cc
@@ -29,9 +29,9 @@ main(int argc, char* argv[])
 {
     bool encrypt = true;
     bool cbc_mode = true;
-    char* hexkey = 0;
-    char* infilename = 0;
-    char* outfilename = 0;
+    char* hexkey = nullptr;
+    char* infilename = nullptr;
+    char* outfilename = nullptr;
     bool zero_iv = false;
     bool static_iv = false;
     bool disable_padding = false;
@@ -65,7 +65,7 @@ main(int argc, char* argv[])
             usage();
         }
     }
-    if (outfilename == 0) {
+    if (outfilename == nullptr) {
         usage();
     }
 
@@ -81,14 +81,14 @@ main(int argc, char* argv[])
         t[1] = hexkey[i + 1];
         t[2] = '\0';
 
-        long val = strtol(t, 0, 16);
+        long val = strtol(t, nullptr, 16);
         key[i / 2] = static_cast<unsigned char>(val);
     }
 
     Pl_StdioFile* out = new Pl_StdioFile("stdout", outfile);
     Pl_AES_PDF* aes = new Pl_AES_PDF("aes_128_cbc", out, encrypt, key, keylen);
     delete[] key;
-    key = 0;
+    key = nullptr;
     if (!cbc_mode) {
         aes->disableCBC();
     }
diff --git a/libtests/arg_parser.cc b/libtests/arg_parser.cc
index 6b4c829f..c9474d55 100644
--- a/libtests/arg_parser.cc
+++ b/libtests/arg_parser.cc
@@ -51,7 +51,7 @@ ArgParser::initOptions()
     ap.addBare("potato", b(&ArgParser::handlePotato));
     ap.addRequiredParameter("salad", p(&ArgParser::handleSalad), "tossed");
     ap.addOptionalParameter("moo", p(&ArgParser::handleMoo));
-    char const* choices[] = {"pig", "boar", "sow", 0};
+    char const* choices[] = {"pig", "boar", "sow", nullptr};
     ap.addChoices("oink", p(&ArgParser::handleOink), true, choices);
     ap.selectHelpOptionTable();
     ap.addBare("version", [this]() { output("3.14159"); });
diff --git a/libtests/numrange.cc b/libtests/numrange.cc
index c0bf5bd7..ded03324 100644
--- a/libtests/numrange.cc
+++ b/libtests/numrange.cc
@@ -4,7 +4,7 @@
 static void
 test_numrange(char const* range)
 {
-    if (range == 0) {
+    if (range == nullptr) {
         std::cout << "null" << std::endl;
     } else {
         std::vector<int> result = QUtil::parse_numrange(range, 15);
diff --git a/libtests/predictors.cc b/libtests/predictors.cc
index fd1cc2ad..d7825bc6 100644
--- a/libtests/predictors.cc
+++ b/libtests/predictors.cc
@@ -21,7 +21,7 @@ run(char const* filename,
     FILE* in = QUtil::safe_fopen(filename, "rb");
     FILE* o1 = QUtil::safe_fopen("out", "wb");
     Pipeline* out = new Pl_StdioFile("out", o1);
-    Pipeline* pl = 0;
+    Pipeline* pl = nullptr;
     if (strcmp(filter, "png") == 0) {
         pl = new Pl_PNGFilter(
             "png",
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index a6f1282a..be5b6b1b 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -489,7 +489,7 @@ same_file_test()
     assert_same_file("qutil.out", "qutil.out", true);
     assert_same_file("qutil.out", "other-file", false);
     assert_same_file("qutil.out", "", false);
-    assert_same_file("qutil.out", 0, false);
+    assert_same_file("qutil.out", nullptr, false);
     assert_same_file("", "qutil.out", false);
 }
 
diff --git a/libtests/random.cc b/libtests/random.cc
index 40ef7d47..899c264c 100644
--- a/libtests/random.cc
+++ b/libtests/random.cc
@@ -56,7 +56,7 @@ main()
     if (!((buf[0] == 0) && (buf[1] == 1) && (buf[2] == 2) && (buf[3] == 3))) {
         std::cout << "fail: bogus random didn't provide correct bytes\n";
     }
-    QUtil::setRandomDataProvider(0);
+    QUtil::setRandomDataProvider(nullptr);
     if (QUtil::getRandomDataProvider() != orig_rdp) {
         std::cout << "fail: passing null to setRandomDataProvider "
                      "didn't reset the random data provider\n";
diff --git a/libtests/rc4.cc b/libtests/rc4.cc
index 874c11ff..ca4af91d 100644
--- a/libtests/rc4.cc
+++ b/libtests/rc4.cc
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
         t[1] = hexkey[i + 1];
         t[2] = '\0';
 
-        long val = strtol(t, 0, 16);
+        long val = strtol(t, nullptr, 16);
         key[i / 2] = static_cast<unsigned char>(val);
     }