len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bookmark.c parse_bookmark remove redundant conditional

Browse source 
we can just use the buffer not being NULL to decide

Change-Id: I233191ce16db4c18ed418794c18b8c51bb05399d
This commit is contained in:
William Wilgus 2022-11-24 22:26:09 -05:00 • committed by William Wilgus
parent 780990fe5d
commit 3a22322ab7
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/bookmark.c
View file

@ -131,14 +131,13 @@ static bool get_playlist_and_track(const char *bookmark,
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* This function takes a bookmark and parses it. This function also */ /* This function takes a bookmark and parses it. This function also */
/* validates the bookmark. The parse_filenames flag indicates whether */ /* validates the bookmark. Valid filenamebuf indicates whether */
/* the filename tokens are to be extracted. */ /* the filename tokens are to be extracted. */
/* Returns true on successful bookmark parse. */ /* Returns true on successful bookmark parse. */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static bool parse_bookmark(char *filenamebuf, static bool parse_bookmark(char *filenamebuf,
size_t filenamebufsz, size_t filenamebufsz,
const char *bookmark, const char *bookmark,
const bool parse_filenames,
const bool strip_dir) const bool strip_dir)
{ {
const char* s = bookmark; const char* s = bookmark;
@ -182,7 +181,7 @@ static bool parse_bookmark(char *filenamebuf,
end = strchr(s, ';'); end = strchr(s, ';');
/* extract file names */ /* extract file names */
if (parse_filenames) if(filenamebuf)
{ {
size_t len = (end == NULL) ? strlen(s) : (size_t) (end - s); size_t len = (end == NULL) ? strlen(s) : (size_t) (end - s);
len = MIN(TEMP_BUF_SIZE - 1, len); len = MIN(TEMP_BUF_SIZE - 1, len);
@ -200,7 +199,6 @@ static bool parse_bookmark(char *filenamebuf,
end++; end++;
} }
} }
if(filenamebuf)
strmemccpy(filenamebuf, end, filenamebufsz); strmemccpy(filenamebuf, end, filenamebufsz);
} }
} }
@ -279,7 +277,7 @@ static bool add_bookmark(const char* bookmark_file_name,
if (most_recent && (bookmark_count >= MAX_BOOKMARKS)) if (most_recent && (bookmark_count >= MAX_BOOKMARKS))
break; break;
if (!parse_bookmark(NULL, 0, global_temp_buffer, false, false)) if (!parse_bookmark(NULL, 0, global_temp_buffer, false))
break; break;
equal = false; equal = false;
@ -541,7 +539,7 @@ static const char* get_bookmark_info(int list_index,
} }
if (!parse_bookmark(fnamebuf, sizeof(fnamebuf), if (!parse_bookmark(fnamebuf, sizeof(fnamebuf),
bookmarks->items[index - bookmarks->start], true, true)) bookmarks->items[index - bookmarks->start], true))
{ {
return list_index % 2 == 0 ? (char*) str(LANG_BOOKMARK_INVALID) : " "; return list_index % 2 == 0 ? (char*) str(LANG_BOOKMARK_INVALID) : " ";
} }
@ -602,7 +600,7 @@ static void say_bookmark(const char* bookmark,
bool show_playlist_name) bool show_playlist_name)
{ {
char fnamebuf[MAX_PATH]; char fnamebuf[MAX_PATH];
if (!parse_bookmark(fnamebuf, sizeof(fnamebuf), bookmark, true, false)) if (!parse_bookmark(fnamebuf, sizeof(fnamebuf), bookmark, false))
{ {
talk_id(LANG_BOOKMARK_INVALID, false); talk_id(LANG_BOOKMARK_INVALID, false);
return; return;
@ -881,7 +879,7 @@ static bool play_bookmark(const char* bookmark)
bm.speed = dsp_get_timestretch(); bm.speed = dsp_get_timestretch();
#endif #endif
if (parse_bookmark(fnamebuf, sizeof(fnamebuf), bookmark, true, true)) if (parse_bookmark(fnamebuf, sizeof(fnamebuf), bookmark, true))
{ {
global_settings.repeat_mode = bm.repeat_mode; global_settings.repeat_mode = bm.repeat_mode;
global_settings.playlist_shuffle = bm.shuffle; global_settings.playlist_shuffle = bm.shuffle;
@ -968,7 +966,7 @@ static char* create_bookmark(void)
file); file);
/* checking to see if the bookmark is valid */ /* checking to see if the bookmark is valid */
if (parse_bookmark(NULL, 0, global_bookmark, false, false)) if (parse_bookmark(NULL, 0, global_bookmark, false))
return global_bookmark; return global_bookmark;
else else
return NULL; return NULL;