Backout previous.

Casting NULL to (void*) for variadic functions of course does not make
any difference on 64 bit platforms - as long as a valid prototype has been
seen, which is the case here - io.c includes unistd.h.

2 files changed, 15 insertions, 24 deletions

diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index b791e2aa768..26593900654 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/10/26 17:05:29 frueauf Exp $
+$NetBSD: distinfo,v 1.6 2002/10/27 21:46:11 martin Exp $
 
 SHA1 (xcdroast-0.98alpha9.tar.gz) = 7994b54ce0a0b55fe140f4b2ba14e0d1317d5d52
 Size (xcdroast-0.98alpha9.tar.gz) = 649469 bytes
 SHA1 (patch-aa) = 48365964de9a0ee2349fea063695c7b1d999b645
 SHA1 (patch-ab) = 39c716a03162a1c093e95442befbc65c8bd6fb76
-SHA1 (patch-ac) = 26e1b7569ba0f20eeddffaac342eb731f0f61cac
+SHA1 (patch-ac) = 5d462c9c2521c85258b53030174fa91a2c76d73b
 SHA1 (patch-ad) = 875d4c2a31a3590d7a566d4452b253edf30a75d9
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
index ad250e1e73e..b510dfde93a 100644
--- a/sysutils/xcdroast/patches/patch-ac
+++ b/sysutils/xcdroast/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
+$NetBSD: patch-ac,v 1.6 2002/10/27 21:46:12 martin Exp $
 
---- io.c.orig	Tue Jul 17 21:39:11 2001
-+++ io.c	Sat Oct 26 18:44:59 2002
+--- io.c.orig	Tue Jul 17 12:39:11 2001
++++ io.c
 @@ -16,6 +16,14 @@
  #include <sys/wait.h>
  #include <signal.h>
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  #if defined(linux) || defined(__FreeBSD__)
  # include <sys/soundcard.h>
  # include <sys/ioctl.h>
-@@ -996,22 +1004,22 @@
+@@ -996,22 +1004,22 @@ GList *get_dsp_devices() {
  GList *dsp;
  GList *loop;
  struct stat buf;
@@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  	/* check if the user has any special audio-hardware running,
  	   which set the AUDIODEV-environment-variable */
  	audiodev = getenv("AUDIODEV");
-@@ -1066,15 +1074,15 @@
+@@ -1066,15 +1074,15 @@ gchar *audiodev;
  gchar *gen_mix_from_dspdev(gchar *dsp, gchar *ret) {
  gchar tmp[MAXLINE];
  struct stat buf;
@@ -64,7 +64,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  		strcpy(tmp,dsp+8);
  		g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
  
-@@ -1084,7 +1092,7 @@
+@@ -1084,7 +1092,7 @@ gchar tmp2[MAXLINE];
  		}	
  	}	
  #endif
@@ -73,16 +73,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  
  	g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
  
-@@ -1991,7 +1999,7 @@
- 		}
- 
- 		/* startup child */
--		if (execl("/bin/sh", "sh", "-c", cmd ,NULL) < 0) {
-+		if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) {
- 			g_error("execl error\n");
- 		}
-  
-@@ -2362,10 +2370,10 @@
+@@ -2362,10 +2370,10 @@ gint count;
  
  gint query_mixer() {
  gint mix;
@@ -95,7 +86,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  audio_info_t ainfo;
  #endif
  #ifdef hpux
-@@ -2380,7 +2388,7 @@
+@@ -2380,7 +2388,7 @@ struct audio_gains again;
  		return -1;
  	}
  
@@ -104,7 +95,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2400,7 +2408,7 @@
+@@ -2400,7 +2408,7 @@ struct audio_gains again;
  	return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
  
  #endif
@@ -113,7 +104,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  
  	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
  	mix = open(setupdata.mix_device, O_RDONLY);
-@@ -2450,7 +2458,7 @@
+@@ -2450,7 +2458,7 @@ struct audio_gains again;
  
  gint set_mixer(gint val) {
  gint mix;
@@ -122,7 +113,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  audio_info_t ainfo;
  #endif
  #ifdef hpux
-@@ -2464,7 +2472,7 @@
+@@ -2464,7 +2472,7 @@ struct audio_gains again;
  		return -1;
  	}
  
@@ -131,7 +122,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_RDWR);
-@@ -2482,7 +2490,7 @@
+@@ -2482,7 +2490,7 @@ struct audio_gains again;
  	close(mix);
  
  #endif 
@@ -140,7 +131,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/26 17:05:30 frueauf Exp $
  
  	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
  	mix = open(setupdata.mix_device, O_WRONLY);
-@@ -3275,6 +3283,9 @@
+@@ -3275,6 +3283,9 @@ gint ret,found;
  		/* got the message that no medium is present?
  		   in this case, ignore return code */ 
  		if (strstr(line,"medium not present")) {