1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools: replace NULL with nullptr

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/25179
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Juan José Arboleda 2018-12-21 20:26:17 -05:00 committed by Rich Trott
parent 571273adad
commit a2f81df5a7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/icu/iculslocs.cc
View File

@ -232,14 +232,14 @@ int dumpAllButInstalledLocales(int lev,
int list(const char* toBundle) { int list(const char* toBundle) {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
FILE* bf = NULL; // NOLINT (readability/null_usage) FILE* bf = nullptr;
if (toBundle != NULL) { // NOLINT (readability/null_usage) if (toBundle != nullptr) {
if (VERBOSE) { if (VERBOSE) {
printf("writing to bundle %s\n", toBundle); printf("writing to bundle %s\n", toBundle);
} }
bf = fopen(toBundle, "wb"); bf = fopen(toBundle, "wb");
if (bf == NULL) { // NOLINT (readability/null_usage) if (bf == nullptr) {
printf("ERROR: Could not open '%s' for writing.\n", toBundle); printf("ERROR: Could not open '%s' for writing.\n", toBundle);
return 1; return 1;
} }
@ -260,7 +260,7 @@ int list(const char* toBundle) {
ASSERT_SUCCESS(&status, "while opening the bundle"); ASSERT_SUCCESS(&status, "while opening the bundle");
icu::LocalUResourceBundlePointer installedLocales( icu::LocalUResourceBundlePointer installedLocales(
// NOLINTNEXTLINE (readability/null_usage) // NOLINTNEXTLINE (readability/null_usage)
ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status)); ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, nullptr, &status));
ASSERT_SUCCESS(&status, "while fetching installed locales"); ASSERT_SUCCESS(&status, "while fetching installed locales");
int32_t count = ures_getSize(installedLocales.getAlias()); int32_t count = ures_getSize(installedLocales.getAlias());
@ -268,7 +268,7 @@ int list(const char* toBundle) {
printf("Locales: %d\n", count); printf("Locales: %d\n", count);
} }
if (bf != NULL) { // NOLINT (readability/null_usage) if (bf != nullptr) {
// write the HEADER // write the HEADER
fprintf(bf, fprintf(bf,
"// NOTE: This file was generated during the build process.\n" "// NOTE: This file was generated during the build process.\n"
@ -312,17 +312,17 @@ int list(const char* toBundle) {
UBool exists; UBool exists;
if (localeExists(key, &exists)) { if (localeExists(key, &exists)) {
if (bf != NULL) fclose(bf); // NOLINT (readability/null_usage) if (bf != nullptr) fclose(bf);
return 1; // get out. return 1; // get out.
} }
if (exists) { if (exists) {
validCount++; validCount++;
printf("%s\n", key); printf("%s\n", key);
if (bf != NULL) { // NOLINT (readability/null_usage) if (bf != nullptr) {
fprintf(bf, " %s {\"\"}\n", key); fprintf(bf, " %s {\"\"}\n", key);
} }
} else { } else {
if (bf != NULL) { // NOLINT (readability/null_usage) if (bf != nullptr) {
fprintf(bf, "// %s {\"\"}\n", key); fprintf(bf, "// %s {\"\"}\n", key);
} }
if (VERBOSE) { if (VERBOSE) {
@ -331,7 +331,7 @@ int list(const char* toBundle) {
} }
} }
if (bf != NULL) { // NOLINT (readability/null_usage) if (bf != nullptr) {
fprintf(bf, " } // %d/%d valid\n", validCount, count); fprintf(bf, " } // %d/%d valid\n", validCount, count);
// write the HEADER // write the HEADER
fprintf(bf, "}\n"); fprintf(bf, "}\n");
@ -373,7 +373,7 @@ int main(int argc, const char* argv[]) {
usage(); usage();
return 0; return 0;
} else if (!strcmp(arg, "-l")) { } else if (!strcmp(arg, "-l")) {
if (list(NULL)) { // NOLINT (readability/null_usage) if (list(nullptr)) {
return 1; return 1;
} }
} else if (!strcmp(arg, "-b") && (argsLeft >= 1)) { } else if (!strcmp(arg, "-b") && (argsLeft >= 1)) {