From 111fcd4e7202942692974e273c31025babe177b1 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Wed, 21 Feb 2018 08:19:19 -0500
Subject: [PATCH] core/file: Rename data_file_writef() -> file_writef()

For writing to files with printf-style formatting.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 core/database.c           |  8 ++++----
 core/date.c               |  4 ++--
 core/file.c               |  8 ++++----
 core/playlists/artist.c   |  4 ++--
 core/playlists/generic.c  | 16 ++++++++--------
 core/playlists/library.c  |  4 ++--
 core/playlists/system.c   |  4 ++--
 core/playlists/user.c     |  2 +-
 core/settings.c           |  4 ++--
 core/tags/album.c         |  2 +-
 core/tags/artist.c        |  2 +-
 core/tags/genre.c         |  2 +-
 core/tags/library.c       |  2 +-
 core/tags/track.c         |  4 ++--
 include/core/file.h       |  2 +-
 tests/core/database.c     |  2 +-
 tests/core/date.c         |  4 ++--
 tests/core/file.c         | 10 +++++-----
 tests/core/tags/album.c   |  2 +-
 tests/core/tags/artist.c  |  2 +-
 tests/core/tags/genre.c   |  2 +-
 tests/core/tags/library.c |  2 +-
 tests/core/tags/track.c   |  4 ++--
 23 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/core/database.c b/core/database.c
index 0d089be4..78b7f008 100644
--- a/core/database.c
+++ b/core/database.c
@@ -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)
 {
 	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);
 	} else
-		data_file_writef(&db->db_file, "%u", false);
-	data_file_writef(&db->db_file, "\n");
+		file_writef(&db->db_file, "%u", false);
+	file_writef(&db->db_file, "\n");
 }
 
 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)
 		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++)
 		__dbe_write(db, DB_ENTRY_AT(db, i));
 
diff --git a/core/date.c b/core/date.c
index f20501ae..5a112e01 100644
--- a/core/date.c
+++ b/core/date.c
@@ -38,12 +38,12 @@ void date_read_stamp(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)
 {
-	data_file_writef(f, "%u", htobe32(date->d_stamp));
+	file_writef(f, "%u", htobe32(date->d_stamp));
 }
 
 gchar *date_string(const struct date *date)
diff --git a/core/file.c b/core/file.c
index 9c8d546c..dc251652 100644
--- a/core/file.c
+++ b/core/file.c
@@ -157,7 +157,7 @@ static bool __file_open_write(struct file *file, enum open_mode mode)
 	file->f_mode = mode;
 	if (mode == OPEN_WRITE_BINARY)
 		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)
@@ -213,17 +213,17 @@ gchar *data_file_readl(struct file *data)
 	return res;
 }
 
-int data_file_writef(struct file *data, const char *fmt, ...)
+int file_writef(struct file *file, const char *fmt, ...)
 {
 	va_list argp;
 	int ret;
 
 	va_start(argp, fmt);
-	ret = g_vfprintf(data->f_file, fmt, argp);
+	ret = g_vfprintf(file->f_file, fmt, argp);
 	va_end(argp);
 
 	if (ret < 0)
-		REPORT_ERRNO(data->f_name);
+		REPORT_ERRNO(file->f_name);
 	return ret;
 }
 
diff --git a/core/playlists/artist.c b/core/playlists/artist.c
index 88247a0a..37bd3cf1 100644
--- a/core/playlists/artist.c
+++ b/core/playlists/artist.c
@@ -73,10 +73,10 @@ static void pl_artist_save(void)
 	if (!file_open(&artist_file, OPEN_WRITE))
 		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()) {
 		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);
 	}
 
diff --git a/core/playlists/generic.c b/core/playlists/generic.c
index 22c805b1..e707ce09 100644
--- a/core/playlists/generic.c
+++ b/core/playlists/generic.c
@@ -106,26 +106,26 @@ void playlist_generic_save(struct playlist *playlist, struct file *file,
 		return;
 
 	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) {
 		sort = playlist->pl_sort;
-		data_file_writef(file, "%u ", playlist->pl_random ? PL_RANDOM : 0);
-		data_file_writef(file, "%u",  g_slist_length(sort));
+		file_writef(file, "%u ", playlist->pl_random ? PL_RANDOM : 0);
+		file_writef(file, "%u",  g_slist_length(sort));
 		while (sort) {
 			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);
 		}
-		data_file_writef(file, "\n");
+		file_writef(file, "\n");
 	}
 
 	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)
