Changeset 4 for abuse/trunk/src/imlib/jmalloc.cppTweet

Timestamp:

Nov 6, 2005, 11:39:38 AM (18 years ago)

Author:

Sam Hocevar

Message:

• debian patches

File:

• abuse/trunk/src/imlib/jmalloc.cpp (modified) (8 diffs)

abuse/trunk/src/imlib/jmalloc.cpp

@@ -169 +169 @@
   for (;f;f=f->next);               // scan through static big list
 
-  int i,bit;
+  int i,bit=1;
   for (i=0;i<JM_SMALL_SIZE;i++)
   {
@@ -215 +215 @@
     {      
       fprintf(fp,"*** Small Block size = %d ***\n",i);      
-      unsigned long x=0,bit=1;
+      unsigned long bit=1;
       char *addr=((char *)(s+1));
       for (int j=0;j<32;j++)
@@ -252 +252 @@
     {      
       fprintf(fp,"*** Small Block size = %d ***\n",i);      
-      unsigned long x=0,bit=1;
+      unsigned long bit=1;
       char *addr=((char *)(s+1));
       for (int j=0;j<32;j++)
@@ -348 +348 @@
     } else
     {
-      int bit=1,i=0,offset=0;
+      int bit=1,i=0;
       char *addr=((char *)s)+sizeof(small_block);
       while (1)        // we already know there is a bit free
@@ -380 +380 @@
   s->size=-s->size;
 
-  if (s->size-size>sizeof(memory_node)+4)  // is there enough space to split the block?
+  if (s->size-size>(int)sizeof(memory_node)+4)  // is there enough space to split the block?
   {    
     memory_node *p=(memory_node *)((char *)s+sizeof(memory_node)+size);
@@ -431 +431 @@
     } else
     {
-      int bit=1,i=0,offset=0;
+      int bit=1,i=0;
       char *addr=((char *)s)+sizeof(small_block);
       while (1)        // we already know there is a bit free
@@ -486 +486 @@
   s->size=-s->size;
 
-  if (s->size-size>sizeof(memory_node)+4)  // is there enough space to split the block?
+  if (s->size-size>(int)sizeof(memory_node)+4)  // is there enough space to split the block?
   {
     memory_node *p=s;    // store this position
@@ -882 +882 @@
         char *reportpath;
         reportpath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + strlen( filename ), "reportpath" );
-        sprintf( reportpath, "%s%s\0", get_save_filename_prefix(), filename );
+        sprintf( reportpath, "%s%s", get_save_filename_prefix(), filename );
 
         FILE *fp = fopen( reportpath, "wb" );