aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-10-15 17:12:33 +0200
committerKim Alvefur <zash@zash.se>2020-10-15 17:12:33 +0200
commitbad47be8f936a1d55123d1c3e5ffdb30d493abcc (patch)
treea4d96d4552b064605d03dfd83b15c5999a6a3ca9
parent9b8a54345ff195d46378d29b45f6822b3e05547a (diff)
downloadprosody-bad47be8f936a1d55123d1c3e5ffdb30d493abcc.tar.gz
prosody-bad47be8f936a1d55123d1c3e5ffdb30d493abcc.zip
Back out 6dde2c9fa272: Doesn't work on Lua 5.1
-rw-r--r--util-src/strbitop.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/util-src/strbitop.c b/util-src/strbitop.c
index 8c6367c8..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>
@@ -25,13 +25,10 @@ int strop_and(lua_State *L) {
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;
}
@@ -47,13 +44,10 @@ int strop_or(lua_State *L) {
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;
}
@@ -64,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;
}