Changeset 10932


Ignore:
Timestamp:
Jul 3, 2010, 12:33:30 AM (12 years ago)
Author:
charles
Message:

(trunk) #3045 "make libtransmission's API byte-oriented instead of KiB-oriented." -- fix r10931 merge error

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/cache.c

    r10931 r10932  
    126126                    /* But if all other blocks are non-contiguous, we prefer this one */
    127127                    bestpos = pos;
    128                     oldest_time = cache->maxBlocks - len;
     128                    oldest_time = cache->max_blocks - len;
    129129                }
    130130                continue;
  • trunk/utils/show.c

    r10931 r10932  
    250250
    251251    tr_setMessageLevel( TR_MSG_ERR );
    252     tr_formatter_mem_init  ( MEM_K, MEM_B_STR, MEM_K_STR, MEM_G_STR );
    253     tr_formatter_size_init ( DISK_K, DISK_B_STR, DIST_K_STR, DISK_G_STR );
    254     tr_formatter_size_init ( SPEED_K, SPEED_B_STR, SPEED_K_STR, SPEED_G_STR );
     252    tr_formatter_mem_init  ( MEM_K, MEM_B_STR, MEM_K_STR, MEM_M_STR, MEM_G_STR );
     253    tr_formatter_size_init ( DISK_K, DISK_B_STR, DISK_K_STR, DISK_M_STR, DISK_G_STR );
     254    tr_formatter_size_init ( SPEED_K, SPEED_B_STR, SPEED_K_STR, SPEED_M_STR, SPEED_G_STR );
    255255
    256256    if( parseCommandLine( argc, (const char**)argv ) )
Note: See TracChangeset for help on using the changeset viewer.