Work around compiler bug exposed by previous change.

Also remove explicit refreshes.

3 files changed, 30 insertions, 30 deletions

diff --git a/audio/cam/files/patch-sum b/audio/cam/files/patch-sum
index 67435652b90..0006238be21 100644
--- a/audio/cam/files/patch-sum
+++ b/audio/cam/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/04/15 23:50:32 mycroft Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/27 16:45:11 mycroft Exp $
 
-MD5 (patch-aa) = 4a48e22e642440c2b2953e5310b9ce8a
+MD5 (patch-aa) = 60ff2a4f5414bbb24c39ec3d2bfb415e
 MD5 (patch-ab) = 3b84e793288fae99a40bd949557ae08a
 MD5 (patch-ac) = ca4e653096374554dde227401dc07bec
-MD5 (patch-ad) = 8208a2c7c7822c271836cf2626850a68
+MD5 (patch-ad) = 899dc1a1eeb744ddc5165de522eb3d96
diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
index 7ce47316e43..750adf91f5c 100644
--- a/audio/cam/patches/patch-aa
+++ b/audio/cam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/04/15 23:50:33 mycroft Exp $
+$NetBSD: patch-aa,v 1.6 2000/04/27 16:45:13 mycroft Exp $
 
 --- sounds.c.orig	Mon Oct 21 14:33:55 1996
 +++ sounds.c	Sat Apr 15 19:33:31 2000
@@ -20,11 +20,3 @@ $NetBSD: patch-aa,v 1.5 2000/04/15 23:50:33 mycroft Exp $
            draw_handle( Y+1, X+14+dev_vol[dev_count].vol_left, FALSE, 4);
            if (STEREO(dev_nr))
               draw_handle( Y+2, X+14+dev_vol[dev_count].vol_right, FALSE, 4);          
-@@ -331,6 +331,7 @@
-     do { 
-        
-        status( ((locked  == TRUE) ? "  LOCKED  " : " UNLOCKED ")); 
-+       refresh();
-        ch = getch(); 
-        fflush(stdin); 
-        message("");
diff --git a/audio/cam/patches/patch-ad b/audio/cam/patches/patch-ad
index 5a82696ae87..596a7ca4d06 100644
--- a/audio/cam/patches/patch-ad
+++ b/audio/cam/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
+$NetBSD: patch-ad,v 1.4 2000/04/27 16:45:13 mycroft Exp $
 
 --- screens.c.orig	Mon Oct 21 14:18:25 1996
 +++ screens.c	Sat Apr 15 19:39:10 2000
-@@ -33,6 +33,7 @@
+@@ -25,6 +25,7 @@
+ #include "cam.h" 
+ 
+ #include <strings.h>
++#include <stdlib.h>
+ 
+ void finish(int sig)
+ {
+@@ -33,6 +34,7 @@
      endwin();
      clear();
      refresh();
@@ -10,12 +18,12 @@ $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
      if (sig != 0)
         exit(1);
  }
-@@ -40,15 +41,15 @@
+@@ -40,41 +42,46 @@
     
  void set_screen(void)
  {
 -   char dummy[COLS];
-+   char dummy[COLS + 1];
++   char *dummy;
     int left, right;
  
 -   left = ( COLS - 15 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) ) / 2;
@@ -26,11 +34,19 @@ $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
     leaveok(stdscr ,TRUE);
     attrset(COLOR_PAIR( COLOR_SCREEN ) | A_BOLD);
 -   sprintf(dummy,"%*cCAM %s.%s for Linux%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' ');
-+   sprintf(dummy,"%*cCAM %s.%s for NetBSD%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' ');
++   asprintf(&dummy, "%*cCAM %s.%s for NetBSD%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' ');
     mvaddstr(0,0,dummy);
-    sprintf(dummy," Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' ');
-    mvaddstr(LINES-1,0,dummy );
-@@ -59,22 +60,25 @@
+-   sprintf(dummy," Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' ');
+-   mvaddstr(LINES-1,0,dummy );
+-   attrset(A_NORMAL | A_BOLD );
++   free(dummy);
++   asprintf(&dummy, " Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' ');
++   mvaddstr(LINES-1,0,dummy);
++   free(dummy);
++   attrset(A_NORMAL | A_BOLD);
+    mvaddstr(LINES-2,4,"Press 'h' for help");
+ }
+ 
  /* Draws the sliders */ 
  void draw_slider(int Y, int X, char *device) 
  { 
@@ -64,7 +80,7 @@ $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
  }
  
  /*
-@@ -87,26 +91,27 @@
+@@ -87,26 +94,27 @@
  {
     if ((level == 1 ) || ( level == 2 )) { 
        attrset(A_NORMAL  | A_ALTCHARSET); 
@@ -98,7 +114,7 @@ $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
       stdscr = initscr();
       if ( (COLS < 80) || (LINES < 25) ) {
          finish(0);
-@@ -181,9 +186,9 @@
+@@ -181,9 +189,9 @@
     char ch; 
     touchwin(stdscr); 
     help_win = newwin(15,50,(LINES - 15) / 2,(COLS - 50) / 2);
@@ -110,11 +126,3 @@ $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
     wattrset(help_win, A_NORMAL | A_BOLD);
     mvwaddstr(help_win,2,2," Left/Right : Lower/Higher "); 
     mvwaddstr(help_win,3,2," Up/Down    : Previous/Next "); 
-@@ -193,6 +198,7 @@
-    mvwaddstr(help_win,9,2," h : help "); 
-    mvwaddstr(help_win,11,2," ESC/q : exit "); 
-    mvwaddstr(help_win,13,8," Press key to leave help screen "); 
-+   wrefresh(help_win);
-    ch = wgetch(help_win); 
-    delwin(help_win); 
- }