From c85af12d45928aecb20a087a009e1f5f19f980e2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Oct 2013 19:37:51 +0200 Subject: StickerDatabase: return std::string --- src/StickerCommands.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/StickerCommands.cxx') diff --git a/src/StickerCommands.cxx b/src/StickerCommands.cxx index 5fdc0ba15..4c2152789 100644 --- a/src/StickerCommands.cxx +++ b/src/StickerCommands.cxx @@ -65,16 +65,15 @@ handle_sticker_song(Client *client, int argc, char *argv[]) if (song == nullptr) return print_error(client, error); - char *value = sticker_song_get_value(song, argv[4]); + const auto value = sticker_song_get_value(song, argv[4]); db->ReturnSong(song); - if (value == NULL) { + if (value.empty()) { command_error(client, ACK_ERROR_NO_EXIST, "no such sticker"); return COMMAND_RETURN_ERROR; } - sticker_print_value(client, argv[4], value); - g_free(value); + sticker_print_value(client, argv[4], value.c_str()); return COMMAND_RETURN_OK; /* list song song_id */ -- cgit v1.2.3