util.{interpolation,prosodyctl,sql}: Trim trailing whitespace

diff --git a/util/interpolation.lua b/util/interpolation.lua
index b78bdfd1a1ee1286c20b3ccb81d8608e952269be..157a0bc9732e0e46864e5249e517f817d76207fc 100644 (file)
--- a/util/interpolation.lua
+++ b/util/interpolation.lua
@@ -1,6 +1,6 @@
 -- Simple template language
 --
--- The new() function takes a pattern and an escape function and returns 
+-- The new() function takes a pattern and an escape function and returns
 -- a render() function.  Both are required.
 --
 -- The function render() takes a string template and a table of values.
@@ -9,14 +9,14 @@
 -- symbol.
 --
 -- Variants are:
--- {name} is substituted for values["name"] and is escaped using the 
+-- {name} is substituted for values["name"] and is escaped using the
 -- second argument to new_render().  To disable the escaping, use {name!}.
 -- {name.item} can be used to access table items.
 -- To renter lists of items: {name# item number {idx} is {item} }
 -- Or key-value pairs: {name% t[ {idx} ] = {item} }
--- To show a defaults for missing values {name? sub-template } can be used, 
+-- To show a defaults for missing values {name? sub-template } can be used,
 -- which renders a sub-template if values["name"] is false-ish.
--- {name& sub-template } does the opposite, the sub-template is rendered 
+-- {name& sub-template } does the opposite, the sub-template is rendered
 -- if the selected value is anything but false or nil.
 
 local type, tostring = type, tostring;

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index cc48d5907155a9eee8b5afe1183f55daaa8b0e28..9e30f8ea17094ac5cc5ddf04b28bb6985730d2a1 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -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.
 --
@@ -146,7 +146,7 @@ function adduser(params)
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
-       
+
        local ok, errmsg = usermanager.create_user(user, password, host);
        if not ok then
                return false, errmsg;
@@ -162,7 +162,7 @@ function user_exists(params)
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
-       
+
        return usermanager.user_exists(user, host);
 end
 
@@ -170,7 +170,7 @@ function passwd(params)
        if not _M.user_exists(params) then
                return false, "no-such-user";
        end
-       
+
        return _M.adduser(params);
 end
 
@@ -179,7 +179,7 @@ function deluser(params)
                return false, "no-such-user";
        end
        local user, host = nodeprep(params.user), nameprep(params.host);
-       
+
        return usermanager.delete_user(user, host);
 end
 
@@ -192,30 +192,30 @@ function getpid()
        if type(pidfile) ~= "string" then
                return false, "invalid-pidfile";
        end
-       
+
        local modules_enabled = set.new(config.get("*", "modules_disabled"));
        if prosody.platform ~= "posix" or modules_enabled:contains("posix") then
                return false, "no-posix";
        end
-       
+
        local file, err = io.open(pidfile, "r+");
        if not file then
                return false, "pidfile-read-failed", err;
        end
-       
+
        local locked, err = lfs.lock(file, "w");
        if locked then
                file:close();
                return false, "pidfile-not-locked";
        end
-       
+
        local pid = tonumber(file:read("*a"));
        file:close();
-       
+
        if not pid then
                return false, "invalid-pid";
        end
-       
+
        return true, pid;
 end
 
@@ -256,10 +256,10 @@ function stop()
        if not ret then
                return false, "not-running";
        end
-       
+
        local ok, pid = _M.getpid()
        if not ok then return false, pid; end
-       
+
        signal.kill(pid, signal.SIGTERM);
        return true;
 end
@@ -272,10 +272,10 @@ function reload()
        if not ret then
                return false, "not-running";
        end
-       
+
        local ok, pid = _M.getpid()
        if not ok then return false, pid; end
-       
+
        signal.kill(pid, signal.SIGHUP);
        return true;
 end

diff --git a/util/sql.lua b/util/sql.lua
index f934bbdf91b83e763b20e1a64ed57f3ea4cfca19..be34c3817d19bb299cb29c5b9a2584879e73f515 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -285,7 +285,7 @@ function engine:set_encoding() -- to UTF-8
        if not ok then
                return ok, err;
        end
-       
+
        if driver == "MySQL" then
                local ok, actual_charset = self:transaction(function ()
                        return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
@@ -297,7 +297,7 @@ function engine:set_encoding() -- to UTF-8
                        end
                end
        end
-       
+
        return true;
 end
 local engine_mt = { __index = engine };