diff options
author | Waqas Hussain <waqas20@gmail.com> | 2009-10-02 17:51:53 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2009-10-02 17:51:53 +0500 |
commit | 902cc7dea99f105d2143e6e55a211e846ec50fe7 (patch) | |
tree | b5e26b456ee2a8a03373a60c44667429234fb56f /util-src | |
parent | 3525d3e37048d7fe2444347439d81d1484f0ad1a (diff) | |
parent | 727cc275bba229332912af42fe0e55524d73efdb (diff) | |
download | prosody-902cc7dea99f105d2143e6e55a211e846ec50fe7.tar.gz prosody-902cc7dea99f105d2143e6e55a211e846ec50fe7.zip |
Merge with 0.5
Diffstat (limited to 'util-src')
-rw-r--r-- | util-src/encodings.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c index bee4365c..5147512f 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -108,7 +108,6 @@ static int Lbase64_decode(lua_State *L) /** decode(s) */ break; } } - return 0; } static const luaL_Reg Reg_base64[] = @@ -124,14 +123,15 @@ static const luaL_Reg Reg_base64[] = static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) { + size_t len; + const char *s; + char string[1024]; + int ret; if(!lua_isstring(L, 1)) { lua_pushnil(L); return 1; } - size_t len; - const char *s = lua_tolstring(L, 1, &len); - char string[1024]; - int ret; + s = lua_tolstring(L, 1, &len); if (len >= 1024) { lua_pushnil(L); return 1; // TODO return error message @@ -167,6 +167,7 @@ static const luaL_Reg Reg_stringprep[] = /***************** IDNA *****************/ #include <idna.h> +#include <idn-free.h> static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */ { |