--- np2/x11/gtk2/dialog_sound.c	2010/12/23 06:32:35	1.8
+++ np2/x11/gtk2/dialog_sound.c	2012/01/23 05:12:35	1.13
@@ -1,5 +1,3 @@
-/*	$Id: dialog_sound.c,v 1.8 2010/12/23 06:32:35 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
@@ -269,7 +267,7 @@ static const char *joypad_num_str[256] =
 	"248", "249", "250", "251", "252", "253", "254", "255", 
 };
 
-static const joymng_devinfo_t **joypad_devlist;
+static joymng_devinfo_t **joypad_devlist;
 static GtkWidget *joypad_use_checkbutton[1];
 static GtkWidget *joypad_devlist_combo;
 static GtkWidget *joypad_axis_combo[JOY_NAXIS];
@@ -332,8 +330,6 @@ ok_button_clicked(GtkButton *b, gpointer
 	int i;
 	BOOL renewal;
 
-	UNUSED(b);
-
 	/* Mixer */
 	renewal = FALSE;
 	for (i = 0; i < NELEMENTS(mixer_vol_tbl); i++) {
@@ -591,8 +587,6 @@ static void
 dialog_destroy(GtkWidget *w, GtkWidget **wp)
 {
 
-	UNUSED(wp);
-
 	install_idle_process();
 	gtk_widget_destroy(w);
 }
@@ -602,9 +596,6 @@ mixer_default_button_clicked(GtkButton *
 {
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	for (i = 0; i < NELEMENTS(mixer_vol_tbl); i++) {
 		gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[i]), 64.0);
 	}
@@ -618,9 +609,6 @@ snd14_default_button_clicked(GtkButton *
 	};
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	for (i = 0; i < NELEMENTS(snd14_adj); i++) {
 		gtk_adjustment_set_value(GTK_ADJUSTMENT(snd14_adj[i]), defval[i]);
 	}
@@ -630,9 +618,6 @@ static void
 snd26_default_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(snd26_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(snd26_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(snd26_romaddr_entry), "CC000");
@@ -642,9 +627,6 @@ static void
 snd86_default_button_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(snd86_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(snd86_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(snd86_soundid_entry), "4x");
@@ -659,9 +641,6 @@ spb_default_button_clicked(GtkButton *b,
 {
 	int i;
 
-	UNUSED(b);
-	UNUSED(d);
-
 	gtk_entry_set_text(GTK_ENTRY(spb_ioport_entry), "0188");
 	gtk_entry_set_text(GTK_ENTRY(spb_int_entry), "INT5");
 	gtk_entry_set_text(GTK_ENTRY(spb_romaddr_entry), "CC000");
@@ -675,9 +654,7 @@ static void
 driver_radiobutton_clicked(GtkButton *b, gpointer d)
 {
 
-	UNUSED(b);
-
-	driver_snddrv = (int)d;
+	driver_snddrv = GPOINTER_TO_UINT(d);
 }
 
 static GtkWidget *
@@ -1108,22 +1085,20 @@ joypad_device_changed(GtkEditable *e, gp
 {
 	GtkWidget *axis_entry[JOY_NAXIS];
 	GtkWidget *button_entry[JOY_NBUTTON];
-	const gchar *devname;
+	const gchar *dvname;
 	int drv;
 	int i, j;
 
-	UNUSED(d);
-
-	devname = gtk_entry_get_text(GTK_ENTRY(e));
+	dvname = gtk_entry_get_text(GTK_ENTRY(e));
 	if ((joypad_devlist == NULL)
-	 || (devname == NULL)
-	 || (strcmp(devname, joypad_nodevice_str) == 0)) {
+	 || (dvname == NULL)
+	 || (strcmp(dvname, joypad_nodevice_str) == 0)) {
 		milstr_ncpy(joypad_devname, joypad_nodevice_str, sizeof(joypad_devname));
 		return;
 	}
 
 	for (drv = 0; joypad_devlist[drv] != NULL; ++drv) {
-		if (strcmp(devname, joypad_devlist[drv]->devname) == 0) {
+		if (strcmp(dvname, joypad_devlist[drv]->devname) == 0) {
 			break;
 		}
 	}