Use nullptr instead of NULL in C++.

This commit is contained in:
Tatsuhiko Kubo 2015-04-15 21:18:39 +09:00
parent 061732adf0
commit 59f8397659
1 changed files with 4 additions and 4 deletions

View File

@ -737,15 +737,15 @@ char *get_exec_path(int argc, char **const argv, const char *cwd) {
if (argv0[0] == '/') { if (argv0[0] == '/') {
path = static_cast<char *>(malloc(len + 1)); path = static_cast<char *>(malloc(len + 1));
if (path == NULL) { if (path == nullptr) {
return NULL; return nullptr;
} }
memcpy(path, argv0, len + 1); memcpy(path, argv0, len + 1);
} else { } else {
auto cwdlen = strlen(cwd); auto cwdlen = strlen(cwd);
path = static_cast<char *>(malloc(len + 1 + cwdlen + 1)); path = static_cast<char *>(malloc(len + 1 + cwdlen + 1));
if (path == NULL) { if (path == nullptr) {
return NULL; return nullptr;
} }
memcpy(path, cwd, cwdlen); memcpy(path, cwd, cwdlen);
path[cwdlen] = '/'; path[cwdlen] = '/';