Date: Tue, 20 Feb 2007 22:55:47 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109374: [PATCH] audio/umix: fix display. Message-ID: <20070220215547.12F7939DBD@pin.if.uz.zgora.pl> Resent-Message-ID: <200702202200.l1KM0F9v090046@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109374
>Category: ports
>Synopsis: [PATCH] audio/umix: fix display.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 20 22:00:14 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: trasz
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
Do not try to display unitialised string.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- umix-1.0.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/umix/files/patch-src::driver_oss.c /home/trasz/umix/files/patch-src::driver_oss.c
--- /usr/ports/audio/umix/files/patch-src::driver_oss.c Thu Jan 11 08:42:14 2007
+++ /home/trasz/umix/files/patch-src::driver_oss.c Tue Feb 20 22:53:27 2007
@@ -1,5 +1,5 @@
---- src/driver_oss.c.orig Sun Aug 31 22:32:02 2003
-+++ src/driver_oss.c Thu Nov 6 01:22:48 2003
+--- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003
++++ src/driver_oss.c Tue Feb 20 22:44:43 2007
@@ -27,7 +27,7 @@
#if defined(__linux__)
#include <sys/soundcard.h>
@@ -20,7 +20,7 @@
int old_mixer;
int ch;
int i;
-@@ -288,9 +290,11 @@
+@@ -288,9 +290,13 @@
mixer_ptr->numchan = SOUND_MIXER_NRDEVICES;
mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES);
@@ -28,11 +28,13 @@
/* get the mixer name */
eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info);
strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name));
++#else
++ strncpy(mixer_ptr->name, "", 1);
+#endif
mixer_ptr->curr_chan = 0;
#ifdef UMIX_DEBUG
-@@ -329,9 +333,11 @@
+@@ -329,9 +335,11 @@
oss_set_curr_chan(i);
oss_update(OSS_UPD_READ);
}
@@ -44,7 +46,7 @@
#ifdef UMIX_DEBUG
err_msg("oss_init: initialized #%d with %d channels",
-@@ -388,6 +394,7 @@
+@@ -388,6 +396,7 @@
* the device and compares it to the old */
static int oss_check_update(void)
{
@@ -52,7 +54,7 @@
struct mixer_info oss_info;
eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info);
-@@ -396,6 +403,7 @@
+@@ -396,6 +405,7 @@
mixer_ptr->modifycount = oss_info.modify_counter;
return 1;
}
--- umix-1.0.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070220215547.12F7939DBD>