diff options
| author | Kim Alvefur <zash@zash.se> | 2020-10-15 16:51:16 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-10-15 16:51:16 +0200 |
| commit | 66f3fe9d1263faa27e5cd82cc4dfa18b6311cd3c (patch) | |
| tree | 4c997bb8ea79972f789b687bf54260336a2befcb /util-src | |
| parent | 4f4140fbc363160f859292c8b1eccd701ad7b1e1 (diff) | |
| parent | da8eca639abefd5419651d59f83ef06ba9113358 (diff) | |
| download | prosody-66f3fe9d1263faa27e5cd82cc4dfa18b6311cd3c.tar.gz prosody-66f3fe9d1263faa27e5cd82cc4dfa18b6311cd3c.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util-src')
| -rw-r--r-- | util-src/strbitop.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/util-src/strbitop.c b/util-src/strbitop.c index a26288e5..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 <lua.h> @@ -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); @@ -27,19 +27,22 @@ 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; } -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); @@ -48,31 +51,35 @@ 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; } -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); - - luaL_buffinit(L, &buf); + const char *str_a = luaL_checklstring(L, 1, &a); + const char *str_b = luaL_checklstring(L, 2, &b); 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; } |