Changeset 2143
- Timestamp:
- Jun 18, 2007, 1:04:22 AM (15 years ago)
- Location:
- branches/file_selection
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/file_selection/gtk/makemeta-ui.c
r2138 r2143 218 218 g_snprintf( buf, sizeof(buf), "<i>%lu %s @ %s</i>", 219 219 pieceCount, 220 ngettext("piece", "pieces", fileCount),220 ngettext("piece", "pieces", pieceCount), 221 221 pch ); 222 222 gtk_label_set_markup ( GTK_LABEL(ui->pieces_lb), buf ); -
branches/file_selection/libtransmission/makemeta.c
r2138 r2143 94 94 #define GiB 1073741824ul 95 95 96 static size_t97 bestPieceSize( size_t totalSize )96 static int 97 bestPieceSize( uint64_t totalSize ) 98 98 { 99 99 /* almost always best to have a piee size of 512 or 256 kb. … … 124 124 tr_metaInfoBuilderCreate( tr_handle_t * handle, const char * topFile ) 125 125 { 126 size_t i;126 int i; 127 127 struct FileList * files; 128 128 const struct FileList * walk; … … 153 153 ++ret->fileCount; 154 154 ret->files = calloc( ret->fileCount, sizeof(char*) ); 155 ret->fileLengths = calloc( ret->fileCount, sizeof( size_t) );155 ret->fileLengths = calloc( ret->fileCount, sizeof(uint64_t) ); 156 156 157 157 for( i=0, walk=files; walk!=NULL; walk=walk->next, ++i ) … … 167 167 168 168 ret->pieceSize = bestPieceSize( ret->totalSize ); 169 ret->pieceCount = ret->totalSize / ret->pieceSize;169 ret->pieceCount = (int)( ret->totalSize / ret->pieceSize); 170 170 if( ret->totalSize % ret->pieceSize ) 171 171 ++ret->pieceCount; … … 179 179 if( builder != NULL ) 180 180 { 181 size_t i;181 int i; 182 182 for( i=0; i<builder->fileCount; ++i ) 183 183 tr_free( builder->files[i] ); … … 199 199 getHashInfo ( tr_metainfo_builder_t * b ) 200 200 { 201 size_t off = 0; 202 size_t fileIndex = 0; 201 int fileIndex = 0; 203 202 uint8_t *ret = (uint8_t*) malloc ( SHA_DIGEST_LENGTH * b->pieceCount ); 204 203 uint8_t *walk = ret; 205 204 uint8_t *buf = malloc( b->pieceSize ); 206 size_t totalRemain; 205 uint64_t totalRemain; 206 uint64_t off = 0; 207 207 FILE * fp; 208 208 … … 213 213 { 214 214 uint8_t *bufptr = buf; 215 const size_t thisPieceSize = MIN(b->pieceSize, totalRemain );216 size_t pieceRemain = thisPieceSize;215 const uint64_t thisPieceSize = MIN( (uint32_t)b->pieceSize, totalRemain ); 216 uint64_t pieceRemain = thisPieceSize; 217 217 218 218 assert( b->pieceIndex < b->pieceCount ); … … 220 220 while( pieceRemain ) 221 221 { 222 const size_t n_this_pass = MIN( (b->fileLengths[fileIndex] - off), pieceRemain );222 const uint64_t n_this_pass = MIN( (b->fileLengths[fileIndex] - off), pieceRemain ); 223 223 fread( bufptr, 1, n_this_pass, fp ); 224 224 bufptr += n_this_pass; … … 303 303 const tr_metainfo_builder_t * builder ) 304 304 { 305 size_t i = 0;305 int i = 0; 306 306 307 307 tr_bencListReserve( list, builder->fileCount ); -
branches/file_selection/libtransmission/makemeta.h
r2132 r2143 21 21 char * top; 22 22 char ** files; 23 size_t * fileLengths;24 size_t totalSize;25 size_t fileCount;26 size_t pieceSize;27 size_t pieceCount;23 uint64_t * fileLengths; 24 uint64_t totalSize; 25 int fileCount; 26 int pieceSize; 27 int pieceCount; 28 28 int isSingleFile; 29 29 tr_handle_t * handle; … … 47 47 **/ 48 48 49 size_t pieceIndex;49 int pieceIndex; 50 50 int abortFlag; 51 51 int isDone;
Note: See TracChangeset
for help on using the changeset viewer.