aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-01-21 10:23:43 -0500
committerDave Reisner <dreisner@archlinux.org>2013-01-21 15:49:31 -0500
commit4aa7581f9dc97e3c8b01a9411cf665158895f4c0 (patch)
treec34c0e90fca7bcc37cf0ac49339b8b7c287a1220
parent46f6e64539f77eb07b2886aaaab358afd72569ce (diff)
downloadmirror-ponymix-4aa7581f9dc97e3c8b01a9411cf665158895f4c0.tar.gz
mirror-ponymix-4aa7581f9dc97e3c8b01a9411cf665158895f4c0.tar.bz2
mirror-ponymix-4aa7581f9dc97e3c8b01a9411cf665158895f4c0.zip
always use nullptr instead of NULL
-rw-r--r--ponymix.cc2
-rw-r--r--pulse.cc4
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);