aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-10-15 17:14:03 +0200
committerKim Alvefur <zash@zash.se>2020-10-15 17:14:03 +0200
commit4d1b9f7c60d74bc8163f9900195c53f3b8552717 (patch)
treebb2cda56eae20195dca0f8ec9c5a780d37d1aa89
parent66f3fe9d1263faa27e5cd82cc4dfa18b6311cd3c (diff)
parentbad47be8f936a1d55123d1c3e5ffdb30d493abcc (diff)
downloadprosody-4d1b9f7c60d74bc8163f9900195c53f3b8552717.tar.gz
prosody-4d1b9f7c60d74bc8163f9900195c53f3b8552717.zip
Merge 0.11->trunk
-rw-r--r--util-src/strbitop.c23
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;
}