Hello community, here is the log from the commit of package FAUmachine checked in at Mon Dec 11 19:05:26 CET 2006. -------- --- arch/i386/FAUmachine/FAUmachine.changes 2006-10-31 09:33:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/FAUmachine/FAUmachine.changes 2006-12-11 16:02:08.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 11 15:59:20 CET 2006 - jsmeix@suse.de + +- FAUmachine-fix-ambiguous-comparison.patch changes comparsions + like "a <= x <= b" into "a <= x && x <= b". + +------------------------------------------------------------------- New: ---- FAUmachine-fix-ambiguous-comparison.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FAUmachine.spec ++++++ --- /var/tmp/diff_new_pack.U0QjMi/_old 2006-12-11 19:04:08.000000000 +0100 +++ /var/tmp/diff_new_pack.U0QjMi/_new 2006-12-11 19:04:08.000000000 +0100 @@ -14,15 +14,16 @@ Summary: Documentation for FAUmachine Group: System/Emulators/PC Version: 20050727 -Release: 31 +Release: 41 Requires: %{name}-base -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) URL: http://www.faumachine.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Patch0: FAUmachine-nonvoid.patch Patch1: FAUmachine-sound_sample.patch Patch2: FAUmachine-syscall_kernel.patch +Patch3: FAUmachine-fix-ambiguous-comparison.patch %description Documentation and examples for the FAUmachine. The main program files @@ -193,6 +194,7 @@ %patch0 %patch1 %patch2 +%patch3 %build ./autogen.sh @@ -283,6 +285,9 @@ %{_libdir}/faumachine/kernels/bsd.*-3.6 %changelog -n FAUmachine +* Mon Dec 11 2006 - jsmeix@suse.de +- FAUmachine-fix-ambiguous-comparison.patch changes comparsions + like "a <= x <= b" into "a <= x && x <= b". * Tue Oct 31 2006 - olh@suse.de - use syscall(2) * Thu Oct 12 2006 - ro@suse.de ++++++ FAUmachine-fix-ambiguous-comparison.patch ++++++ --- lib/sound_sample.c.orig 2004-11-23 15:48:34.000000000 +0100 +++ lib/sound_sample.c 2006-12-11 15:52:41.000000000 +0100 @@ -104,7 +104,7 @@ ss_change_volume(char *data, int len, in assert(data != 0); assert(len > 0); - assert(0 < channels < 3); + assert(0 < channels && channels < 3); assert(decibel != 0); /* 1 dB = 20 * log_10(Ampl1 / Ampl2) and P1 = Ampl1^2 */ @@ -182,7 +182,7 @@ ss_gen_rect(void *buffer, int len, int c assert(buffer != 0); assert(len != 0); - assert(0 < channels < 3); + assert(0 < channels && channels < 3); assert(0 <= rate); assert(phase != 0); assert(0 < frequency); --- lib/pattern-matcher/image-processing.c.orig 2005-07-27 11:14:48.000000000 +0200 +++ lib/pattern-matcher/image-processing.c 2006-12-11 15:53:55.000000000 +0100 @@ -2281,7 +2281,7 @@ get_brightness(int c) ret=0.299*((c>>16) & 0xff) + 0.587*((c>>8) & 0xff) + 0.114*(c & 0xff); - assert (0 <= ret <= 255); + assert (0 <= ret && ret <= 255); return ( (unsigned char) ret ); } --- node-pc/simulator/umsb.c.orig 2005-07-26 16:14:56.000000000 +0200 +++ node-pc/simulator/umsb.c 2006-12-11 15:55:00.000000000 +0100 @@ -1581,7 +1581,7 @@ dsp_get_samples(void * buf, int size, in int read; char * cbuf; assert (buf != 0); - assert (0 <= *filled <= size); + assert (0 <= *filled && *filled <= size); if (*filled < size) { cbuf = (char *) buf; read = dsp_read_dma(cbuf + *filled, size - *filled); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org