diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-10 21:53:55 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-10 21:53:55 +0000 |
commit | e2eff494a3c11547758b3830854b63626f979853 (patch) | |
tree | 37ace4674764fd17620109f94eeee768aca1f6bb /apps/bookmark.c | |
parent | 4f3f7dd8567f86d03ebd7ea6658fde54bcc4d5e5 (diff) | |
download | rockbox-e2eff494a3c11547758b3830854b63626f979853.tar.gz rockbox-e2eff494a3c11547758b3830854b63626f979853.zip |
Fix yellow: pointer cast
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25578 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r-- | apps/bookmark.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 2c9b3d5d17..029a56406f 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -942,9 +942,15 @@ static const char* skip_token(const char* s) | |||
942 | return s; | 942 | return s; |
943 | } | 943 | } |
944 | 944 | ||
945 | static const char* int_token(const char* s, int* dest) | ||
946 | { | ||
947 | *dest = atoi(s); | ||
948 | return skip_token(s); | ||
949 | } | ||
950 | |||
945 | static const char* long_token(const char* s, long* dest) | 951 | static const char* long_token(const char* s, long* dest) |
946 | { | 952 | { |
947 | *dest = atoi(s); /* Should be atol, but we don't have it. */ | 953 | *dest = atoi(s); /* Should be atol, but we don't have it. */ |
948 | return skip_token(s); | 954 | return skip_token(s); |
949 | } | 955 | } |
950 | 956 | ||
@@ -958,7 +964,8 @@ static bool parse_bookmark(const char *bookmark, const bool parse_filenames) | |||
958 | const char* s = bookmark; | 964 | const char* s = bookmark; |
959 | const char* end; | 965 | const char* end; |
960 | 966 | ||
961 | #define GET_INT_TOKEN(var) s = long_token(s, (long *)&var) | 967 | #define GET_INT_TOKEN(var) s = int_token(s, &var) |
968 | #define GET_LONG_TOKEN(var) s = long_token(s, &var) | ||
962 | #define GET_BOOL_TOKEN(var) var = (atoi(s)!=0); s = skip_token(s) | 969 | #define GET_BOOL_TOKEN(var) var = (atoi(s)!=0); s = skip_token(s) |
963 | 970 | ||
964 | /* if new format bookmark, extract the optional content flags, | 971 | /* if new format bookmark, extract the optional content flags, |
@@ -973,11 +980,11 @@ static bool parse_bookmark(const char *bookmark, const bool parse_filenames) | |||
973 | 980 | ||
974 | /* extract all original bookmark tokens */ | 981 | /* extract all original bookmark tokens */ |
975 | GET_INT_TOKEN(bm.resume_index); | 982 | GET_INT_TOKEN(bm.resume_index); |
976 | GET_INT_TOKEN(bm.resume_offset); | 983 | GET_LONG_TOKEN(bm.resume_offset); |
977 | GET_INT_TOKEN(bm.resume_seed); | 984 | GET_INT_TOKEN(bm.resume_seed); |
978 | if (!new_format) /* skip deprecated token */ | 985 | if (!new_format) /* skip deprecated token */ |
979 | s = skip_token(s); | 986 | s = skip_token(s); |
980 | GET_INT_TOKEN(bm.resume_time); | 987 | GET_LONG_TOKEN(bm.resume_time); |
981 | GET_INT_TOKEN(bm.repeat_mode); | 988 | GET_INT_TOKEN(bm.repeat_mode); |
982 | GET_BOOL_TOKEN(bm.shuffle); | 989 | GET_BOOL_TOKEN(bm.shuffle); |
983 | 990 | ||