diff options
| author | Kim Alvefur <zash@zash.se> | 2020-10-15 17:14:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-10-15 17:14:03 +0200 |
| commit | 9e41caf702b72b042f57352a5616ed3621403072 (patch) | |
| tree | bb2cda56eae20195dca0f8ec9c5a780d37d1aa89 | |
| parent | 9233d48222014280573d97388ac3e476392f068b (diff) | |
| parent | f61a3420ea19c6a89fce22952026214768ae9f2d (diff) | |
| download | prosody-9e41caf702b72b042f57352a5616ed3621403072.tar.gz prosody-9e41caf702b72b042f57352a5616ed3621403072.zip | |
Merge 0.11->trunk
| -rw-r--r-- | util-src/strbitop.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/util-src/strbitop.c b/util-src/strbitop.c index 922048fd..2c6a4e4d 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-2020 Kim Alvefur + * Copyright (C) 2016 Kim Alvefur */ #include <lua.h> @@ -20,20 +20,15 @@ int strop_and(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++) { - cbuf[i] = str_a[i] & str_b[i % b]; + luaL_addchar(&buf, str_a[i] & str_b[i % b]); } - luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } @@ -44,20 +39,15 @@ int strop_or(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++) { - cbuf[i] = str_a[i] | str_b[i % b]; + luaL_addchar(&buf, str_a[i] | str_b[i % b]); } - luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } @@ -68,18 +58,17 @@ 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++) { - cbuf[i] = str_a[i] ^ str_b[i % b]; + luaL_addchar(&buf, str_a[i] ^ str_b[i % b]); } - luaL_addsize(&buf, a); luaL_pushresult(&buf); return 1; } |