X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2Fhashes.c;h=ecab2e328e892833d8d5780066e6afaf8c8f88c8;hb=897c9a8db3da19a4bed4cb8bb2b6e2de8b2d5835;hp=b027423ad000215cb7387a57c412d6310518c14b;hpb=5334c73220a040f4e257984b8accbc9ba6a5534a;p=prosody.git

diff --git a/util-src/hashes.c b/util-src/hashes.c
index b027423a..ecab2e32 100644
--- a/util-src/hashes.c
+++ b/util-src/hashes.c
@@ -27,8 +27,8 @@ typedef unsigned __int32 uint32_t;
 #include <openssl/sha.h>
 #include <openssl/md5.h>
 
-#if (LUA_VERSION_NUM == 502)
-#define luaL_register(L, N, R) luaL_setfuncs(L, R, 0)
+#if (LUA_VERSION_NUM == 501)
+#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
 #endif
 
 #define HMAC_IPAD 0x36363636
@@ -170,7 +170,7 @@ static int LscramHi(lua_State* L) {
 	salt2 = malloc(salt_len + 4);
 
 	if(salt2 == NULL) {
-		luaL_error(L, "Out of memory in scramHi");
+		return luaL_error(L, "Out of memory in scramHi");
 	}
 
 	memcpy(salt2, salt, salt_len);
@@ -213,7 +213,7 @@ static const luaL_Reg Reg[] = {
 
 LUALIB_API int luaopen_util_hashes(lua_State* L) {
 	lua_newtable(L);
-	luaL_register(L, NULL, Reg);
+	luaL_setfuncs(L, Reg, 0);;
 	lua_pushliteral(L, "-3.14");
 	lua_setfield(L, -2, "version");
 	return 1;