state_file: simplified state_file_finish()

Return early from the destructor function when there is no configured state file. Don't check the timer, don't call g_free(NULL).

state_file: simplified state_file_finish()
df7d7732 · Max Kellermann · 889b1c1e · df7d7732
Commit df7d7732 authored Jul 15, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

state_file.c src/state_file.c +6 -4

No files found.
--- a/src/state_file.c
+++ b/src/state_file.c
@@ -41,8 +41,7 @@ state_file_write(void)
 {
 	FILE *fp;

-	if (state_file_path == NULL)
-		return;
+	assert(state_file_path != NULL);

 	g_debug("Saving state file %s", state_file_path);

@@ -114,11 +113,14 @@ state_file_init(const char *path)
 void
 state_file_finish(void)
 {
+	if (state_file_path == NULL)
+		/* no state file configured, no cleanup required */
+		return;
+
 	if (save_state_source_id != 0)
 		g_source_remove(save_state_source_id);

-	if (state_file_path != NULL)
-		state_file_write();
+	state_file_write();

 	g_free(state_file_path);
 }