diff options
| author | Kim Alvefur <zash@zash.se> | 2018-11-28 20:36:53 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-11-28 20:36:53 +0100 |
| commit | d007771f8da390816640fa3839b29dcbaa5862d2 (patch) | |
| tree | dea88bb48f743f7cb1c2cc86cb247349a7e6846b /util/format.lua | |
| parent | d84d0a52ce3d37a4182b0776b58657610a99ebb5 (diff) | |
| download | prosody-d007771f8da390816640fa3839b29dcbaa5862d2.tar.gz prosody-d007771f8da390816640fa3839b29dcbaa5862d2.zip | |
util.format: Tweak how nil values are handled
Because [<nil>] seems exsessive
Diffstat (limited to 'util/format.lua')
| -rw-r--r-- | util/format.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/util/format.lua b/util/format.lua index c5e513fa..16c57bc6 100644 --- a/util/format.lua +++ b/util/format.lua @@ -28,13 +28,12 @@ local function format(formatstring, ...) if spec ~= "%%" then i = i + 1; local arg = args[i]; - if arg == nil then -- special handling for nil - arg = "<nil>" - args[i] = "<nil>"; - end local option = spec:sub(-1); - if option == "q" or option == "s" then -- arg should be string + if arg == nil then + args[i] = "nil"; + spec = "<%s>"; + elseif option == "q" or option == "s" then -- arg should be string args[i] = tostring(arg); elseif type(arg) ~= "number" then -- arg isn't number as expected? args[i] = tostring(arg); |