Changeset 4 for abuse/trunk/src/imlibTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

• debian patches

Location:

abuse/trunk/src/imlib

Files:

• dprint.cpp (modified) (1 diff)
• filesel.cpp (modified) (2 diffs)
• fonts.cpp (modified) (1 diff)
• gifread.cpp (modified) (1 diff)
• include.cpp (modified) (1 diff)
• input.cpp (modified) (4 diffs)
• jmalloc.cpp (modified) (8 diffs)
• jwindow.cpp (modified) (3 diffs)
• keys.cpp (modified) (1 diff)
• lbmread.cpp (modified) (2 diffs)
• palette.cpp (modified) (2 diffs)
• pmenu.cpp (modified) (1 diff)
• scroller.cpp (modified) (4 diffs)
• specs.cpp (modified) (11 diffs)
• targa.cpp (modified) (1 diff)
• xwdread.cpp (modified) (1 diff)

abuse/trunk/src/imlib/dprint.cpp

@@ -21 +21 @@
         if (dprint_fun)
         {
-                char st[1000],a,*sp;
-                int y;
+                char st[1000];
                 va_list ap;
 

abuse/trunk/src/imlib/filesel.cpp

@@ -57 +57 @@
       int i=0;
       for (;i<tf;i++)
-      if (strlen(f[i])>wid) wid=strlen(f[i]);
+      if ((int)strlen(f[i])>wid) wid=strlen(f[i]);
       for (i=0;i<td;i++)
-      if (strlen(d[i])+2>wid) wid=strlen(d[i])+2;
+      if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2;
       sx=0;
 
@@ -103 +103 @@
   int i=0;
   for (;i<tf;i++)
-    if (strlen(f[i])>wid) wid=strlen(f[i]);
+    if ((int)strlen(f[i])>wid) wid=strlen(f[i]);
   for (i=0;i<td;i++)
-    if (strlen(d[i])+2>wid) wid=strlen(d[i])+2;
+    if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2;
   reconfigure();  
 }

abuse/trunk/src/imlib/fonts.cpp

@@ -37 +37 @@
 void JCFont::put_char(image *screen,  int x, int y, char ch, int color)
 {
-  if (let[ch])
+  if (let[(int)ch])
   {
     if (color>=0)
-      let[ch]->put_color(screen,x,y,color);
-    else let[ch]->put_image(screen,x,y);
+      let[(int)ch]->put_color(screen,x,y,color);
+    else let[(int)ch]->put_image(screen,x,y);
   }
 }

abuse/trunk/src/imlib/gifread.cpp

@@ -38 +38 @@
   char buf[100],er;
   unsigned char sep;
-  int ncolors;
+  unsigned int ncolors;
   FILE *fp;
   image *im;

abuse/trunk/src/imlib/include.cpp

@@ -6 +6 @@
   char tmp_name[200];
   strcpy(tmp_name,name);
-  int j,append=0,i;
+  unsigned int j;
+  int append=0,i;
   for (j=0;j<strlen(name);j++)
     if (toupper(tmp_name[j])<'A' || toupper(tmp_name[j])>'Z')

abuse/trunk/src/imlib/input.cpp

@@ -257 +257 @@
       case JK_LEFT : if (cur) { draw_cur(wm->dark_color(),screen,wm); cur--;
                            draw_cur(wm->bright_color(),screen,wm); } break; 
-      case JK_RIGHT : if (cur<strlen(format)-1) { draw_cur(wm->dark_color(),screen,wm); cur++;
+      case JK_RIGHT : if (cur<(int)strlen(format)-1) { draw_cur(wm->dark_color(),screen,wm); cur++;
                            draw_cur(wm->bright_color(),screen,wm); } break; 
       case JK_END : if (cur!=last_spot()) 
                           { draw_cur(wm->dark_color(),screen,wm); cur=last_spot(); 
-                            if (cur==strlen(format)-1) cur--; 
+                            if (cur==(int)strlen(format)-1) cur--; 
                            draw_cur(wm->bright_color(),screen,wm); } break; 
       case JK_HOME : if (cur) 
@@ -268 +268 @@
       case JK_BACKSPACE : if (cur)
          { draw_cur(wm->dark_color(),screen,wm); cur--;
-           for (xx=cur;xx<strlen(format)-1;xx++)
+           for (xx=cur;xx<(int)strlen(format)-1;xx++)
              data[xx]=data[xx+1];
            data[strlen(format)-1]=' ';
@@ -281 +281 @@
              data[xx]=data[xx-1];
            data[cur]=ev.key;
-           if (cur<strlen(format)-1)
+           if (cur<(int)strlen(format)-1)
              cur++;
            data[strlen(format)]=0;
@@ -335 +335 @@
 {
   char num[20];
-  sprintf(num,"%Lg",Data);  
+  sprintf(num,"%g",Data);  
   int slen=(strlen(Format)>strlen(num) ? strlen(Format) : strlen(num));
   x=X; y=Y; id=ID;

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" );

abuse/trunk/src/imlib/jwindow.cpp

@@ -176 +176 @@
         if (red)
         {
-          jwindow *j=ev.window,*p;
+          jwindow *j=ev.window;
 /*        screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
           for (p=first;p!=j;p=p->next)
@@ -283 +283 @@
   jwindow *p,*q;
 
-  int mx,my,but;
-  image *mouse_pic,*mouse_save;
+  int mx=0,my=0;
+  image *mouse_pic=NULL,*mouse_save=NULL;
   
   if (has_mouse())
@@ -427 +427 @@
 ifield *input_manager::unlink(int id)     // unlinks ID from fields list and return the pointer to it
 { 
-  for (ifield *i=first,*last;i;i=i->next)
+  for (ifield *i=first,*last=NULL;i;i=i->next)
   {
     if (i->id==id) 

abuse/trunk/src/imlib/keys.cpp

@@ -12 +12 @@
 void key_name(int key, char *buffer)
 {
-        static char sing[2];
+        //static char sing[2];
         if( key > 255 && key <= JK_MAX_KEY )
                 strcpy(buffer,jk_key_names[key-256]);

abuse/trunk/src/imlib/lbmread.cpp

@@ -30 +30 @@
     else
     {
-      long offset=12,ssize;    
+      long ssize;    
       char stype[4];
       short w=0,h=0,x,y,tcolor,pagew,pageh;
-      char planes,masking,compr,padl,xa,ya;
+      char planes,masking,compr=0,padl,xa,ya;
       
       while (ftell(fp)+4<size)
@@ -63 +63 @@
           if (im) delete im;  // shouldn't be two BODY's butjust in case...
           im=new image(w,h);
-          int x,y;
+          int y;
           if (!compr)
           {

abuse/trunk/src/imlib/palette.cpp

@@ -482 +482 @@
   brv=0; bri=0;
 
-  for (i=0;i<ncolors;i++)
+  for (i=0;i<(unsigned int)ncolors;i++)
   { if (all || used(i))
     {
@@ -502 +502 @@
   brv=(long)258*(long)258*(long)258; bri=0;
 
-  for (i=0;i<ncolors;i++)
+  for (i=0;i<(unsigned int)ncolors;i++)
   { if (all || used(i))
     {

abuse/trunk/src/imlib/pmenu.cpp

@@ -276 +276 @@
   
 
-  int total=0,tx,tw,i=0,x;
+  int total=0,tw,i=0,x=0;
   for (pmenu_item *pp=top;pp;pp=pp->next,i++) 
   { if (pp==p) x=i;

abuse/trunk/src/imlib/scroller.cpp

@@ -348 +348 @@
 {
   screen->bar(x,y,x+l-1,y+h-1,wm->black());
-  int xa,ya,xo,yo;
+  int xa,ya,xo=0,yo;
   if (vert) { xa=0; ya=30; yo=x+5; yo=y+5; } else { xa=30; ya=0; xo=x+5; yo=y+5; }
   for (int i=newx,c=0;c<30 && i<100;i++,c++)
@@ -391 +391 @@
 
   for (i=0;i<t;i++)
-    if (strlen(List[i])>wid) 
+    if ((int)strlen(List[i])>wid) 
       wid=strlen(List[i]);
   cur_sel=sx=start_yoffset;
@@ -426 +426 @@
     int found=-1;
     if (key_hist_total<20)
-      key_hist[key_hist_total++]=ev.key;
+      key_hist[(int)(key_hist_total++)]=ev.key;
 
     for (int i=0;i<t && found==-1;i++)
     {
-      if (strlen(lis[i].name)>=key_hist_total && memcmp(lis[i].name,key_hist,key_hist_total)==0)
+      if ((int)strlen(lis[i].name)>=key_hist_total && memcmp(lis[i].name,key_hist,key_hist_total)==0)
         found=i;
     }
@@ -480 +480 @@
     int tw=(l+tex->width()-1)/tex->width();
     int th=(h+tex->height()-1)/tex->height();
-    int dy=y,dx;
+    int dy=y;
     for (int j=0;j<th;j++,dy+=tex->height())
       for (int i=0,dx=x;i<tw;i++,dx+=tex->width())      

abuse/trunk/src/imlib/specs.cpp

@@ -151 +151 @@
   if (wbuf_end!=0)
   {
-    long ret=unbuffered_write(wbuf,wbuf_end);
+    unsigned long ret=unbuffered_write(wbuf,wbuf_end);
     if (ret!=wbuf_end && no_space_handle_fun)
       no_space_handle_fun();
@@ -172 +172 @@
     if (rbuf_start<rbuf_end)
     {
-      int avail_size=rbuf_end-rbuf_start;
+      unsigned int avail_size=rbuf_end-rbuf_start;
       int copy_size=avail_size>count ? count : avail_size;
       memcpy(buf,rbuf+rbuf_start,copy_size);
@@ -209 +209 @@
       buf=(void *)(((char *)buf)+copy_size);
       if (wbuf_end==wbuf_size)
-        if (flush_writes()!=wbuf_size)
+        if ((unsigned int)flush_writes()!=wbuf_size)
           return total_written;
       
@@ -217 +217 @@
   } else
   {
-    long ret=unbuffered_write(buf,count);
+    unsigned long ret=unbuffered_write(buf,count);
     if (ret!=count && no_space_handle_fun)
       no_space_handle_fun();
@@ -234 +234 @@
   else if (whence==SEEK_END) offset=file_size()-offset;
 
-  if (offset<realpos-rbuf_end || offset>=realpos)
+  if (offset<realpos-(long)rbuf_end || offset>=realpos)
   {
     rbuf_start=rbuf_end=0;
@@ -270 +270 @@
 #if (defined(__APPLE__) && !defined(__MACH__))
   spec_main_jfile.open_external(filename,"rb",O_BINARY|O_RDONLY);
-  spec_main_fd = spec_main_jfile.get_fd();
-  spec_main_sd.startup(&spec_main_jfile);
 #else
   spec_main_jfile.open_external(filename,"rb",O_RDONLY);
+#endif
   spec_main_fd = spec_main_jfile.get_fd();
+  if (spec_main_fd==-1)
+    return;
   spec_main_sd.startup(&spec_main_jfile);
-#endif
 }
 
@@ -335 +335 @@
     {
       skip_size=1;
-      int errval = unlink(tmp_name);
+      //int errval = unlink(tmp_name);
     }
 
@@ -487 +487 @@
 int jFILE::unbuffered_read(void *buf, size_t count)
 {
-        long len;
+        unsigned long len;
 
         if (fd == spec_main_fd)
@@ -505 +505 @@
                         len = ::read(fd,(char*)buf,count);
                         ::write(fast_load_fd,(char*)&len,sizeof(len));
-                        ::write(fast_load_fd,(char*)buf,count);
+                        ::write(fast_load_fd,(char*)buf,len);
                         break;
                 case 2:
@@ -525 +525 @@
                 len = ::read(fd,(char*)buf,count);
                         ::write(fast_load_fd,(char*)&len,sizeof(len));
-                        ::write(fast_load_fd,(char*)buf,count);
+                        ::write(fast_load_fd,(char*)buf,len);
                 break;
                 case 2:
@@ -755 +755 @@
 {
   char buf[256];
+  memset(buf,0,256);
   fp->read(buf,8);
   buf[9]=0;

abuse/trunk/src/imlib/targa.cpp

@@ -55 +55 @@
   int x,y;
   unsigned char ctrl;
-  unsigned char bgra[4],*sl,c,lr,lg,lb,ll=0,lc;
+  unsigned char bgra[4],*sl,c,lr=0,lg=0,lb=0,ll=0,lc=0;
   
   

abuse/trunk/src/imlib/xwdread.cpp

@@ -140 +140 @@
   X11WDFileHeader *h11P;
   char junk[800];
-  int i, dummy1, dummy2, dummy3;
+  unsigned int i;
+  int dummy1, dummy2, dummy3;
   unsigned  short minred, maxred;
   X11XColor x11col;