mixer_control: don't allow mixer==NULL

As a side effect, the previous patch added the mixer==NULL checks. It is now illegal to call mixer functions with a NULL argument. Convert the runtime checks to assertions.

mixer_control: don't allow mixer==NULL
7475ded9 · Max Kellermann · 66a2c566 · 7475ded9
Commit 7475ded9 authored Mar 26, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 9 deletions

mixer_control.c src/mixer_control.c +7 -9

No files found.
--- a/src/mixer_control.c
+++ b/src/mixer_control.c
@@ -58,9 +58,7 @@ mixer_new(const struct mixer_plugin *plugin, const struct config_param *param)
 void
 mixer_free(struct mixer *mixer)
 {
-	if (!mixer) {
-		return;
-	}
+	assert(mixer != NULL);
 	assert(mixer->plugin != NULL);
 	assert(mixer->mutex != NULL);

@@ -74,9 +72,7 @@ mixer_open(struct mixer *mixer)
 {
 	bool success;

-	if (!mixer) {
-		return false;
-	}
+	assert(mixer != NULL);
 	assert(mixer->plugin != NULL);

 	g_mutex_lock(mixer->mutex);
@@ -89,9 +85,7 @@ mixer_open(struct mixer *mixer)
 void
 mixer_close(struct mixer *mixer)
 {
-	if (!mixer) {
-		return;
-	}
+	assert(mixer != NULL);
 	assert(mixer->plugin != NULL);

 	g_mutex_lock(mixer->mutex);
@@ -104,6 +98,8 @@ mixer_get_volume(struct mixer *mixer)
 {
 	int volume;

+	assert(mixer != NULL);
+
 	g_mutex_lock(mixer->mutex);
 	volume = mixer->plugin->get_volume(mixer);
 	g_mutex_unlock(mixer->mutex);
@@ -116,6 +112,8 @@ mixer_set_volume(struct mixer *mixer, unsigned volume)
 {
 	bool success;

+	assert(mixer != NULL);
+
 	g_mutex_lock(mixer->mutex);
 	success = mixer->plugin->set_volume(mixer, volume);
 	g_mutex_unlock(mixer->mutex);