From 9b8a54345ff195d46378d29b45f6822b3e05547a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 15 Oct 2020 17:05:53 +0200 Subject: util.strbitop: Remove redundant init function When you have 3 almost identical functions, you tend to edit one and then copypaste. Forgot to remove this line from the other two. --- util-src/strbitop.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'util-src') diff --git a/util-src/strbitop.c b/util-src/strbitop.c index 922048fd..8c6367c8 100644 --- a/util-src/strbitop.c +++ b/util-src/strbitop.c @@ -20,8 +20,6 @@ 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; @@ -44,8 +42,6 @@ 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; -- cgit v1.2.3 From bad47be8f936a1d55123d1c3e5ffdb30d493abcc Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 15 Oct 2020 17:12:33 +0200 Subject: Back out 6dde2c9fa272: Doesn't work on Lua 5.1 --- util-src/strbitop.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'util-src') 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 @@ -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; } -- cgit v1.2.3