diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /src/gfile/gfile_fs_rom.c | |
parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'src/gfile/gfile_fs_rom.c')
-rw-r--r-- | src/gfile/gfile_fs_rom.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gfile/gfile_fs_rom.c b/src/gfile/gfile_fs_rom.c index 315f046e..56181086 100644 --- a/src/gfile/gfile_fs_rom.c +++ b/src/gfile/gfile_fs_rom.c @@ -24,11 +24,11 @@ #define ROMFS_CMP_UNCOMPRESSED 0 typedef struct ROMFS_DIRENTRY { - uint16_t ver; // Directory Entry Version - uint16_t cmp; // Compression format + gU16 ver; // Directory Entry Version + gU16 cmp; // Compression format const struct ROMFS_DIRENTRY * next; // The next entry const char * name; // The file name - long int size; // The file size + gFileSize size; // The file size const char * file; // The file data } ROMFS_DIRENTRY; @@ -43,12 +43,12 @@ typedef struct ROMFileList { static gBool ROMExists(const char *fname); -static long int ROMFilesize(const char *fname); +static gFileSize ROMFilesize(const char *fname); static gBool ROMOpen(GFILE *f, const char *fname); static void ROMClose(GFILE *f); static int ROMRead(GFILE *f, void *buf, int size); -static gBool ROMSetpos(GFILE *f, long int pos); -static long int ROMGetsize(GFILE *f); +static gBool ROMSetpos(GFILE *f, gFileSize pos); +static gFileSize ROMGetsize(GFILE *f); static gBool ROMEof(GFILE *f); #if GFILE_NEED_FILELISTS static gfileList *ROMFlOpen(const char *path, gBool dirs); @@ -84,11 +84,11 @@ static gBool ROMExists(const char *fname) return ROMFindFile(fname) != 0; } -static long int ROMFilesize(const char *fname) +static gFileSize ROMFilesize(const char *fname) { const ROMFS_DIRENTRY *p; - if (!(p = ROMFindFile(fname))) return -1; + if (!(p = ROMFindFile(fname))) return (gFileSize)-1; return p->size; } @@ -118,12 +118,12 @@ static int ROMRead(GFILE *f, void *buf, int size) return size; } -static gBool ROMSetpos(GFILE *f, long int pos) +static gBool ROMSetpos(GFILE *f, gFileSize pos) { return pos <= ((const ROMFS_DIRENTRY *)f->obj)->size; } -static long int ROMGetsize(GFILE *f) +static gFileSize ROMGetsize(GFILE *f) { return ((const ROMFS_DIRENTRY *)f->obj)->size; } |