-			data_file_writef(file, " %u",
+			file_writef(file, " %u",
 					track_index(playlist_iter_track(it)));
-		data_file_writef(file, "\n");
+		file_writef(file, "\n");
 	}
 }
 
diff --git a/core/playlists/library.c b/core/playlists/library.c
index d7e56448..52d28fe7 100644
--- a/core/playlists/library.c
+++ b/core/playlists/library.c
@@ -190,10 +190,10 @@ static void pl_library_save(void)
 	if (!file_open(&lib_file, OPEN_WRITE))
 		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()) {
 		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);
 	}
 
diff --git a/core/playlists/system.c b/core/playlists/system.c
index 9bd2d1e6..5b7181a6 100644
--- a/core/playlists/system.c
+++ b/core/playlists/system.c
@@ -333,7 +333,7 @@ static void pl_system_save(void)
 	if (!file_open(&sys_pl_file, OPEN_WRITE))
 		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++) {
 		save     = PL_SAVE_METADATA;
 		playlist = pl_system_get(i);
@@ -345,7 +345,7 @@ static void pl_system_save(void)
 			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);
 
 	}
diff --git a/core/playlists/user.c b/core/playlists/user.c
index 552a1ac2..076ab599 100644
--- a/core/playlists/user.c
+++ b/core/playlists/user.c
@@ -50,7 +50,7 @@ static void user_db_write(struct file *file, struct db_entry *dbe)
 {
 	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);
 }
 
diff --git a/core/settings.c b/core/settings.c
index 559b6163..e0474fc0 100644
--- a/core/settings.c
+++ b/core/settings.c
@@ -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)
 {
-	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));
 }
 
@@ -18,7 +18,7 @@ static void __settings_save()
 {
 	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);
 
 	file_close(&gui_settings_file);
diff --git a/core/tags/album.c b/core/tags/album.c
index e548e03a..41ea0fb4 100644
--- a/core/tags/album.c
+++ b/core/tags/album.c
@@ -282,7 +282,7 @@ static void album_write(struct file *file, struct db_entry *dbe)
 	struct artist *artist = album->al_artist;
 	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,
 					 album->al_year, album->al_name);
 }
diff --git a/core/tags/artist.c b/core/tags/artist.c
index 54711671..fd094460 100644
--- a/core/tags/artist.c
+++ b/core/tags/artist.c
@@ -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)
 {
-	data_file_writef(file, "%s", ARTIST(dbe)->ar_name);
+	file_writef(file, "%s", ARTIST(dbe)->ar_name);
 }
 
 
diff --git a/core/tags/genre.c b/core/tags/genre.c
index 6f16015c..144506e0 100644
--- a/core/tags/genre.c
+++ b/core/tags/genre.c
@@ -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)
 {
-	data_file_writef(file, "%s", GENRE(dbe)->ge_name);
+	file_writef(file, "%s", GENRE(dbe)->ge_name);
 }
 
 
diff --git a/core/tags/library.c b/core/tags/library.c
index 0dcab7d5..c4999680 100644
--- a/core/tags/library.c
+++ b/core/tags/library.c
@@ -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)
 {
-	data_file_writef(file, "%s", LIBRARY(dbe)->li_path);
+	file_writef(file, "%s", LIBRARY(dbe)->li_path);
 }
 
 
diff --git a/core/tags/track.c b/core/tags/track.c
index 537a25bd..76eb0b75 100644
--- a/core/tags/track.c
+++ b/core/tags/track.c
@@ -182,11 +182,11 @@ static void track_write(struct file *file, struct db_entry *dbe)
 	struct track *track = TRACK(dbe);
 	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),
 					track->tr_track);
 	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_title,
 					     path);
diff --git a/include/core/file.h b/include/core/file.h
index af60eacf..26abee86 100644
--- a/include/core/file.h
+++ b/include/core/file.h
@@ -126,7 +126,7 @@ int data_file_readf(struct file *, const char *, ...);
  * Write to a file with an fprintf(3) style format string.
  * 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.
