diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/fs | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/Charset.cxx | 6 | ||||
| -rw-r--r-- | src/fs/Config.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 39bb36e77..dad5779f9 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -48,8 +48,8 @@ static bool IsSupportedCharset(const char *charset) { /* convert a space to check if the charset is valid */ - char *test = g_convert(" ", 1, charset, "UTF-8", NULL, NULL, NULL); - if (test == NULL) + char *test = g_convert(" ", 1, charset, "UTF-8", nullptr, nullptr, nullptr); + if (test == nullptr) return false; g_free(test); @@ -59,7 +59,7 @@ IsSupportedCharset(const char *charset) void SetFSCharset(const char *charset) { - assert(charset != NULL); + assert(charset != nullptr); if (!IsSupportedCharset(charset)) FormatFatalError("invalid filesystem charset: %s", charset); diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index 3d7e99b4a..63e64ef99 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -38,15 +38,15 @@ void ConfigureFS() { - const char *charset = NULL; + const char *charset = nullptr; - charset = config_get_string(CONF_FS_CHARSET, NULL); - if (charset == NULL) { + charset = config_get_string(CONF_FS_CHARSET, nullptr); + if (charset == nullptr) { #ifndef WIN32 const gchar **encodings; g_get_filename_charsets(&encodings); - if (encodings[0] != NULL && *encodings[0] != '\0') + if (encodings[0] != nullptr && *encodings[0] != '\0') charset = encodings[0]; #else /* Glib claims that file system encoding is always utf-8 |