Changeset 1905

Show
Ignore:
Timestamp:
11/07/08 12:05:00 (2 months ago)
Author:
batt
Message:

Merged from external project:

**********
r22579 | batt | 2008-10-30 18:54:25 +0100 (gio, 30 ott 2008) | 1 line


Fix some printf warnings; add missing header.
**********

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bertos/fs/battfs.c

    r1896 r1905  
    4343#include <cfg/debug.h> 
    4444#include <cfg/macros.h> /* MIN, MAX */ 
     45#include <cfg/test.h> 
    4546#include <cpu/byteorder.h> /* cpu_to_xx */ 
    4647 
    …… 
    280281                } 
    281282        } 
    282         LOG_INFO("free_bytes:%d, free_page_start:%d\n", disk->free_bytes, disk->free_page_start); 
     283        LOG_INFO("free_bytes:%ld, free_page_start:%d\n", (long)disk->free_bytes, disk->free_page_start); 
    283284 
    284285        return true; 
    …… 
    383384                        /* Invalid page, keep as free */ 
    384385                        ASSERT(disk->page_array[curr_free_page] == PAGE_UNSET_SENTINEL); 
    385                         LOG_INFO("Page %d invalid, keeping as free\n", page); 
     386                        //LOG_INFO("Page %d invalid, keeping as free\n", page); 
    386387                        disk->page_array[curr_free_page++] = page; 
    387388                } 
    …… 
    656657                /* Fill unused space of first page with 0s */ 
    657658                uint8_t dummy = 0; 
    658                 pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, disk->data_size - curr_hdr.fill); 
     659                pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, (kfile_off_t)(disk->data_size - curr_hdr.fill)); 
    659660                while (zero_bytes--) 
    660661                { 
    …… 
    812813        } 
    813814 
    814         size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0)); 
     815        size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, (kfile_off_t)0)); 
    815816 
    816817        while (size) 
    …… 
    875876                        first = page + 1; 
    876877                else 
    877                         *last = page - 1; 
     878                        *last = page + 1; 
    878879        } 
    879880        LOG_INFO("Not found: last %d\n", *last);