Commit 02e8c000 authored by Max Kellermann's avatar Max Kellermann

song: song_file_update() returns bool

Instead of returning 0 or -1, return true on success and false on failure. This seems more natural, and when the C library was designed, there was no "bool" data type.
parent 1f9b6148
...@@ -97,7 +97,7 @@ song_free(struct song *song) ...@@ -97,7 +97,7 @@ song_free(struct song *song)
free(song); free(song);
} }
int bool
song_file_update(struct song *song) song_file_update(struct song *song)
{ {
struct decoder_plugin *plugin; struct decoder_plugin *plugin;
...@@ -120,9 +120,9 @@ song_file_update(struct song *song) ...@@ -120,9 +120,9 @@ song_file_update(struct song *song)
song->tag = plugin->tag_dup(abs_path); song->tag = plugin->tag_dup(abs_path);
if (song->tag == NULL || song->tag->time < 0) if (song->tag == NULL || song->tag->time < 0)
return -1; return false;
return 0; return true;
} }
char * char *
......
...@@ -55,7 +55,7 @@ song_file_load(const char *path, struct directory *parent); ...@@ -55,7 +55,7 @@ song_file_load(const char *path, struct directory *parent);
void void
song_free(struct song *song); song_free(struct song *song);
int bool
song_file_update(struct song *song); song_file_update(struct song *song);
/* /*
......
...@@ -232,7 +232,7 @@ updateInDirectory(struct directory *directory, const char *name) ...@@ -232,7 +232,7 @@ updateInDirectory(struct directory *directory, const char *name)
return UPDATE_RETURN_UPDATED; return UPDATE_RETURN_UPDATED;
} else if (st.st_mtime != song->mtime) { } else if (st.st_mtime != song->mtime) {
LOG("updating %s\n", name); LOG("updating %s\n", name);
if (song_file_update(song) < 0) if (!song_file_update(song))
delete_song(directory, song); delete_song(directory, song);
return UPDATE_RETURN_UPDATED; return UPDATE_RETURN_UPDATED;
} }
...@@ -421,7 +421,7 @@ static enum update_return updatePath(const char *utf8path) ...@@ -421,7 +421,7 @@ static enum update_return updatePath(const char *utf8path)
free(path); free(path);
if (song->mtime == mtime) if (song->mtime == mtime)
return UPDATE_RETURN_NOUPDATE; return UPDATE_RETURN_NOUPDATE;
else if (song_file_update(song) == 0) else if (song_file_update(song))
return UPDATE_RETURN_UPDATED; return UPDATE_RETURN_UPDATED;
else { else {
delete_song(parentDirectory, song); delete_song(parentDirectory, song);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment