diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
| commit | 59f8144c50765189594d5932fc25869f9ea6e265 (patch) | |
| tree | f460d9f46a99040dea402bcb3ad2d84a0e734285 /src/DatabaseSave.cxx | |
| parent | 5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff) | |
| download | mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/DatabaseSave.cxx')
| -rw-r--r-- | src/DatabaseSave.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/DatabaseSave.cxx b/src/DatabaseSave.cxx index b7077b413..7c6e34a4e 100644 --- a/src/DatabaseSave.cxx +++ b/src/DatabaseSave.cxx @@ -51,7 +51,7 @@ enum { void db_save_internal(FILE *fp, const Directory *music_root) { - assert(music_root != NULL); + assert(music_root != nullptr); fprintf(fp, "%s\n", DIRECTORY_INFO_BEGIN); fprintf(fp, DB_FORMAT_PREFIX "%u\n", DB_FORMAT); @@ -76,18 +76,18 @@ db_load_internal(TextFile &file, Directory *music_root, Error &error) bool success; bool tags[TAG_NUM_OF_ITEM_TYPES]; - assert(music_root != NULL); + assert(music_root != nullptr); /* get initial info */ line = file.ReadLine(); - if (line == NULL || strcmp(DIRECTORY_INFO_BEGIN, line) != 0) { + if (line == nullptr || strcmp(DIRECTORY_INFO_BEGIN, line) != 0) { error.Set(db_domain, "Database corrupted"); return false; } memset(tags, false, sizeof(tags)); - while ((line = file.ReadLine()) != NULL && + while ((line = file.ReadLine()) != nullptr && strcmp(line, DIRECTORY_INFO_END) != 0) { if (g_str_has_prefix(line, DB_FORMAT_PREFIX)) { format = atoi(line + sizeof(DB_FORMAT_PREFIX) - 1); |