Software / code / prosody
Changeset
5866:10a16fdebe2c
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Oct 2013 22:27:01 +0100 |
| parents | 5861:c3ee62b3bdfe (current diff) 5865:b10ee87ac76a (diff) |
| children | 5873:4669bd7038c7 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/util-src/windows.c Mon Oct 07 12:56:53 2013 +0200 +++ b/util-src/windows.c Thu Oct 10 22:27:01 2013 +0100 @@ -58,7 +58,7 @@ if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle"); if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo"); - if (!ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute"); + if (!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute"); lua_pushnumber(L, color); return 1;
--- a/util/sasl.lua Mon Oct 07 12:56:53 2013 +0200 +++ b/util/sasl.lua Thu Oct 10 22:27:01 2013 +0100 @@ -18,7 +18,6 @@ local setmetatable = setmetatable; local assert = assert; local require = require; -local print = print module "sasl" @@ -48,7 +47,7 @@ local mechanism_channelbindings = {}; -- register a new SASL mechanims -local function registerMechanism(name, backends, f, cb_backends) +function registerMechanism(name, backends, f, cb_backends) assert(type(name) == "string", "Parameter name MUST be a string."); assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table."); assert(type(f) == "function", "Parameter f MUST be a function.");
