Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix yellow: pointer cast

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25578 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2010-04-10 21:53:55 +00:00
parent 4f3f7dd856
commit e2eff494a3
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/bookmark.c
View file

@ -942,9 +942,15 @@ static const char* skip_token(const char* s)
return s; return s;
} }
static const char* int_token(const char* s, int* dest)
{
*dest = atoi(s);
return skip_token(s);
}
static const char* long_token(const char* s, long* dest) static const char* long_token(const char* s, long* dest)
{ {
*dest = atoi(s); /* Should be atol, but we don't have it. */ *dest = atoi(s); /* Should be atol, but we don't have it. */
return skip_token(s); return skip_token(s);
} }
@ -958,7 +964,8 @@ static bool parse_bookmark(const char *bookmark, const bool parse_filenames)
const char* s = bookmark; const char* s = bookmark;
const char* end; const char* end;
#define GET_INT_TOKEN(var) s = long_token(s, (long *)&var) #define GET_INT_TOKEN(var) s = int_token(s, &var)
#define GET_LONG_TOKEN(var) s = long_token(s, &var)
#define GET_BOOL_TOKEN(var) var = (atoi(s)!=0); s = skip_token(s) #define GET_BOOL_TOKEN(var) var = (atoi(s)!=0); s = skip_token(s)
/* if new format bookmark, extract the optional content flags, /* if new format bookmark, extract the optional content flags,
@ -973,11 +980,11 @@ static bool parse_bookmark(const char *bookmark, const bool parse_filenames)
/* extract all original bookmark tokens */ /* extract all original bookmark tokens */
GET_INT_TOKEN(bm.resume_index); GET_INT_TOKEN(bm.resume_index);
GET_INT_TOKEN(bm.resume_offset); GET_LONG_TOKEN(bm.resume_offset);
GET_INT_TOKEN(bm.resume_seed); GET_INT_TOKEN(bm.resume_seed);
if (!new_format) /* skip deprecated token */ if (!new_format) /* skip deprecated token */
s = skip_token(s); s = skip_token(s);
GET_INT_TOKEN(bm.resume_time); GET_LONG_TOKEN(bm.resume_time);
GET_INT_TOKEN(bm.repeat_mode); GET_INT_TOKEN(bm.repeat_mode);
GET_BOOL_TOKEN(bm.shuffle); GET_BOOL_TOKEN(bm.shuffle);