Permalink
Browse files

always use nullptr instead of NULL

  • Loading branch information...
1 parent 46f6e64 commit 4aa7581f9dc97e3c8b01a9411cf665158895f4c0 @falconindy committed Jan 21, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 ponymix.cc
  2. +2 −2 pulse.cc
View
@@ -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;
View
@@ -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);

0 comments on commit 4aa7581

Please sign in to comment.