From: Takashi Sakamoto Date: Mon, 22 Feb 2016 13:13:31 +0000 (+0900) Subject: control: keep consistent usage of assertion X-Git-Tag: v1.1.1~16 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=6d4736197ed6cd961717154d1f42d59092ff6764;p=alsa-lib.git control: keep consistent usage of assertion In most codes for control APIs, assertions are used to check given arguments from applications. If the arguments are not expected, the application is forced to abort. When NDEBUG is defined in the beginning of the codes, no checks are performed. Although, in snd_ctl_elem_set_bytes(), assertion is used with condition statement. There's an intention to check the arguments regardless of NDEBUG. However, this is not the same fashion in the codes. This commit applies the same fashion to the function, to keep consistent usage of assertion. Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- diff --git a/src/control/control.c b/src/control/control.c index fd5e9cf1..8a5d530f 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -2627,10 +2627,7 @@ void snd_ctl_elem_value_set_byte(snd_ctl_elem_value_t *obj, unsigned int idx, un void snd_ctl_elem_set_bytes(snd_ctl_elem_value_t *obj, void *data, size_t size) { assert(obj); - if (size >= ARRAY_SIZE(obj->value.bytes.data)) { - assert(0); - return; - } + assert(size < ARRAY_SIZE(obj->value.bytes.data)); memcpy(obj->value.bytes.data, data, size); }