diff options
| author | Michal Ratajsky <[email protected]> | 2016-01-04 20:31:14 +0100 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2016-01-04 20:31:14 +0100 |
| commit | 9772797c31ebed2417b42a9389caae1b16847e86 (patch) | |
| tree | 0257271d6f8387ce89984bf8341b11186381c8d5 /libmatemixer | |
| parent | d32ca3f420d036cd750fc1aad7f95da40559cc5d (diff) | |
| download | libmatemixer-9772797c31ebed2417b42a9389caae1b16847e86.tar.bz2 libmatemixer-9772797c31ebed2417b42a9389caae1b16847e86.tar.xz | |
Improve error checking in many places
Diffstat (limited to 'libmatemixer')
| -rw-r--r-- | libmatemixer/matemixer-backend.c | 2 | ||||
| -rw-r--r-- | libmatemixer/matemixer-device.c | 6 | ||||
| -rw-r--r-- | libmatemixer/matemixer-stream-control.c | 2 | ||||
| -rw-r--r-- | libmatemixer/matemixer-switch.c | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/libmatemixer/matemixer-backend.c b/libmatemixer/matemixer-backend.c index 56efd94..682bf68 100644 --- a/libmatemixer/matemixer-backend.c +++ b/libmatemixer/matemixer-backend.c @@ -618,6 +618,7 @@ _mate_mixer_backend_set_default_input_stream (MateMixerBackend *backend, MateMixerStream *stream) { g_return_if_fail (MATE_MIXER_IS_BACKEND (backend)); + g_return_if_fail (stream == NULL || MATE_MIXER_IS_STREAM (stream)); if (backend->priv->default_input == stream) return; @@ -642,6 +643,7 @@ _mate_mixer_backend_set_default_output_stream (MateMixerBackend *backend, MateMixerStream *stream) { g_return_if_fail (MATE_MIXER_IS_BACKEND (backend)); + g_return_if_fail (stream == NULL || MATE_MIXER_IS_STREAM (stream)); if (backend->priv->default_output == stream) return; diff --git a/libmatemixer/matemixer-device.c b/libmatemixer/matemixer-device.c index cda9657..7cf417b 100644 --- a/libmatemixer/matemixer-device.c +++ b/libmatemixer/matemixer-device.c @@ -382,6 +382,9 @@ mate_mixer_device_get_icon (MateMixerDevice *device) MateMixerStream * mate_mixer_device_get_stream (MateMixerDevice *device, const gchar *name) { + g_return_val_if_fail (MATE_MIXER_IS_DEVICE (device), NULL); + g_return_val_if_fail (name != NULL, NULL); + return MATE_MIXER_DEVICE_GET_CLASS (device)->get_stream (device, name); } @@ -404,6 +407,9 @@ mate_mixer_device_get_stream (MateMixerDevice *device, const gchar *name) MateMixerDeviceSwitch * mate_mixer_device_get_switch (MateMixerDevice *device, const gchar *name) { + g_return_val_if_fail (MATE_MIXER_IS_DEVICE (device), NULL); + g_return_val_if_fail (name != NULL, NULL); + return MATE_MIXER_DEVICE_GET_CLASS (device)->get_switch (device, name); } diff --git a/libmatemixer/matemixer-stream-control.c b/libmatemixer/matemixer-stream-control.c index 5d97709..98286b1 100644 --- a/libmatemixer/matemixer-stream-control.c +++ b/libmatemixer/matemixer-stream-control.c @@ -405,6 +405,7 @@ mate_mixer_stream_control_set_stream (MateMixerStreamControl *control, MateMixerStream *stream) { g_return_val_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control), FALSE); + g_return_val_if_fail (stream == NULL || MATE_MIXER_IS_STREAM (stream), FALSE); if ((control->priv->flags & MATE_MIXER_STREAM_CONTROL_MOVABLE) == 0) return FALSE; @@ -882,6 +883,7 @@ _mate_mixer_stream_control_set_stream (MateMixerStreamControl *control, MateMixerStream *stream) { g_return_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control)); + g_return_if_fail (stream == NULL || MATE_MIXER_IS_STREAM (stream)); if (control->priv->stream == stream) return; diff --git a/libmatemixer/matemixer-switch.c b/libmatemixer/matemixer-switch.c index b61f13a..8fc0a3f 100644 --- a/libmatemixer/matemixer-switch.c +++ b/libmatemixer/matemixer-switch.c @@ -253,6 +253,7 @@ MateMixerSwitchOption * mate_mixer_switch_get_option (MateMixerSwitch *swtch, const gchar *name) { g_return_val_if_fail (MATE_MIXER_IS_SWITCH (swtch), NULL); + g_return_val_if_fail (name != NULL, NULL); return MATE_MIXER_SWITCH_GET_CLASS (swtch)->get_option (swtch, name); } |