diff src/alsa/configure.c @ 1725:f9856ca98943

Pass literal values to snd_strerror(), as passing -err will cause an invalid dereference in any modern ALSA.
author William Pitcock <nenolod@atheme.org>
date Tue, 18 Sep 2007 09:25:56 -0500
parents 3da1b8942b8b
children 63feceeb3799
line wrap: on
line diff
--- a/src/alsa/configure.c	Mon Sep 17 09:05:53 2007 -0500
+++ b/src/alsa/configure.c	Tue Sep 18 09:25:56 2007 -0500
@@ -69,7 +69,7 @@
 
 	menu = gtk_menu_new();
 	if ((err = snd_card_next(&card)) != 0)
-		g_warning("snd_next_card() failed: %s", snd_strerror(-err));
+		g_warning("snd_next_card() failed: %s", snd_strerror(err));
 
 	while (card > -1)
 	{
@@ -81,7 +81,7 @@
 		if ((err = snd_card_get_name(card, &label)) != 0)
 		{
 			g_warning("snd_carg_get_name() failed: %s",
-				  snd_strerror(-err));
+				  snd_strerror(err));
 			break;
 		}
 
@@ -93,7 +93,7 @@
 		if ((err = snd_card_next(&card)) != 0)
 		{
 			g_warning("snd_next_card() failed: %s",
-				  snd_strerror(-err));
+				  snd_strerror(err));
 			break;
 		}
 	}
@@ -140,13 +140,13 @@
 
 	if ((err = snd_ctl_open(&ctl, dev, 0)) < 0)
 	{
-		printf("snd_ctl_open() failed: %s", snd_strerror(-err));
+		printf("snd_ctl_open() failed: %s", snd_strerror(err));
 		return;
 	}
 
 	if ((err = snd_card_get_name(card, &card_name)) != 0)
 	{
-		g_warning("snd_card_get_name() failed: %s", snd_strerror(-err));
+		g_warning("snd_card_get_name() failed: %s", snd_strerror(err));
 		card_name = _("Unknown soundcard");
 	}
 
@@ -158,7 +158,7 @@
 		if ((err = snd_ctl_pcm_next_device(ctl, &pcm_device)) < 0)
 		{
 			g_warning("snd_ctl_pcm_next_device() failed: %s",
-				  snd_strerror(-err));
+				  snd_strerror(err));
 			pcm_device = -1;
 		}
 		if (pcm_device < 0)
@@ -174,7 +174,7 @@
 				g_warning("get_devices_for_card(): "
 					  "snd_ctl_pcm_info() "
 					  "failed (%d:%d): %s.", card,
-					  pcm_device, snd_strerror(-err));
+					  pcm_device, snd_strerror(err));
 			continue;
 		}
 
@@ -211,7 +211,7 @@
 
 	if ((err = snd_card_next(&card)) != 0)
 	{
-		g_warning("snd_next_card() failed: %s", snd_strerror(-err));
+		g_warning("snd_next_card() failed: %s", snd_strerror(err));
 		return;
 	}
 
@@ -221,7 +221,7 @@
 		if ((err = snd_card_next(&card)) != 0)
 		{
 			g_warning("snd_next_card() failed: %s",
-				  snd_strerror(-err));
+				  snd_strerror(err));
 			break;
 		}
 	}