From a634557a881b59b8be1dc156f9822c6d20bd8741 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sun, 13 Nov 2022 00:43:43 -0500 Subject: fix strptokspn, add strcspn, fix splash.c fix off by 1 error in strptokspn, add strcspn, fix fallout in splash.c Change-Id: I61475d9633fc35db5a8ae30cbe588f69f2f7fabc --- apps/playback.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'apps/playback.c') diff --git a/apps/playback.c b/apps/playback.c index c425e14baf..7eaa149f2c 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1483,7 +1483,7 @@ static bool audio_init_codec(struct track_info *track_infop, enum { AUTORESUMABLE_UNKNOWN = 0, AUTORESUMABLE_TRUE, AUTORESUMABLE_FALSE }; static bool autoresumable(struct mp3entry *id3) { - char *endp, *path; + char *path; size_t len; bool is_resumable; @@ -1501,13 +1501,7 @@ static bool autoresumable(struct mp3entry *id3) if (*path == ':') /* Skip empty search patterns */ continue; - /* FIXME: As soon as strcspn or strchrnul are made available in - the core, the following can be made more efficient. */ - endp = strchr(path, ':'); - if (endp) - len = endp - path; - else - len = strlen(path); + len = strcspn(path, ":"); /* Note: At this point, len is always > 0 */ -- cgit v1.2.3