always use nullptr instead of NULL

falconindy · Jan 21, 2013 · 4aa7581 · 4aa7581
1 parent 46f6e64
commit 4aa7581
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);