head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2000.02.29.16.57.47; author scw; state dead; branches; next 1.1; 1.1 date 99.12.04.12.56.31; author scw; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.04.12.56.31; author scw; state Exp; branches; next ; desc @@ 1.2 log @Update to version 2.1.1. The author has incorporated the stdio changes which were originally in the patch files being deleted. @ text @$NetBSD: patch-aj,v 1.1 1999/12/04 12:56:31 scw Exp $ --- libaudiofile/macros.c.orig Wed Nov 25 21:11:54 1998 +++ libaudiofile/macros.c Tue Nov 30 22:20:48 1999 @@@@ -55,6 +55,7 @@@@ return bigEndian; } +#ifndef USE_STDIO /*--------------------------------------------------------------------------- | FUNCTION uiRead ---------------------------------------------------------------------------*/ @@@@ -381,8 +382,7 @@@@ return count; } - - +#endif @@@@ -406,7 +406,7 @@@@ *ui = swapbytes_uint (*ui); #endif - return 1; + return sizeof(*ui); } /*--------------------------------------------------------------------------- @@@@ -424,7 +424,7 @@@@ *i = swapbytes_int (*i); #endif - return 1; + return sizeof(*i); } /*--------------------------------------------------------------------------- @@@@ -442,7 +442,7 @@@@ *us = swapbytes_ushort (*us); #endif - return 1; + return sizeof(*us); } /*--------------------------------------------------------------------------- @@@@ -460,7 +460,7 @@@@ *s = swapbytes_short (*s); #endif - return 1; + return sizeof(*s); } /*--------------------------------------------------------------------------- @@@@ -487,7 +487,7 @@@@ int fReadF (FILE *file,float *f) { if (fread (f,sizeof(*f),1,file) != 1) return 0; - return 1; + return sizeof(*f); } /*--------------------------------------------------------------------------- @@@@ -496,7 +496,7 @@@@ int dReadF (FILE *file,double *d) { if (fread (d,sizeof(*d),1,file) != 1) return 0; - return 1; + return sizeof(*d); } /*--------------------------------------------------------------------------- @@@@ -507,7 +507,7 @@@@ unsigned char etemp [10]; if (fread (etemp,10,1,file) != 1) return 0; *f = (float) convertFromIeeeExtended (etemp); - return 1; + return sizeof(*f); } /*--------------------------------------------------------------------------- @@@@ -518,7 +518,7 @@@@ unsigned char etemp [10]; if (fread (etemp,10,1,file) != 1) return 0; *d = convertFromIeeeExtended (etemp); - return 1; + return sizeof(*d); } /*--------------------------------------------------------------------------- @@@@ -527,7 +527,7 @@@@ int idReadF (FILE *file,char *c) { if (fread (c,4,1,file) != 1) return 0; - return 1; + return 4; } /*--------------------------------------------------------------------------- @@@@ -551,7 +551,7 @@@@ if (!ucReadF (file,&temp)) return 0; count++; } - return 1; + return count; } /*--------------------------------------------------------------------------- @@@@ -569,7 +569,7 @@@@ if (fwrite (&ui,sizeof(ui),1,file) != 1) return 0; - return 1; + return sizeof(ui); } /*--------------------------------------------------------------------------- @@@@ -587,7 +587,7 @@@@ if (fwrite (&i,sizeof(i),1,file) != 1) return 0; - return 1; + return sizeof(i); } /*--------------------------------------------------------------------------- @@@@ -605,7 +605,7 @@@@ if (fwrite (&us,sizeof(us),1,file) != 1) return 0; - return 1; + return sizeof(us); } /*--------------------------------------------------------------------------- @@@@ -623,7 +623,7 @@@@ if (fwrite (&s,sizeof(s),1,file) != 1) return 0; - return 1; + return sizeof(s); } /*--------------------------------------------------------------------------- @@@@ -650,7 +650,7 @@@@ int fWriteF (FILE *file,float f) { if (fwrite (&f,sizeof(f),1,file) != 1) return 0; - return 1; + return sizeof(f); } /*--------------------------------------------------------------------------- @@@@ -659,7 +659,7 @@@@ int dWriteF (FILE *file,double d) { if (fwrite (&d,sizeof(d),1,file) != 1) return 0; - return 1; + return sizeof(d); } /*--------------------------------------------------------------------------- @@@@ -670,7 +670,7 @@@@ unsigned char etemp [10]; convertToIeeeExtended ((double) f,etemp); if (fwrite (etemp,10,1,file) != 1) return 0; - return 1; + return sizeof(f); } /*--------------------------------------------------------------------------- @@@@ -681,7 +681,7 @@@@ unsigned char etemp [10]; convertToIeeeExtended (d,etemp); if (fwrite (etemp,10,1,file) != 1) return 0; - return 1; + return sizeof(d); } /*--------------------------------------------------------------------------- @@@@ -690,7 +690,7 @@@@ int idWriteF (FILE *file,char *c) { if (fwrite (c,4,1,file) != 1) return 0; - return 1; + return 4; } /*--------------------------------------------------------------------------- @@@@ -714,8 +714,9 @@@@ if (!(ucWriteF (file,temp))) return 0; count++; } - return 1; + return count; } + /*--------------------------------------------------------------------------- | FUNCTION swapbytes_type functions @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Digital audio recording and processing package. @ text @@