oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Tag: use new[]/delete[] instead of g_new()/g_free()

Browse Source
This commit is contained in:
Max Kellermann 2013-12-03 11:16:25 +01:00
parent 8a5209ad93
commit 4ab586aaf1
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tag/Tag.cxx
View File

@ -25,7 +25,6 @@
#include "TagBuilder.hxx" #include "TagBuilder.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -59,12 +58,6 @@ tag_name_parse_i(const char *name)
return TAG_NUM_OF_ITEM_TYPES; return TAG_NUM_OF_ITEM_TYPES;
} }
static size_t
items_size(const Tag &tag)
{
return tag.num_items * sizeof(TagItem *);
}
void void
Tag::Clear() Tag::Clear()
{ {
@ -76,7 +69,7 @@ Tag::Clear()
tag_pool_put_item(items[i]); tag_pool_put_item(items[i]);
tag_pool_lock.unlock(); tag_pool_lock.unlock();
g_free(items); delete[] items;
items = nullptr; items = nullptr;
num_items = 0; num_items = 0;
} }
@ -88,7 +81,7 @@ Tag::~Tag()
tag_pool_put_item(items[i]); tag_pool_put_item(items[i]);
tag_pool_lock.unlock(); tag_pool_lock.unlock();
g_free(items); delete[] items;
} }
Tag::Tag(const Tag &other) Tag::Tag(const Tag &other)
@ -97,7 +90,7 @@ Tag::Tag(const Tag &other)
num_items(other.num_items) num_items(other.num_items)
{ {
if (num_items > 0) { if (num_items > 0) {
items = (TagItem **)g_malloc(items_size(other)); items = new TagItem *[num_items];
tag_pool_lock.lock(); tag_pool_lock.lock();
for (unsigned i = 0; i < num_items; i++) for (unsigned i = 0; i < num_items; i++)

2
src/tag/TagBuilder.cxx
View File

@ -125,7 +125,7 @@ TagBuilder::Commit(Tag &tag)
object */ object */
const unsigned n_items = items.size(); const unsigned n_items = items.size();
tag.num_items = n_items; tag.num_items = n_items;
tag.items = g_new(TagItem *, n_items); tag.items = new TagItem *[n_items];
std::copy_n(items.begin(), n_items, tag.items); std::copy_n(items.begin(), n_items, tag.items);
items.clear(); items.clear();