diff --git a/tests/core/database.c b/tests/core/database.c
index 5304860f..99b6608d 100644
--- a/tests/core/database.c
+++ b/tests/core/database.c
@@ -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)
 {
-	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 = {
diff --git a/tests/core/date.c b/tests/core/date.c
index 2d71cf01..7bd041dd 100644
--- a/tests/core/date.c
+++ b/tests/core/date.c
@@ -28,14 +28,14 @@ void test_date()
 	g_assert_cmpuint(date.d_day,   ==,   17);
 	g_assert_cmpuint(date.d_stamp, ==, 285607876);
 	date_write(&f, &date);
-	data_file_writef(&f, "\n");
+	file_writef(&f, "\n");
 
 	date_today(&date);
 	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_day,   ==, today->tm_mday);
 	date_write(&f, &date);
-	data_file_writef(&f, "\n");
+	file_writef(&f, "\n");
 
 	date_set(&date, 1992, 10, 05);
 	g_assert_cmpuint(date.d_stamp, ==, 84543432);
diff --git a/tests/core/file.c b/tests/core/file.c
index bbf98bc1..934bf25b 100644
--- a/tests/core/file.c
+++ b/tests/core/file.c
@@ -100,10 +100,10 @@ static void test_io()
 
 	fout.f_version = 1;
 	g_assert_true(file_open(&fout, OPEN_WRITE));
-	data_file_writef(&fout, "1 ABCDE\n");
-	data_file_writef(&fout, "2 FGHIJ KLMNO\n");
-	data_file_writef(&fout, "3 \n");
-	data_file_writef(&fout, "4 5 PQRST\n");
+	file_writef(&fout, "1 ABCDE\n");
+	file_writef(&fout, "2 FGHIJ KLMNO\n");
+	file_writef(&fout, "3 \n");
+	file_writef(&fout, "4 5 PQRST\n");
 	file_close(&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;
 
 	g_assert_true(file_open(&fout, OPEN_WRITE));
-	data_file_writef(&fout, "abcdefghijklmnopqrstuvwxyz");
+	file_writef(&fout, "abcdefghijklmnopqrstuvwxyz");
 	file_close(&fout);
 	g_assert_true(file_exists(&fout));
 
diff --git a/tests/core/tags/album.c b/tests/core/tags/album.c
index dbfaaf8b..a8f0b2cd 100644
--- a/tests/core/tags/album.c
+++ b/tests/core/tags/album.c
@@ -59,7 +59,7 @@ static void test_album()
 	g_assert_false(album_match_token(album, "skyward"));
 
 	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);
 	file_close(&f);
 	album_ops->dbe_free(&album->al_dbe);
diff --git a/tests/core/tags/artist.c b/tests/core/tags/artist.c
index c948d18e..eb9d23d7 100644
--- a/tests/core/tags/artist.c
+++ b/tests/core/tags/artist.c
@@ -41,7 +41,7 @@ static void test_artist()
 	g_assert_false(artist_match_token(artist, "hajime"));
 
 	file_open(&f, OPEN_WRITE);
-	data_file_writef(&f, "1 \n2 ");
+	file_writef(&f, "1 \n2 ");
 	artist_ops->dbe_write(&f, &artist->ar_dbe);
 	file_close(&f);
 	g_free(artist->ar_name);
diff --git a/tests/core/tags/genre.c b/tests/core/tags/genre.c
index 44735491..9328967f 100644
--- a/tests/core/tags/genre.c
+++ b/tests/core/tags/genre.c
@@ -39,7 +39,7 @@ static void test_genre()
 	g_assert_false(genre_match_token(genre, "rock"));
 
 	file_open(&f, OPEN_WRITE);
-	data_file_writef(&f, "1 \n1 ");
+	file_writef(&f, "1 \n1 ");
 	genre_ops->dbe_write(&f, &genre->ge_dbe);
 	file_close(&f);
 	g_free(genre->ge_name);
diff --git a/tests/core/tags/library.c b/tests/core/tags/library.c
index 6fc54023..facd1cba 100644
--- a/tests/core/tags/library.c
+++ b/tests/core/tags/library.c
@@ -32,7 +32,7 @@ static void test_library()
 
 	file_open(&f, OPEN_WRITE);
 	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);
 	file_close(&f);
 
diff --git a/tests/core/tags/track.c b/tests/core/tags/track.c
index 57e21e9d..d2121b3f 100644
--- a/tests/core/tags/track.c
+++ b/tests/core/tags/track.c
@@ -99,8 +99,8 @@ static void test_track()
 	g_assert_false(track_match_token(track, "hyrule"));
 
 	file_open(&f, OPEN_WRITE);
-	data_file_writef(&f, "0 0 0 0 0 0 \n");
-	data_file_writef(&f, "Hyrule Symphony/00 - No Track.ogg\n");
+	file_writef(&f, "0 0 0 0 0 0 \n");
+	file_writef(&f, "Hyrule Symphony/00 - No Track.ogg\n");
 	track_ops->dbe_write(&f, &track->tr_dbe);
 	file_close(&f);