Software /
code /
prosody
Diff
util-src/encodings.c @ 443:bd1397b1dfc9
Merge from waqas
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 27 Nov 2008 17:12:05 +0000 |
parent | 441:4089b62b510c |
child | 473:22b0e654c4cf |
line wrap: on
line diff
--- a/util-src/encodings.c Thu Nov 27 17:09:21 2008 +0000 +++ b/util-src/encodings.c Thu Nov 27 17:12:05 2008 +0000 @@ -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);