From 1aa739e3c3d1ce25cdebe285847c3c493756d5d6 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 3 Oct 2020 22:45:27 -0400 Subject: lua misc tweaks and cleanup checks button_status in rockev strpbrk_n custom implementation allows setting max search len in source string add some branch prediction where appropriate fix formatting in splash_scroller script Change-Id: Id5d8e9d83f4b3e361ccb67b403af8f9a8a31b8f0 --- apps/plugins/lua/rockaux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/plugins/lua/rockaux.c') diff --git a/apps/plugins/lua/rockaux.c b/apps/plugins/lua/rockaux.c index 7ed82f616d..25bace3451 100644 --- a/apps/plugins/lua/rockaux.c +++ b/apps/plugins/lua/rockaux.c @@ -27,6 +27,7 @@ #include "lib/pluginlib_actions.h" extern long strtol(const char *nptr, char **endptr, int base); +extern const char *strpbrk_n(const char *s, int smax, const char *accept); #if (CONFIG_PLATFORM & PLATFORM_NATIVE) int errno = 0; @@ -58,7 +59,7 @@ int splash_scroller(int timeout, const char* str) const int max_lines = LCD_HEIGHT / ch_h - 1; const int wrap_thresh = (LCD_WIDTH / 3); const char *ch; - char *brk; + const char *brk; const int max_ch = (LCD_WIDTH / ch_w - 1) * 2; char line[max_ch + 2]; /* display buffer */ @@ -98,9 +99,10 @@ int splash_scroller(int timeout, const char* str) rb->lcd_getstringsize(line, &w, NULL); /* try to not split in middle of words */ - if (w + wrap_thresh >= max_w && strpbrk (&line[linepos], break_chars)) + if (w + wrap_thresh >= max_w && + strpbrk_n(ch, 1, break_chars)) { - brk = strpbrk(ch+1, break_chars); + brk = strpbrk_n(ch+1, max_ch, break_chars); chars_next_break = (brk - ch); if (chars_next_break < 2 || w + (ch_w * chars_next_break) > max_w) { -- cgit v1.2.3