Merge 0.10->trunk

[prosody.git] / util-src / windows.c

diff --git a/util-src/windows.c b/util-src/windows.c
index 37f850e35070eccaf140721adece23d8c626c3dd..4fcbf21ea5bed5cfc72966584a24e3358d68c7ff 100644 (file)
--- a/util-src/windows.c
+++ b/util-src/windows.c
@@ -1,7 +1,7 @@
 /* Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -19,27 +19,30 @@
 #include "lua.h"
 #include "lauxlib.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
 
-static int Lget_nameservers(lua_State *L) {
+static int Lget_nameservers(lua_State* L) {
        char stack_buffer[1024]; // stack allocated buffer
        IP4_ARRAY* ips = (IP4_ARRAY*) stack_buffer;
        DWORD len = sizeof(stack_buffer);
        DNS_STATUS status;
 
        status = DnsQueryConfig(DnsConfigDnsServerList, FALSE, NULL, NULL, ips, &len);
-       if (status == 0) {
+
+       if(status == 0) {
                DWORD i;
                lua_createtable(L, ips->AddrCount, 0);
-               for (i = 0; i < ips->AddrCount; i++) {
+
+               for(i = 0; i < ips->AddrCount; i++) {
                        DWORD ip = ips->AddrArray[i];
                        char ip_str[16] = "";
                        sprintf_s(ip_str, sizeof(ip_str), "%d.%d.%d.%d", (ip >> 0) & 255, (ip >> 8) & 255, (ip >> 16) & 255, (ip >> 24) & 255);
                        lua_pushstring(L, ip_str);
-                       lua_rawseti(L, -2, i+1);
+                       lua_rawseti(L, -2, i + 1);
                }
+
                return 1;
        } else {
                lua_pushnil(L);
@@ -48,45 +51,60 @@ static int Lget_nameservers(lua_State *L) {
        }
 }
 
-static int lerror(lua_State *L, char* string) {
+static int lerror(lua_State* L, char* string) {
        lua_pushnil(L);
        lua_pushfstring(L, "%s: %d", string, GetLastError());
        return 2;
 }
 
-static int Lget_consolecolor(lua_State *L) {
+static int Lget_consolecolor(lua_State* L) {
        HWND console = GetStdHandle(STD_OUTPUT_HANDLE);
-       WORD color; DWORD read_len;
-       
+       WORD color;
+       DWORD read_len;
+
        CONSOLE_SCREEN_BUFFER_INFO info;
-       
-       if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
-       if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo");
-       if (!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
+
+       if(console == INVALID_HANDLE_VALUE) {
+               return lerror(L, "GetStdHandle");
+       }
+
+       if(!GetConsoleScreenBufferInfo(console, &info)) {
+               return lerror(L, "GetConsoleScreenBufferInfo");
+       }
+
+       if(!ReadConsoleOutputAttribute(console, &color, 1, info.dwCursorPosition, &read_len)) {
+               return lerror(L, "ReadConsoleOutputAttribute");
+       }
 
        lua_pushnumber(L, color);
        return 1;
 }
-static int Lset_consolecolor(lua_State *L) {
+static int Lset_consolecolor(lua_State* L) {
        int color = luaL_checkint(L, 1);
        HWND console = GetStdHandle(STD_OUTPUT_HANDLE);
-       if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
-       if (!SetConsoleTextAttribute(console, color)) return lerror(L, "SetConsoleTextAttribute");
+
+       if(console == INVALID_HANDLE_VALUE) {
+               return lerror(L, "GetStdHandle");
+       }
+
+       if(!SetConsoleTextAttribute(console, color)) {
+               return lerror(L, "SetConsoleTextAttribute");
+       }
+
        lua_pushboolean(L, 1);
        return 1;
 }
 
-static const luaL_Reg Reg[] =
-{
+static const luaL_Reg Reg[] = {
        { "get_nameservers",    Lget_nameservers        },
        { "get_consolecolor",   Lget_consolecolor       },
        { "set_consolecolor",   Lset_consolecolor       },
        { NULL,         NULL    }
 };
 
-LUALIB_API int luaopen_util_windows(lua_State *L) {
+LUALIB_API int luaopen_util_windows(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;