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

1 files changed, 13 insertions, 7 deletions

diff --git a/apps/plugins/lua/strpbrk.c b/apps/plugins/lua/strpbrk.c
index 1e0491f779..efa9cbd2bb 100644
--- a/apps/plugins/lua/strpbrk.c
+++ b/apps/plugins/lua/strpbrk.c
@@ -1,11 +1,17 @@
 #include "rocklibc.h"
 
 #undef strpbrk
-char *strpbrk(const char *s, const char *accept) {
-  register int i,l=strlen(accept);
-  for (; *s; s++)
-    for (i=0; i<l; i++)
-      if (*s == accept[i])
-        return (char*)s;
-  return 0;
+/* custom strbbrk allowing you to define search len of s*/
+const char *strpbrk_n(const char *s, int smax, const char *accept) {
+  register int i;
+  register const char *a = accept;
+  for (i=0; __likely(s[i] && i < smax); i++, a=accept)
+    while(__likely(a++[0]))
+      if ((s[i] == a[0]))
+        return &s[i];
+  return NULL;
+}
+
+inline char *strpbrk(const char *s, const char *accept) {
+  return (char*)strpbrk_n(s, INT_MAX, accept);
 }