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/db/ProxyDatabasePlugin.cxx | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to '')
| -rw-r--r-- | src/db/ProxyDatabasePlugin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx index 68d3a1128..3293c26b5 100644 --- a/src/db/ProxyDatabasePlugin.cxx +++ b/src/db/ProxyDatabasePlugin.cxx @@ -131,7 +131,7 @@ ProxyDatabase::Create(const config_param ¶m, Error &error) ProxyDatabase *db = new ProxyDatabase(); if (!db->Configure(param, error)) { delete db; - db = NULL; + db = nullptr; } return db; @@ -149,9 +149,9 @@ ProxyDatabase::Configure(const config_param ¶m, gcc_unused Error &error) bool ProxyDatabase::Open(Error &error) { - connection = mpd_connection_new(host.empty() ? NULL : host.c_str(), + connection = mpd_connection_new(host.empty() ? nullptr : host.c_str(), port, 0); - if (connection == NULL) { + if (connection == nullptr) { error.Set(libmpdclient_domain, (int)MPD_ERROR_OOM, "Out of memory"); return false; } @@ -254,7 +254,7 @@ Copy(TagBuilder &tag, TagType d_tag, for (unsigned i = 0;; ++i) { const char *value = mpd_song_get_tag(song, s_tag, i); - if (value == NULL) + if (value == nullptr) break; tag.AddItem(d_tag, value); @@ -339,7 +339,7 @@ ReceiveEntities(struct mpd_connection *connection) { std::list<ProxyEntity> entities; struct mpd_entity *entity; - while ((entity = mpd_recv_entity(connection)) != NULL) + while ((entity = mpd_recv_entity(connection)) != nullptr) entities.push_back(ProxyEntity(entity)); mpd_response_finish(connection); |