Build CMake install target for libogg dependency on AppVeyor

[platform/upstream/libvorbis.git] / lib / misc.c

diff --git a/lib/misc.c b/lib/misc.c
index ab3f0ce..cf2f1ee 100644 (file)
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -5,8 +5,8 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************/
 
@@ -23,7 +23,7 @@
 static pthread_mutex_t memlock=PTHREAD_MUTEX_INITIALIZER;
 static void **pointers=NULL;
 static long *insertlist=NULL; /* We can't embed this in the pointer list;
-                         a pointer can have any value... */
+                          a pointer can have any value... */
 
 static char **files=NULL;
 static long *file_bytes=NULL;
@@ -83,11 +83,11 @@ static void *_insert(void *ptr,long bytes,char *file,long line){
     if(i==filecount){
       filecount++;
       if(!files){
-       files=malloc(filecount*sizeof(*files));
-       file_bytes=malloc(filecount*sizeof(*file_bytes));
+        files=malloc(filecount*sizeof(*files));
+        file_bytes=malloc(filecount*sizeof(*file_bytes));
       }else{
-       files=realloc(files,filecount*sizeof(*files));
-       file_bytes=realloc(file_bytes,filecount*sizeof(*file_bytes));
+        files=realloc(files,filecount*sizeof(*files));
+        file_bytes=realloc(file_bytes,filecount*sizeof(*file_bytes));
       }
       files[i]=strdup(file);
       file_bytes[i]=0;
@@ -100,17 +100,17 @@ static void *_insert(void *ptr,long bytes,char *file,long line){
     snprintf(buffer,80,"%s%s",file,_VDBG_GRAPHFILE);
     out=fopen(buffer,"a");
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           file_bytes[i]-(bytes-HEAD_ALIGN));
+            file_bytes[i]-(bytes-HEAD_ALIGN));
     fprintf(out,"%ld, %ld # FILE %s LINE %ld\n",
-           -start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           file_bytes[i],file,line);
+            -start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
+            file_bytes[i],file,line);
     fclose(out);
 
     out=fopen(_VDBG_GRAPHFILE,"a");
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           global_bytes);
+            global_bytes);
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           global_bytes+(bytes-HEAD_ALIGN));
+            global_bytes+(bytes-HEAD_ALIGN));
     fclose(out);
   }
 #endif
@@ -137,9 +137,9 @@ static void _ripremove(void *ptr){
 
     gettimeofday(&tv,&tz);
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           global_bytes);
+            global_bytes);
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           global_bytes-((head *)ptr)->bytes);
+            global_bytes-((head *)ptr)->bytes);
     fclose(out);
 
     for(i=0;i<filecount;i++)
@@ -148,9 +148,9 @@ static void _ripremove(void *ptr){
     snprintf(buffer,80,"%s%s",file,_VDBG_GRAPHFILE);
     out=fopen(buffer,"a");
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           file_bytes[i]);
+            file_bytes[i]);
     fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000),
-           file_bytes[i]-bytes);
+            file_bytes[i]-bytes);
     fclose(out);
 
     file_bytes[i]-=bytes;
@@ -184,13 +184,16 @@ void _VDBG_dump(void){
     head *ptr=pointers[i];
     if(ptr)
       fprintf(stderr,"unfreed bytes from %s:%ld\n",
-             ptr->file,ptr->line);
+              ptr->file,ptr->line);
   }
 
   pthread_mutex_unlock(&memlock);
 }
 
-extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line){
+void *_VDBG_malloc(void *ptr,long bytes,char *file,long line){
+  if(bytes<=0)
+    fprintf(stderr,"bad malloc request (%ld bytes) from %s:%ld\n",bytes,file,line);
+
   bytes+=HEAD_ALIGN;
   if(ptr){
     ptr-=HEAD_ALIGN;
@@ -203,7 +206,7 @@ extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line){
   return _insert(ptr,bytes,file,line);
 }
 
-extern void _VDBG_free(void *ptr,char *file,long line){
+void _VDBG_free(void *ptr,char *file,long line){
   if(ptr){
     ptr-=HEAD_ALIGN;
     _ripremove(ptr);