[xiph-cvs] cvs commit: Tremor codebook.c floor1.c misc.h res012.c vorbisfile.c

[Monty]

xiphmont    03/11/20 01:16:18

  Modified:    .        Tag: lowmem-branch codebook.c floor1.c misc.h
                        res012.c vorbisfile.c
  Log:
  A few last compiler warnings, replace reliance on libc quicksort in floor1.

Revision  Changes    Path
No                   revision

<p>No                   revision

<p>1.2.6.8   +2 -1      Tremor/codebook.c

Index: codebook.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/codebook.c,v
retrieving revision 1.2.6.7
retrieving revision 1.2.6.8
diff -u -r1.2.6.7 -r1.2.6.8
--- codebook.c	20 Nov 2003 05:30:03 -0000	1.2.6.7
+++ codebook.c	20 Nov 2003 06:16:17 -0000	1.2.6.8
@@ -71,6 +71,7 @@
     return (ogg_uint32_t)used_entry;
 
   }
+  return 0; /* silence compiler */
 }
 
 /* 32 bit float (not IEEE; nonnormalized mantissa +
@@ -338,7 +339,7 @@
 int vorbis_book_unpack(oggpack_buffer *opb,codebook *s){
   char         *lengthlist=NULL;
   int           quantvals=0;
-  long          i,j,k;
+  long          i,j;
   int           maptype;
 
   memset(s,0,sizeof(*s));

<p><p>1.6.6.11  +2 -6      Tremor/floor1.c

Index: floor1.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/floor1.c,v
retrieving revision 1.6.6.10
retrieving revision 1.6.6.11
diff -u -r1.6.6.10 -r1.6.6.11
--- floor1.c	20 Nov 2003 05:30:03 -0000	1.6.6.10
+++ floor1.c	20 Nov 2003 06:16:17 -0000	1.6.6.11
@@ -53,9 +53,9 @@
   return(ret);
 }
 
-static void mergesort(ogg_uint16_t *index,ogg_uint16_t *vals,ogg_uint16_t n){
+static void mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
   ogg_uint16_t i,j;
-  ogg_uint16_t *temp,*A=index,*B=_ogg_alloc(0,n*sizeof(*B));
+  char *temp,*A=index,*B=_ogg_malloc(n*sizeof(*B));
 
   for(i=1;i<n;i<<=1){
     for(j=0;j+i<n;){
@@ -84,10 +84,6 @@
 }
 
 
-static int icomp(const void *a,const void *b){
-  return(**(ogg_uint16_t **)a-**(ogg_uint16_t **)b);
-}
-
 vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,oggpack_buffer *opb){
   codec_setup_info     *ci=(codec_setup_info *)vi->codec_setup;
   int j,k,count=0,maxclass=-1,rangebits;

<p><p>1.8.2.7   +1 -1      Tremor/misc.h

Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/Tremor/misc.h,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -r1.8.2.6 -r1.8.2.7
--- misc.h	20 Nov 2003 04:28:26 -0000	1.8.2.6
+++ misc.h	20 Nov 2003 06:16:17 -0000	1.8.2.7
@@ -20,7 +20,7 @@
 #include "ivorbiscodec.h"
 #include "os_types.h"
 
-/*#define _VDBG_GRAPHFILE "_0.m"*/
+#define _VDBG_GRAPHFILE "_0.m"
 
 
 #ifdef _VDBG_GRAPHFILE

<p><p>1.2.6.4   +0 -8      Tremor/res012.c

Index: res012.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/res012.c,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- res012.c	22 Apr 2003 09:00:49 -0000	1.2.6.3
+++ res012.c	20 Nov 2003 06:16:17 -0000	1.2.6.4
@@ -33,14 +33,6 @@
   }
 }
 
-static int ilog(unsigned int v){
-  int ret=0;
-  while(v){
-    ret++;
-    v>>=1;
-  }
-  return(ret);
-}
 
 /* vorbis_info is for range checking */
 int res_unpack(vorbis_info_residue *info,

<p><p>1.6.2.5   +2 -3      Tremor/vorbisfile.c

Index: vorbisfile.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/vorbisfile.c,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- vorbisfile.c	29 Apr 2003 04:03:27 -0000	1.6.2.4
+++ vorbisfile.c	20 Nov 2003 06:16:17 -0000	1.6.2.5
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.c,v 1.6.2.4 2003/04/29 04:03:27 xiphmont Exp $
+ last mod: $Id: vorbisfile.c,v 1.6.2.5 2003/11/20 06:16:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -1476,7 +1476,7 @@
 
 /* return time offset (milliseconds) of next PCM sample to be read */
 ogg_int64_t ov_time_tell(OggVorbis_File *vf){
-  int link=0,ret;
+  int link=0;
   ogg_int64_t pcm_total=0;
   ogg_int64_t time_total=0;
   
@@ -1555,7 +1555,6 @@
             *section) set to the logical bitstream number */
 
 long ov_read(OggVorbis_File *vf,void *buffer,int bytes_req,int *bitstream){
-  int i,j;
 
   long samples;
   long channels;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.