Skip to contentSkip to conversation

Removing an assert

PATCH Applied Martin Sandsmark 2 participants 2 messages Jul 5, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Removing an assert

Hi!

There is an assert in snd_hctl_handle_event in alsa-lib that gets triggered on every login for many KDE users. From what I can see it is superflous, and gets triggered because the device in an event has gone away. This case is handled just beneath the assert as well, and I therefore don't see the reason for this assert at all.

Entry in bug tracker:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5471

Signature · 1 line
Martin Sandsmark
Quoted 1 line

From dff3de9705eb617b619251c2aec30d5ca9c13046 Mon Sep 17 00:00:00 2001

From: Martin Sandsmark <[email protected]>
Date: Thu, 5 Jul 2012 09:40:07 +0200
Subject: [PATCH] Remove a useless assert.

The case where the element is unavailable (for example gone away since the event was created) is handled beneath.

See also bug 5471.

---
 src/control/hcontrol.c | 1 -
 1 file changed, 1 deletion(-)
src/control/hcontrol.c +0 -1
index 8ffc434..ee1d907 100644
@@ -761,7 +761,6 @@ static int snd_hctl_handle_event(snd_hctl_t *hctl, snd_ctl_event_t *event)
 	if (event->data.elem.mask & (SNDRV_CTL_EVENT_MASK_VALUE |
 				     SNDRV_CTL_EVENT_MASK_INFO)) {
 		elem = snd_hctl_find_elem(hctl, &event->data.elem.id);
-		assert(elem);
 		if (!elem)
 			return -ENOENT;
 		res = snd_hctl_elem_throw_event(elem, event->data.elem.mask &
Signature · 1 line
1.7.11.1
Applied
#1 lore raw

At Thu, 05 Jul 2012 09:55:23 +0200,

Quoted 11 lines · Martin Sandsmark

Hi!

There is an assert in snd_hctl_handle_event in alsa-lib that gets triggered on every login for many KDE users. From what I can see it is superflous, and gets triggered because the device in an event has gone away. This case is handled just beneath the assert as well, and I therefore don't see the reason for this assert at all.

Entry in bug tracker:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5471

Thanks, applied now to git tree.

Takashi

Quoted 38 lines
Signature · 3 lines
-- 
Martin Sandsmark
[2 0001-Remove-a-useless-assert.patch <text/x-patch; UTF-8 (7bit)>]
Quoted 1 line

From dff3de9705eb617b619251c2aec30d5ca9c13046 Mon Sep 17 00:00:00 2001

From: Martin Sandsmark <[email protected]>
Date: Thu, 5 Jul 2012 09:40:07 +0200
Subject: [PATCH] Remove a useless assert.

The case where the element is unavailable (for example gone away since the event was created) is handled beneath.

See also bug 5471.

---
 src/control/hcontrol.c | 1 -
 1 file changed, 1 deletion(-)
src/control/hcontrol.c +0 -1
index 8ffc434..ee1d907 100644
@@ -761,7 +761,6 @@ static int snd_hctl_handle_event(snd_hctl_t *hctl, snd_ctl_event_t *event)
 	if (event->data.elem.mask & (SNDRV_CTL_EVENT_MASK_VALUE |
 				     SNDRV_CTL_EVENT_MASK_INFO)) {
 		elem = snd_hctl_find_elem(hctl, &event->data.elem.id);
-		assert(elem);
 		if (!elem)
 			return -ENOENT;
 		res = snd_hctl_elem_throw_event(elem, event->data.elem.mask &
Signature · 7 lines
1.7.11.1

[3  <text/plain; us-ascii (7bit)>]
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel