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

Timestamp:

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

Author:

Sam Hocevar

Message:

• debian patches

File:

• abuse/trunk/src/imlib/specs.cpp (modified) (11 diffs)

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;