From 4aa7581f9dc97e3c8b01a9411cf665158895f4c0 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 21 Jan 2013 10:23:43 -0500
Subject: always use nullptr instead of NULL

---
 ponymix.cc | 2 +-
 pulse.cc   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ponymix.cc b/ponymix.cc
index d1e40e6..2dde405 100644
--- a/ponymix.cc
+++ b/ponymix.cc
@@ -545,7 +545,7 @@ bool parse_options(int argc, char** argv) {
   };
 
   for (;;) {
-    int opt = getopt_long(argc, argv, "c:d:ht:", opts, NULL);
+    int opt = getopt_long(argc, argv, "c:d:ht:", opts, nullptr);
     if (opt == -1)
       break;
 
diff --git a/pulse.cc b/pulse.cc
index 324c05d..7f05bf6 100644
--- a/pulse.cc
+++ b/pulse.cc
@@ -82,9 +82,9 @@ static int volume_as_percent(const pa_cvolume* cvol) {
 }
 
 static int xstrtol(const char *str, long *out) {
-  char *end = NULL;
+  char *end = nullptr;
 
-  if (str == NULL || *str == '\0') return -1;
+  if (str == nullptr || *str == '\0') return -1;
   errno = 0;
 
   *out = strtol(str, &end, 10);
-- 
cgit v1.2.3