core/file: Rename data_file_writef() -> file_writef()
For writing to files with printf-style formatting. Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
c5494811f4
commit
111fcd4e72
|
@ -61,11 +61,11 @@ static void __dbe_setup(struct database *db, unsigned int index)
|
||||||
static void __dbe_write(struct database *db, struct db_entry *dbe)
|
static void __dbe_write(struct database *db, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
if (dbe) {
|
if (dbe) {
|
||||||
data_file_writef(&db->db_file, "%u ", true);
|
file_writef(&db->db_file, "%u ", true);
|
||||||
db->db_ops->dbe_write(&db->db_file, dbe);
|
db->db_ops->dbe_write(&db->db_file, dbe);
|
||||||
} else
|
} else
|
||||||
data_file_writef(&db->db_file, "%u", false);
|
file_writef(&db->db_file, "%u", false);
|
||||||
data_file_writef(&db->db_file, "\n");
|
file_writef(&db->db_file, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void db_init(struct database *db, const char *filepath, bool autosave,
|
void db_init(struct database *db, const char *filepath, bool autosave,
|
||||||
|
@ -97,7 +97,7 @@ void db_save(struct database *db)
|
||||||
if (file_open(&db->db_file, OPEN_WRITE) == false)
|
if (file_open(&db->db_file, OPEN_WRITE) == false)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
data_file_writef(&db->db_file, "%u\n", db_actual_size(db));
|
file_writef(&db->db_file, "%u\n", db_actual_size(db));
|
||||||
for (unsigned int i = 0; i < db_actual_size(db); i++)
|
for (unsigned int i = 0; i < db_actual_size(db); i++)
|
||||||
__dbe_write(db, DB_ENTRY_AT(db, i));
|
__dbe_write(db, DB_ENTRY_AT(db, i));
|
||||||
|
|
||||||
|
|
|
@ -38,12 +38,12 @@ void date_read_stamp(struct file *f, struct date *date)
|
||||||
|
|
||||||
void date_write(struct file *f, struct date *date)
|
void date_write(struct file *f, struct date *date)
|
||||||
{
|
{
|
||||||
data_file_writef(f, "%u %u %u", date->d_year, date->d_month, date->d_day);
|
file_writef(f, "%u %u %u", date->d_year, date->d_month, date->d_day);
|
||||||
}
|
}
|
||||||
|
|
||||||
void date_write_stamp(struct file *f, struct date *date)
|
void date_write_stamp(struct file *f, struct date *date)
|
||||||
{
|
{
|
||||||
data_file_writef(f, "%u", htobe32(date->d_stamp));
|
file_writef(f, "%u", htobe32(date->d_stamp));
|
||||||
}
|
}
|
||||||
|
|
||||||
gchar *date_string(const struct date *date)
|
gchar *date_string(const struct date *date)
|
||||||
|
|
|
@ -157,7 +157,7 @@ static bool __file_open_write(struct file *file, enum open_mode mode)
|
||||||
file->f_mode = mode;
|
file->f_mode = mode;
|
||||||
if (mode == OPEN_WRITE_BINARY)
|
if (mode == OPEN_WRITE_BINARY)
|
||||||
return true;
|
return true;
|
||||||
return data_file_writef(file, "%d\n", file->f_version) > 0;
|
return file_writef(file, "%d\n", file->f_version) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool file_open(struct file *file, enum open_mode mode)
|
bool file_open(struct file *file, enum open_mode mode)
|
||||||
|
@ -213,17 +213,17 @@ gchar *data_file_readl(struct file *data)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
int data_file_writef(struct file *data, const char *fmt, ...)
|
int file_writef(struct file *file, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list argp;
|
va_list argp;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
va_start(argp, fmt);
|
va_start(argp, fmt);
|
||||||
ret = g_vfprintf(data->f_file, fmt, argp);
|
ret = g_vfprintf(file->f_file, fmt, argp);
|
||||||
va_end(argp);
|
va_end(argp);
|
||||||
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
REPORT_ERRNO(data->f_name);
|
REPORT_ERRNO(file->f_name);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,10 +73,10 @@ static void pl_artist_save(void)
|
||||||
if (!file_open(&artist_file, OPEN_WRITE))
|
if (!file_open(&artist_file, OPEN_WRITE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
data_file_writef(&artist_file, "%u\n", artist_db_get()->db_size);
|
file_writef(&artist_file, "%u\n", artist_db_get()->db_size);
|
||||||
db_for_each(dbe, next, artist_db_get()) {
|
db_for_each(dbe, next, artist_db_get()) {
|
||||||
playlist = ARTIST(dbe)->ar_playlist;
|
playlist = ARTIST(dbe)->ar_playlist;
|
||||||
data_file_writef(&artist_file, "%s\n", playlist->pl_name);
|
file_writef(&artist_file, "%s\n", playlist->pl_name);
|
||||||
playlist_generic_save(playlist, &artist_file, PL_SAVE_METADATA);
|
playlist_generic_save(playlist, &artist_file, PL_SAVE_METADATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -106,26 +106,26 @@ void playlist_generic_save(struct playlist *playlist, struct file *file,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (flags & PL_SAVE_ITER)
|
if (flags & PL_SAVE_ITER)
|
||||||
data_file_writef(file, "%u ", playlist_current_index(playlist));
|
file_writef(file, "%u ", playlist_current_index(playlist));
|
||||||
|
|
||||||
if (flags & PL_SAVE_FLAGS) {
|
if (flags & PL_SAVE_FLAGS) {
|
||||||
sort = playlist->pl_sort;
|
sort = playlist->pl_sort;
|
||||||
data_file_writef(file, "%u ", playlist->pl_random ? PL_RANDOM : 0);
|
file_writef(file, "%u ", playlist->pl_random ? PL_RANDOM : 0);
|
||||||
data_file_writef(file, "%u", g_slist_length(sort));
|
file_writef(file, "%u", g_slist_length(sort));
|
||||||
while (sort) {
|
while (sort) {
|
||||||
field = GPOINTER_TO_INT(sort->data);
|
field = GPOINTER_TO_INT(sort->data);
|
||||||
data_file_writef(file, " %u %d", abs(field) - 1, field > 0);
|
file_writef(file, " %u %d", abs(field) - 1, field > 0);
|
||||||
sort = g_slist_next(sort);
|
sort = g_slist_next(sort);
|
||||||
}
|
}
|
||||||
data_file_writef(file, "\n");
|
file_writef(file, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & PL_SAVE_TRACKS) {
|
if (flags & PL_SAVE_TRACKS) {
|
||||||
data_file_writef(file, "%u", playlist_size(playlist));
|
file_writef(file, "%u", playlist_size(playlist));
|
||||||
playlist_for_each(playlist, it)
|
playlist_for_each(playlist, it)
|
||||||
data_file_writef(file, " %u",
|
file_writef(file, " %u",
|
||||||
track_index(playlist_iter_track(it)));
|
track_index(playlist_iter_track(it)));
|
||||||
data_file_writef(file, "\n");
|
file_writef(file, "\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -190,10 +190,10 @@ static void pl_library_save(void)
|
||||||
if (!file_open(&lib_file, OPEN_WRITE))
|
if (!file_open(&lib_file, OPEN_WRITE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
data_file_writef(&lib_file, "%u\n", library_db_get()->db_size);
|
file_writef(&lib_file, "%u\n", library_db_get()->db_size);
|
||||||
db_for_each(dbe, next, library_db_get()) {
|
db_for_each(dbe, next, library_db_get()) {
|
||||||
playlist = LIBRARY(dbe)->li_playlist;
|
playlist = LIBRARY(dbe)->li_playlist;
|
||||||
data_file_writef(&lib_file, "%s\n", playlist->pl_name);
|
file_writef(&lib_file, "%s\n", playlist->pl_name);
|
||||||
playlist_generic_save(playlist, &lib_file, PL_SAVE_METADATA);
|
playlist_generic_save(playlist, &lib_file, PL_SAVE_METADATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -333,7 +333,7 @@ static void pl_system_save(void)
|
||||||
if (!file_open(&sys_pl_file, OPEN_WRITE))
|
if (!file_open(&sys_pl_file, OPEN_WRITE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
data_file_writef(&sys_pl_file, "%u\n", SYS_PL_NUM_PLAYLISTS);
|
file_writef(&sys_pl_file, "%u\n", SYS_PL_NUM_PLAYLISTS);
|
||||||
for (i = 0; i < SYS_PL_NUM_PLAYLISTS; i++) {
|
for (i = 0; i < SYS_PL_NUM_PLAYLISTS; i++) {
|
||||||
save = PL_SAVE_METADATA;
|
save = PL_SAVE_METADATA;
|
||||||
playlist = pl_system_get(i);
|
playlist = pl_system_get(i);
|
||||||
|
@ -345,7 +345,7 @@ static void pl_system_save(void)
|
||||||
save = PL_SAVE_ALL;
|
save = PL_SAVE_ALL;
|
||||||
}
|
}
|
||||||
|
|
||||||
data_file_writef(&sys_pl_file, "%s\n", playlist->pl_name);
|
file_writef(&sys_pl_file, "%s\n", playlist->pl_name);
|
||||||
playlist_generic_save(playlist, &sys_pl_file, save);
|
playlist_generic_save(playlist, &sys_pl_file, save);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ static void user_db_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
struct playlist *playlist = &USER_PLAYLIST(dbe)->pl_playlist;
|
struct playlist *playlist = &USER_PLAYLIST(dbe)->pl_playlist;
|
||||||
|
|
||||||
data_file_writef(file, "%s\n", playlist->pl_name);
|
file_writef(file, "%s\n", playlist->pl_name);
|
||||||
playlist_generic_save(playlist, file, PL_SAVE_ALL);
|
playlist_generic_save(playlist, file, PL_SAVE_ALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ static struct file gui_settings_file = FILE_INIT_DATA("", "settings", 0);
|
||||||
|
|
||||||
static void __settings_save_item(gpointer key, gpointer value, gpointer data)
|
static void __settings_save_item(gpointer key, gpointer value, gpointer data)
|
||||||
{
|
{
|
||||||
data_file_writef(&gui_settings_file, "%s %u\n", (const gchar *)key,
|
file_writef(&gui_settings_file, "%s %u\n", (const gchar *)key,
|
||||||
GPOINTER_TO_UINT(value));
|
GPOINTER_TO_UINT(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ static void __settings_save()
|
||||||
{
|
{
|
||||||
file_open(&gui_settings_file, OPEN_WRITE);
|
file_open(&gui_settings_file, OPEN_WRITE);
|
||||||
|
|
||||||
data_file_writef(&gui_settings_file, "%u\n", g_hash_table_size(gui_settings));
|
file_writef(&gui_settings_file, "%u\n", g_hash_table_size(gui_settings));
|
||||||
g_hash_table_foreach(gui_settings, __settings_save_item, NULL);
|
g_hash_table_foreach(gui_settings, __settings_save_item, NULL);
|
||||||
|
|
||||||
file_close(&gui_settings_file);
|
file_close(&gui_settings_file);
|
||||||
|
|
|
@ -282,7 +282,7 @@ static void album_write(struct file *file, struct db_entry *dbe)
|
||||||
struct artist *artist = album->al_artist;
|
struct artist *artist = album->al_artist;
|
||||||
struct genre *genre = album->al_genre;
|
struct genre *genre = album->al_genre;
|
||||||
|
|
||||||
data_file_writef(file, "%u %u %u %s", artist ? artist_index(artist) : 0,
|
file_writef(file, "%u %u %u %s", artist ? artist_index(artist) : 0,
|
||||||
genre ? genre_index(genre) : 0,
|
genre ? genre_index(genre) : 0,
|
||||||
album->al_year, album->al_name);
|
album->al_year, album->al_name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ struct db_entry *artist_read(struct file *file, unsigned int index)
|
||||||
|
|
||||||
static void artist_write(struct file *file, struct db_entry *dbe)
|
static void artist_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
data_file_writef(file, "%s", ARTIST(dbe)->ar_name);
|
file_writef(file, "%s", ARTIST(dbe)->ar_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ static struct db_entry *genre_read(struct file *file, unsigned int index)
|
||||||
|
|
||||||
static void genre_write(struct file *file, struct db_entry *dbe)
|
static void genre_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
data_file_writef(file, "%s", GENRE(dbe)->ge_name);
|
file_writef(file, "%s", GENRE(dbe)->ge_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ static struct db_entry *library_read(struct file *file, unsigned int index)
|
||||||
|
|
||||||
static void library_write(struct file *file, struct db_entry *dbe)
|
static void library_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
data_file_writef(file, "%s", LIBRARY(dbe)->li_path);
|
file_writef(file, "%s", LIBRARY(dbe)->li_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -182,11 +182,11 @@ static void track_write(struct file *file, struct db_entry *dbe)
|
||||||
struct track *track = TRACK(dbe);
|
struct track *track = TRACK(dbe);
|
||||||
gchar *path = __track_path(track);
|
gchar *path = __track_path(track);
|
||||||
|
|
||||||
data_file_writef(file, "%u %u %hu ", library_index(track->tr_library),
|
file_writef(file, "%u %u %hu ", library_index(track->tr_library),
|
||||||
album_index(track->tr_album),
|
album_index(track->tr_album),
|
||||||
track->tr_track);
|
track->tr_track);
|
||||||
date_write_stamp(file, &track->tr_date);
|
date_write_stamp(file, &track->tr_date);
|
||||||
data_file_writef(file, " %hu %hu %s\n%s", track->tr_count,
|
file_writef(file, " %hu %hu %s\n%s", track->tr_count,
|
||||||
track->tr_length,
|
track->tr_length,
|
||||||
track->tr_title,
|
track->tr_title,
|
||||||
path);
|
path);
|
||||||
|
|
|
@ -126,7 +126,7 @@ int data_file_readf(struct file *, const char *, ...);
|
||||||
* Write to a file with an fprintf(3) style format string.
|
* Write to a file with an fprintf(3) style format string.
|
||||||
* Returns the number of bytes successfully written.
|
* Returns the number of bytes successfully written.
|
||||||
*/
|
*/
|
||||||
int data_file_writef(struct file *, const char *, ...);
|
int file_writef(struct file *, const char *, ...);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reads the contents of a file as binary data.
|
* Reads the contents of a file as binary data.
|
||||||
|
|
|
@ -53,7 +53,7 @@ static struct db_entry *int_read(struct file *f, unsigned int index)
|
||||||
|
|
||||||
static void int_write(struct file *file, struct db_entry *dbe)
|
static void int_write(struct file *file, struct db_entry *dbe)
|
||||||
{
|
{
|
||||||
data_file_writef(file, "%u", INT_ENTRY(dbe)->ie_val);
|
file_writef(file, "%u", INT_ENTRY(dbe)->ie_val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct db_ops int_ops = {
|
static const struct db_ops int_ops = {
|
||||||
|
|
|
@ -28,14 +28,14 @@ void test_date()
|
||||||
g_assert_cmpuint(date.d_day, ==, 17);
|
g_assert_cmpuint(date.d_day, ==, 17);
|
||||||
g_assert_cmpuint(date.d_stamp, ==, 285607876);
|
g_assert_cmpuint(date.d_stamp, ==, 285607876);
|
||||||
date_write(&f, &date);
|
date_write(&f, &date);
|
||||||
data_file_writef(&f, "\n");
|
file_writef(&f, "\n");
|
||||||
|
|
||||||
date_today(&date);
|
date_today(&date);
|
||||||
g_assert_cmpuint(date.d_year, ==, today->tm_year + 1900);
|
g_assert_cmpuint(date.d_year, ==, today->tm_year + 1900);
|
||||||
g_assert_cmpuint(date.d_month, ==, today->tm_mon + 1);
|
g_assert_cmpuint(date.d_month, ==, today->tm_mon + 1);
|
||||||
g_assert_cmpuint(date.d_day, ==, today->tm_mday);
|
g_assert_cmpuint(date.d_day, ==, today->tm_mday);
|
||||||
date_write(&f, &date);
|
date_write(&f, &date);
|
||||||
data_file_writef(&f, "\n");
|
file_writef(&f, "\n");
|
||||||
|
|
||||||
date_set(&date, 1992, 10, 05);
|
date_set(&date, 1992, 10, 05);
|
||||||
g_assert_cmpuint(date.d_stamp, ==, 84543432);
|
g_assert_cmpuint(date.d_stamp, ==, 84543432);
|
||||||
|
|
|
@ -100,10 +100,10 @@ static void test_io()
|
||||||
|
|
||||||
fout.f_version = 1;
|
fout.f_version = 1;
|
||||||
g_assert_true(file_open(&fout, OPEN_WRITE));
|
g_assert_true(file_open(&fout, OPEN_WRITE));
|
||||||
data_file_writef(&fout, "1 ABCDE\n");
|
file_writef(&fout, "1 ABCDE\n");
|
||||||
data_file_writef(&fout, "2 FGHIJ KLMNO\n");
|
file_writef(&fout, "2 FGHIJ KLMNO\n");
|
||||||
data_file_writef(&fout, "3 \n");
|
file_writef(&fout, "3 \n");
|
||||||
data_file_writef(&fout, "4 5 PQRST\n");
|
file_writef(&fout, "4 5 PQRST\n");
|
||||||
file_close(&fout);
|
file_close(&fout);
|
||||||
g_assert_true(file_exists(&fout));
|
g_assert_true(file_exists(&fout));
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ static void __test_versioning_subprocess(unsigned int out, unsigned int in)
|
||||||
fin.f_version = in;
|
fin.f_version = in;
|
||||||
|
|
||||||
g_assert_true(file_open(&fout, OPEN_WRITE));
|
g_assert_true(file_open(&fout, OPEN_WRITE));
|
||||||
data_file_writef(&fout, "abcdefghijklmnopqrstuvwxyz");
|
file_writef(&fout, "abcdefghijklmnopqrstuvwxyz");
|
||||||
file_close(&fout);
|
file_close(&fout);
|
||||||
g_assert_true(file_exists(&fout));
|
g_assert_true(file_exists(&fout));
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ static void test_album()
|
||||||
g_assert_false(album_match_token(album, "skyward"));
|
g_assert_false(album_match_token(album, "skyward"));
|
||||||
|
|
||||||
file_open(&f, OPEN_WRITE);
|
file_open(&f, OPEN_WRITE);
|
||||||
data_file_writef(&f, "0 0 0 \n");
|
file_writef(&f, "0 0 0 \n");
|
||||||
album_ops->dbe_write(&f, &album->al_dbe);
|
album_ops->dbe_write(&f, &album->al_dbe);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
album_ops->dbe_free(&album->al_dbe);
|
album_ops->dbe_free(&album->al_dbe);
|
||||||
|
|
|
@ -41,7 +41,7 @@ static void test_artist()
|
||||||
g_assert_false(artist_match_token(artist, "hajime"));
|
g_assert_false(artist_match_token(artist, "hajime"));
|
||||||
|
|
||||||
file_open(&f, OPEN_WRITE);
|
file_open(&f, OPEN_WRITE);
|
||||||
data_file_writef(&f, "1 \n2 ");
|
file_writef(&f, "1 \n2 ");
|
||||||
artist_ops->dbe_write(&f, &artist->ar_dbe);
|
artist_ops->dbe_write(&f, &artist->ar_dbe);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
g_free(artist->ar_name);
|
g_free(artist->ar_name);
|
||||||
|
|
|
@ -39,7 +39,7 @@ static void test_genre()
|
||||||
g_assert_false(genre_match_token(genre, "rock"));
|
g_assert_false(genre_match_token(genre, "rock"));
|
||||||
|
|
||||||
file_open(&f, OPEN_WRITE);
|
file_open(&f, OPEN_WRITE);
|
||||||
data_file_writef(&f, "1 \n1 ");
|
file_writef(&f, "1 \n1 ");
|
||||||
genre_ops->dbe_write(&f, &genre->ge_dbe);
|
genre_ops->dbe_write(&f, &genre->ge_dbe);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
g_free(genre->ge_name);
|
g_free(genre->ge_name);
|
||||||
|
|
|
@ -32,7 +32,7 @@ static void test_library()
|
||||||
|
|
||||||
file_open(&f, OPEN_WRITE);
|
file_open(&f, OPEN_WRITE);
|
||||||
library_ops->dbe_write(&f, &link->li_dbe);
|
library_ops->dbe_write(&f, &link->li_dbe);
|
||||||
data_file_writef(&f, "\n");
|
file_writef(&f, "\n");
|
||||||
library_ops->dbe_write(&f, &zelda->li_dbe);
|
library_ops->dbe_write(&f, &zelda->li_dbe);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
|
|
||||||
|
|
|
@ -99,8 +99,8 @@ static void test_track()
|
||||||
g_assert_false(track_match_token(track, "hyrule"));
|
g_assert_false(track_match_token(track, "hyrule"));
|
||||||
|
|
||||||
file_open(&f, OPEN_WRITE);
|
file_open(&f, OPEN_WRITE);
|
||||||
data_file_writef(&f, "0 0 0 0 0 0 \n");
|
file_writef(&f, "0 0 0 0 0 0 \n");
|
||||||
data_file_writef(&f, "Hyrule Symphony/00 - No Track.ogg\n");
|
file_writef(&f, "Hyrule Symphony/00 - No Track.ogg\n");
|
||||||
track_ops->dbe_write(&f, &track->tr_dbe);
|
track_ops->dbe_write(&f, &track->tr_dbe);
|
||||||
file_close(&f);
|
file_close(&f);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue