diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-16 00:10:38 +0100 |
|---|---|---|
| committer | Gerrit Rockbox <gerrit@rockbox.org> | 2017-02-04 17:24:47 +0100 |
| commit | d7871914acd2ed77f43344e36e08944524a67d9e (patch) | |
| tree | 7bcef243d9b53c3703c305b8a5f9f8a8488eabfb /apps/plugins/solitaire.c | |
| parent | 1245c5fe61f6ca8e1980a33a8b8f7ea4322829fd (diff) | |
| download | rockbox-d7871914acd2ed77f43344e36e08944524a67d9e.tar.gz rockbox-d7871914acd2ed77f43344e36e08944524a67d9e.zip | |
Fix dangerous casts
On Windows 64-bit, the size of long is 32-bit, thus any pointer to long cast is
not valid. In any case, one should use intptr_t and ptrdiff_t when casting
to integers. This commit attempts to fix all instances reported by GCC.
When relevant, I replaced code by the macros PTR_ADD, ALIGN_UP from system.h
Change-Id: I2273b0e8465d3c4689824717ed5afa5ed238a2dc
Diffstat (limited to 'apps/plugins/solitaire.c')
| -rw-r--r-- | apps/plugins/solitaire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index b5e982d208..b476fa11b4 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
| @@ -1547,7 +1547,7 @@ static int load_game( void ) | |||
| 1547 | return -1; | 1547 | return -1; |
| 1548 | 1548 | ||
| 1549 | retval = 0; /* Assume good case */ | 1549 | retval = 0; /* Assume good case */ |
| 1550 | if( ( rb->lseek( fd, -sizeof( int ), SEEK_END ) == -((ssize_t)sizeof( int ))-1 ) | 1550 | if( ( rb->lseek( fd, -(off_t)sizeof( int ), SEEK_END ) == -((ssize_t)sizeof( int ))-1 ) |
| 1551 | || ( rb->read( fd, &checksum, sizeof( int ) ) < ((ssize_t)sizeof( int )) ) | 1551 | || ( rb->read( fd, &checksum, sizeof( int ) ) < ((ssize_t)sizeof( int )) ) |
| 1552 | || ( rb->lseek( fd, 0, SEEK_SET ) == -1 ) | 1552 | || ( rb->lseek( fd, 0, SEEK_SET ) == -1 ) |
| 1553 | || save_read( fd, &cur_card, sizeof( int ), &checksum ) | 1553 | || save_read( fd, &cur_card, sizeof( int ), &checksum ) |