diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2016-11-06 18:26:48 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2016-11-06 18:26:48 -0500 |
| commit | 284b250c3b7feeef0bf5b45879922b6d4d51803d (patch) | |
| tree | 17508a6cf6e61a5a44245545ec9af4b97eaf50b0 /apps/plugins/lua | |
| parent | 173d9fb38b029122e85610a69334ddb44107bd78 (diff) | |
| parent | 3b7e7cb535582542b1dbebd87348a0fbf4f344bb (diff) | |
| download | rockbox-284b250c3b7feeef0bf5b45879922b6d4d51803d.zip rockbox-284b250c3b7feeef0bf5b45879922b6d4d51803d.tar.gz rockbox-284b250c3b7feeef0bf5b45879922b6d4d51803d.tar.bz2 rockbox-284b250c3b7feeef0bf5b45879922b6d4d51803d.tar.xz | |
Merge branch 'master' into working
Change-Id: Iad54233a3575c0117f88ce7a1e89bfa639760f63
Diffstat (limited to 'apps/plugins/lua')
| -rw-r--r-- | apps/plugins/lua/ltablib.c | 2 | ||||
| -rw-r--r-- | apps/plugins/lua/strncat.c | 24 |
2 files changed, 21 insertions, 5 deletions
diff --git a/apps/plugins/lua/ltablib.c b/apps/plugins/lua/ltablib.c index b6d9cb4..0bdac7f 100644 --- a/apps/plugins/lua/ltablib.c +++ b/apps/plugins/lua/ltablib.c @@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) { if (!lua_isstring(L, -1)) luaL_error(L, "invalid value (%s) at index %d in table for " LUA_QL("concat"), luaL_typename(L, -1), i); - luaL_addvalue(b); + luaL_addvalue(b); } diff --git a/apps/plugins/lua/strncat.c b/apps/plugins/lua/strncat.c index 5b15ff0..1473974 100644 --- a/apps/plugins/lua/strncat.c +++ b/apps/plugins/lua/strncat.c @@ -8,11 +8,27 @@ char *strncat(char *s, const char *t, size_t n) { s+=strlen(s); if (__unlikely((max=s+n)==s)) goto fini; for (;;) { - if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; + if (__unlikely(!(*s = *t))) + break; + if (__unlikely(++s==max)) + break; + ++t; #ifndef WANT_SMALL_STRING_ROUTINES - if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; - if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; - if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t; + if (__unlikely(!(*s = *t))) + break; + if (__unlikely(++s==max)) + break; + ++t; + if (__unlikely(!(*s = *t))) + break; + if (__unlikely(++s==max)) + break; + ++t; + if (__unlikely(!(*s = *t))) + break; + if (__unlikely(++s==max)) + break; + ++t; #endif } *s=0; |