Mercurial > lxmppd-hg-xmllex / changeset

--- a/util-src/encodings.c	Thu Nov 27 03:12:12 2008 +0000
+++ b/util-src/encodings.c	Thu Nov 27 21:47:13 2008 +0500
@@ -3,7 +3,11 @@
 * Lua library for base64, stringprep and idna encodings
 */
 
+// Newer MSVC compilers deprecate strcpy as unsafe, but we use it in a safe way
+#define _CRT_SECURE_NO_DEPRECATE
+
 #include <string.h>
+#include <malloc.h>
 
 #include "lua.h"
 #include "lauxlib.h"
@@ -51,9 +55,9 @@
 	char s[3];
 	switch (--n)
 	{
-		case 3: s[2]=tuple;
-		case 2: s[1]=tuple >> 8;
-		case 1: s[0]=tuple >> 16;
+		case 3: s[2]=(char) tuple;
+		case 2: s[1]=(char) (tuple >> 8);
+		case 1: s[0]=(char) (tuple >> 16);
 	}
 	luaL_addlstring(b,s,n);
 }
@@ -74,7 +78,7 @@
 			const char *p;
 			default:
 				p=strchr(code,c); if (p==NULL) return 0;
-				t[n++]= p-code;
+				t[n++]= (char) (p-code);
 				if (n==4)
 				{
 					base64_decode(&b,t[0],t[1],t[2],t[3],4);

--- a/util-src/hashes.c	Thu Nov 27 03:12:12 2008 +0000
+++ b/util-src/hashes.c	Thu Nov 27 21:47:13 2008 +0500
@@ -26,7 +26,7 @@
 	int hex_out = lua_toboolean(L, 2); \
 	char hash[size]; \
 	char result[size*2]; \
-	func(s, len, hash); \
+	func((const unsigned char*)s, len, (unsigned char*)hash);  \
 	if (hex_out) { \
 		toHex(hash, size, result); \
 		lua_pushlstring(L, result, size*2); \