Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/archival/libunarchive/decompress_bunzip2.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 983 by niro, Fri Apr 24 18:33:46 2009 UTC revision 984 by niro, Sun May 30 11:32:42 2010 UTC
# Line 648  void FAST_FUNC dealloc_bunzip(bunzip_dat Line 648  void FAST_FUNC dealloc_bunzip(bunzip_dat
648    
649    
650  /* Decompress src_fd to dst_fd.  Stops at end of bzip data, not end of file. */  /* Decompress src_fd to dst_fd.  Stops at end of bzip data, not end of file. */
651  USE_DESKTOP(long long) int FAST_FUNC  IF_DESKTOP(long long) int FAST_FUNC
652  unpack_bz2_stream(int src_fd, int dst_fd)  unpack_bz2_stream(int src_fd, int dst_fd)
653  {  {
654   USE_DESKTOP(long long total_written = 0;)   IF_DESKTOP(long long total_written = 0;)
655   char *outbuf;   char *outbuf;
656   bunzip_data *bd;   bunzip_data *bd;
657   int i;   int i;
# Line 666  unpack_bz2_stream(int src_fd, int dst_fd Line 666  unpack_bz2_stream(int src_fd, int dst_fd
666   i = RETVAL_SHORT_WRITE;   i = RETVAL_SHORT_WRITE;
667   break;   break;
668   }   }
669   USE_DESKTOP(total_written += i;)   IF_DESKTOP(total_written += i;)
670   }   }
671   }   }
672    
# Line 686  unpack_bz2_stream(int src_fd, int dst_fd Line 686  unpack_bz2_stream(int src_fd, int dst_fd
686   dealloc_bunzip(bd);   dealloc_bunzip(bd);
687   free(outbuf);   free(outbuf);
688    
689   return i ? i : USE_DESKTOP(total_written) + 0;   return i ? i : IF_DESKTOP(total_written) + 0;
690  }  }
691    
692  USE_DESKTOP(long long) int FAST_FUNC  IF_DESKTOP(long long) int FAST_FUNC
693  unpack_bz2_stream_prime(int src_fd, int dst_fd)  unpack_bz2_stream_prime(int src_fd, int dst_fd)
694  {  {
695   unsigned char magic[2];   unsigned char magic[2];

Legend:
Removed from v.983  
changed lines
  Added in v.984