From 539255c6923950c67706fc02a24c08ecb30a21b3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 15 Oct 2020 16:26:56 +0200 Subject: util.strbitop: Reformat code astyle \ --indent=tab \ --attach-classes \ --indent-switches \ --break-blocks \ --pad-oper \ --unpad-paren \ --add-braces \ --align-pointer=name \ --lineend=linux \ *.c --- util-src/strbitop.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'util-src/strbitop.c') diff --git a/util-src/strbitop.c b/util-src/strbitop.c index a26288e5..89fce661 100644 --- a/util-src/strbitop.c +++ b/util-src/strbitop.c @@ -14,11 +14,11 @@ /* TODO Deduplicate code somehow */ -int strop_and(lua_State* L) { +int strop_and(lua_State *L) { luaL_Buffer buf; size_t a, b, i; - const char* str_a = luaL_checklstring(L, 1, &a); - const char* str_b = luaL_checklstring(L, 2, &b); + const char *str_a = luaL_checklstring(L, 1, &a); + const char *str_b = luaL_checklstring(L, 2, &b); luaL_buffinit(L, &buf); @@ -35,11 +35,11 @@ int strop_and(lua_State* L) { return 1; } -int strop_or(lua_State* L) { +int strop_or(lua_State *L) { luaL_Buffer buf; size_t a, b, i; - const char* str_a = luaL_checklstring(L, 1, &a); - const char* str_b = luaL_checklstring(L, 2, &b); + const char *str_a = luaL_checklstring(L, 1, &a); + const char *str_b = luaL_checklstring(L, 2, &b); luaL_buffinit(L, &buf); @@ -56,11 +56,11 @@ int strop_or(lua_State* L) { return 1; } -int strop_xor(lua_State* L) { +int strop_xor(lua_State *L) { luaL_Buffer buf; size_t a, b, i; - const char* str_a = luaL_checklstring(L, 1, &a); - const char* str_b = luaL_checklstring(L, 2, &b); + const char *str_a = luaL_checklstring(L, 1, &a); + const char *str_b = luaL_checklstring(L, 2, &b); luaL_buffinit(L, &buf); -- cgit v1.2.3 From da8eca639abefd5419651d59f83ef06ba9113358 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 15 Oct 2020 16:43:30 +0200 Subject: util.strbitop: Create buffer in the correct size (optimization) This avoids dynamically growing the buffer as Lua does when luaL_addchar is used, thus saving on realloc calls. --- util-src/strbitop.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'util-src/strbitop.c') diff --git a/util-src/strbitop.c b/util-src/strbitop.c index 89fce661..922048fd 100644 --- a/util-src/strbitop.c +++ b/util-src/strbitop.c @@ -2,7 +2,7 @@ * This project is MIT licensed. Please see the * COPYING file in the source package for more information. * - * Copyright (C) 2016 Kim Alvefur + * Copyright (C) 2016-2020 Kim Alvefur */ #include @@ -27,10 +27,13 @@ int strop_and(lua_State *L) { return 1; } + char *cbuf = luaL_buffinitsize(L, &buf, a); + for(i = 0; i < a; i++) { - luaL_addchar(&buf, str_a[i] & str_b[i % b]); + cbuf[i] = str_a[i] & str_b[i % b]; } + luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } @@ -48,10 +51,13 @@ int strop_or(lua_State *L) { return 1; } + char *cbuf = luaL_buffinitsize(L, &buf, a); + for(i = 0; i < a; i++) { - luaL_addchar(&buf, str_a[i] | str_b[i % b]); + cbuf[i] = str_a[i] | str_b[i % b]; } + luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } @@ -62,17 +68,18 @@ int strop_xor(lua_State *L) { const char *str_a = luaL_checklstring(L, 1, &a); const char *str_b = luaL_checklstring(L, 2, &b); - luaL_buffinit(L, &buf); - if(a == 0 || b == 0) { lua_settop(L, 1); return 1; } + char *cbuf = luaL_buffinitsize(L, &buf, a); + for(i = 0; i < a; i++) { - luaL_addchar(&buf, str_a[i] ^ str_b[i % b]); + cbuf[i] = str_a[i] ^ str_b[i % b]; } + luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } -- cgit v1.2.3