core/database: Remove dbe_setup()
This was added so tracks could bump the libary tag size. Now that the size field has been removed, we can remove this function. Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
1b18177d0a
commit
27436115c7
|
@ -55,8 +55,6 @@ static void __dbe_setup(struct database *db, unsigned int index)
|
||||||
dbe->dbe_key = db->db_ops->dbe_key(dbe);
|
dbe->dbe_key = db->db_ops->dbe_key(dbe);
|
||||||
g_hash_table_insert(db->db_keys, dbe->dbe_key, dbe);
|
g_hash_table_insert(db->db_keys, dbe->dbe_key, dbe);
|
||||||
db->db_size++;
|
db->db_size++;
|
||||||
if (db->db_ops->dbe_setup)
|
|
||||||
db->db_ops->dbe_setup(dbe);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -278,12 +278,11 @@ static void album_write(struct file *file, struct db_entry *dbe)
|
||||||
|
|
||||||
|
|
||||||
static const struct db_ops album_ops = {
|
static const struct db_ops album_ops = {
|
||||||
album_alloc,
|
.dbe_alloc = album_alloc,
|
||||||
album_free,
|
.dbe_free = album_free,
|
||||||
album_key,
|
.dbe_key = album_key,
|
||||||
album_read,
|
.dbe_read = album_read,
|
||||||
NULL,
|
.dbe_write = album_write,
|
||||||
album_write,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -49,12 +49,11 @@ static void artist_write(struct file *file, struct db_entry *dbe)
|
||||||
|
|
||||||
|
|
||||||
static const struct db_ops artist_ops = {
|
static const struct db_ops artist_ops = {
|
||||||
artist_alloc,
|
.dbe_alloc = artist_alloc,
|
||||||
artist_free,
|
.dbe_free = artist_free,
|
||||||
artist_key,
|
.dbe_key = artist_key,
|
||||||
artist_read,
|
.dbe_read = artist_read,
|
||||||
NULL,
|
.dbe_write = artist_write,
|
||||||
artist_write,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -47,12 +47,11 @@ static void genre_write(struct file *file, struct db_entry *dbe)
|
||||||
|
|
||||||
|
|
||||||
static const struct db_ops genre_ops = {
|
static const struct db_ops genre_ops = {
|
||||||
genre_alloc,
|
.dbe_alloc = genre_alloc,
|
||||||
genre_free,
|
.dbe_free = genre_free,
|
||||||
genre_key,
|
.dbe_key = genre_key,
|
||||||
genre_read,
|
.dbe_read = genre_read,
|
||||||
NULL,
|
.dbe_write = genre_write,
|
||||||
genre_write,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -51,12 +51,11 @@ static void library_write(struct file *file, struct db_entry *dbe)
|
||||||
|
|
||||||
|
|
||||||
static const struct db_ops library_ops = {
|
static const struct db_ops library_ops = {
|
||||||
library_alloc,
|
.dbe_alloc = library_alloc,
|
||||||
library_free,
|
.dbe_free = library_free,
|
||||||
library_key,
|
.dbe_key = library_key,
|
||||||
library_read,
|
.dbe_read = library_read,
|
||||||
NULL,
|
.dbe_write = library_write,
|
||||||
library_write,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -106,10 +106,6 @@ static void track_free(struct db_entry *dbe)
|
||||||
g_free(track);
|
g_free(track);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void track_setup(struct db_entry *dbe)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static gchar *track_key(struct db_entry *dbe)
|
static gchar *track_key(struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
return TRACK(dbe)->tr_path;
|
return TRACK(dbe)->tr_path;
|
||||||
|
@ -185,12 +181,11 @@ static void track_write(struct file *file, struct db_entry *dbe)
|
||||||
|
|
||||||
|
|
||||||
static const struct db_ops track_ops = {
|
static const struct db_ops track_ops = {
|
||||||
track_alloc,
|
.dbe_alloc = track_alloc,
|
||||||
track_free,
|
.dbe_free = track_free,
|
||||||
track_key,
|
.dbe_key = track_key,
|
||||||
track_read,
|
.dbe_read = track_read,
|
||||||
track_setup,
|
.dbe_write = track_write,
|
||||||
track_write,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -59,9 +59,6 @@ struct db_ops {
|
||||||
/* Read a single struct db_entry from disk. */
|
/* Read a single struct db_entry from disk. */
|
||||||
struct db_entry *(*dbe_read)(struct file *);
|
struct db_entry *(*dbe_read)(struct file *);
|
||||||
|
|
||||||
/* Set up a struct db_entry after adding to the database. */
|
|
||||||
void (*dbe_setup)(struct db_entry *);
|
|
||||||
|
|
||||||
/* Write a single struct db_entry to disk. */
|
/* Write a single struct db_entry to disk. */
|
||||||
void (*dbe_write)(struct file *, struct db_entry *);
|
void (*dbe_write)(struct file *, struct db_entry *);
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,7 +17,6 @@ struct int_entry {
|
||||||
|
|
||||||
#define INT_ENTRY(dbe) ((struct int_entry *)DBE_DATA(dbe))
|
#define INT_ENTRY(dbe) ((struct int_entry *)DBE_DATA(dbe))
|
||||||
static unsigned int test_free_count = 0;
|
static unsigned int test_free_count = 0;
|
||||||
static unsigned int test_setup_count = 0;
|
|
||||||
|
|
||||||
static struct int_entry *__int_alloc(unsigned int val)
|
static struct int_entry *__int_alloc(unsigned int val)
|
||||||
{
|
{
|
||||||
|
@ -52,11 +51,6 @@ static struct db_entry *int_read(struct file *f)
|
||||||
return &__int_alloc(val)->ie_dbe;
|
return &__int_alloc(val)->ie_dbe;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void int_setup(struct db_entry *dbe)
|
|
||||||
{
|
|
||||||
test_setup_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void int_write(struct file *file, struct db_entry *dbe)
|
static void int_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
file_writef(file, "%u", INT_ENTRY(dbe)->ie_val);
|
file_writef(file, "%u", INT_ENTRY(dbe)->ie_val);
|
||||||
|
@ -67,7 +61,6 @@ static const struct db_ops int_ops = {
|
||||||
.dbe_free = int_free,
|
.dbe_free = int_free,
|
||||||
.dbe_key = int_key,
|
.dbe_key = int_key,
|
||||||
.dbe_read = int_read,
|
.dbe_read = int_read,
|
||||||
.dbe_setup = int_setup,
|
|
||||||
.dbe_write = int_write,
|
.dbe_write = int_write,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -95,11 +88,9 @@ static void test_db_entry()
|
||||||
ent = INT_ENTRY(int_ops.dbe_read(&f));
|
ent = INT_ENTRY(int_ops.dbe_read(&f));
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
|
|
||||||
int_ops.dbe_setup(&ent->ie_dbe);
|
|
||||||
g_assert(ent->ie_dbe.dbe_data == ent);
|
g_assert(ent->ie_dbe.dbe_data == ent);
|
||||||
g_assert_cmpuint(ent->ie_val, ==, 1);
|
g_assert_cmpuint(ent->ie_val, ==, 1);
|
||||||
g_assert_cmpstr_free(int_ops.dbe_key(&ent->ie_dbe), ==, "1");
|
g_assert_cmpstr_free(int_ops.dbe_key(&ent->ie_dbe), ==, "1");
|
||||||
g_assert_cmpuint(test_setup_count, ==, 1);
|
|
||||||
|
|
||||||
int_ops.dbe_free(&ent->ie_dbe);
|
int_ops.dbe_free(&ent->ie_dbe);
|
||||||
g_assert_cmpuint(test_free_count, ==, 2);
|
g_assert_cmpuint(test_free_count, ==, 2);
|
||||||
|
@ -132,7 +123,6 @@ static void test_database(gconstpointer arg)
|
||||||
rmv.ie_val = 42;
|
rmv.ie_val = 42;
|
||||||
rmv.ie_dbe.dbe_index = 0;
|
rmv.ie_dbe.dbe_index = 0;
|
||||||
test_free_count = 0;
|
test_free_count = 0;
|
||||||
test_setup_count = 0;
|
|
||||||
|
|
||||||
/* db_insert() */
|
/* db_insert() */
|
||||||
for (i = 0; i < N; i++) {
|
for (i = 0; i < N; i++) {
|
||||||
|
@ -149,7 +139,6 @@ static void test_database(gconstpointer arg)
|
||||||
g_assert_null(dbe);
|
g_assert_null(dbe);
|
||||||
g_assert_cmpuint(db.db_size, ==, N);
|
g_assert_cmpuint(db.db_size, ==, N);
|
||||||
g_assert_cmpuint(db_actual_size(&db), ==, N);
|
g_assert_cmpuint(db_actual_size(&db), ==, N);
|
||||||
g_assert_cmpuint(test_setup_count, ==, N);
|
|
||||||
|
|
||||||
/* db_at() */
|
/* db_at() */
|
||||||
for (i = 0; i < N; i++) {
|
for (i = 0; i < N; i++) {
|
||||||
|
@ -273,10 +262,8 @@ static void test_save_load()
|
||||||
db_deinit(&db2);
|
db_deinit(&db2);
|
||||||
db2.db_entries = g_ptr_array_new();
|
db2.db_entries = g_ptr_array_new();
|
||||||
db2.db_keys = g_hash_table_new(g_str_hash, g_str_equal);
|
db2.db_keys = g_hash_table_new(g_str_hash, g_str_equal);
|
||||||
test_setup_count = 0;
|
|
||||||
db_load(&db2);
|
db_load(&db2);
|
||||||
g_assert_cmpuint(db2.db_size, ==, N / 2);
|
g_assert_cmpuint(db2.db_size, ==, N / 2);
|
||||||
g_assert_cmpuint(test_setup_count, ==, N / 2);
|
|
||||||
|
|
||||||
i = 1;
|
i = 1;
|
||||||
db_for_each(dbe, next, &db2) {
|
db_for_each(dbe, next, &db2) {
|
||||||
|
|
|
@ -82,7 +82,6 @@ static void test_track()
|
||||||
track = test_alloc("0/Hyrule Symphony/01 - Title Theme.ogg");
|
track = test_alloc("0/Hyrule Symphony/01 - Title Theme.ogg");
|
||||||
g_assert_nonnull(track);
|
g_assert_nonnull(track);
|
||||||
track->tr_dbe.dbe_index = 0;
|
track->tr_dbe.dbe_index = 0;
|
||||||
track_ops->dbe_setup(&track->tr_dbe);
|
|
||||||
test_verify_track(track);
|
test_verify_track(track);
|
||||||
|
|
||||||
g_assert_true( track_match_token(track, "title"));
|
g_assert_true( track_match_token(track, "title"));
|
||||||
|
@ -101,7 +100,6 @@ static void test_track()
|
||||||
file_open(&f, OPEN_READ);
|
file_open(&f, OPEN_READ);
|
||||||
track = TRACK(track_ops->dbe_read(&f));
|
track = TRACK(track_ops->dbe_read(&f));
|
||||||
track->tr_dbe.dbe_index = 0;
|
track->tr_dbe.dbe_index = 0;
|
||||||
track_ops->dbe_setup(&track->tr_dbe);
|
|
||||||
test_verify_notrack(track);
|
test_verify_notrack(track);
|
||||||
|
|
||||||
g_free(track->tr_path);
|
g_free(track->tr_path);
|
||||||
|
@ -109,7 +107,6 @@ static void test_track()
|
||||||
|
|
||||||
track = TRACK(track_ops->dbe_read(&f));
|
track = TRACK(track_ops->dbe_read(&f));
|
||||||
track->tr_dbe.dbe_index = 0;
|
track->tr_dbe.dbe_index = 0;
|
||||||
track_ops->dbe_setup(&track->tr_dbe);
|
|
||||||
test_verify_track(track);
|
test_verify_track(track);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue