diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-04 09:50:09 +0200 |
|---|---|---|
| committer | Peter Meerwald <pmeerw@pmeerw.net> | 2013-12-15 11:07:17 +0100 |
| commit | 1cda71725240bd4911f0f34c5d384b3966f06369 (patch) | |
| tree | ab17e13e97216ecfd0222d239fab087d4fc12ba5 /src/modules/dbus | |
| parent | 643eb5bae2c58246657cdfebe19002da2cee292e (diff) | |
| download | pulseaudio-1cda71725240bd4911f0f34c5d384b3966f06369.tar.gz | |
Add pa_sample_format_valid()
I think this makes the code a bit nicer to read and write. This also
reduces the chances of off-by-one errors when checking the bounds of
the sample format value.
Diffstat (limited to 'src/modules/dbus')
| -rw-r--r-- | src/modules/dbus/iface-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c index 22dae32b8..9c293fd8c 100644 --- a/src/modules/dbus/iface-core.c +++ b/src/modules/dbus/iface-core.c @@ -510,7 +510,7 @@ static void handle_set_default_sample_format(DBusConnection *conn, DBusMessage * dbus_message_iter_get_basic(iter, &default_sample_format); - if (default_sample_format >= PA_SAMPLE_MAX) { + if (!pa_sample_format_valid(default_sample_format)) { pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample format."); return; } @@ -1317,7 +1317,7 @@ static void handle_upload_sample(DBusConnection *conn, DBusMessage *msg, void *u dbus_message_iter_recurse(&msg_iter, &array_iter); dbus_message_iter_get_fixed_array(&array_iter, &data, &data_length); - if (sample_format >= PA_SAMPLE_MAX) { + if (!pa_sample_format_valid(sample_format)) { pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample format."); goto finish; } |