]> granicus.if.org Git - ejabberd/commitdiff
Replace VVALUEL macro with function in order to shut up the dialyzer
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 5 Sep 2011 07:09:36 +0000 (17:09 +1000)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 5 Sep 2011 07:09:36 +0000 (17:09 +1000)
src/mod_announce.erl

index 6f61ae301663786b53056a0068094b05bbe2437d..ce271461cd3b7f5a1d9b70818342efdd2270267f 100644 (file)
@@ -473,17 +473,18 @@ announce_commands(From, To,
 
 -define(VVALUE(Val),
        {xmlelement, "value", [], [{xmlcdata, Val}]}).
--define(VVALUEL(Val),
-       case Val of
-           "" -> [];
-           _ -> [?VVALUE(Val)]
-       end).
 -define(TVFIELD(Type, Var, Val),
        {xmlelement, "field", [{"type", Type},
                               {"var", Var}],
-        ?VVALUEL(Val)}).
+        vvaluel(Val)}).
 -define(HFIELD(), ?TVFIELD("hidden", "FORM_TYPE", ?NS_ADMIN)).
 
+vvaluel(Val) ->
+    case Val of
+        "" -> [];
+        _ -> [?VVALUE(Val)]
+    end.
+
 generate_adhoc_form(Lang, Node, ServerHost) ->
     LNode = tokenize(Node),
     {OldSubject, OldBody} = if (LNode == ?NS_ADMINL("edit-motd")) 
@@ -512,12 +513,12 @@ generate_adhoc_form(Lang, Node, ServerHost) ->
               [{"var", "subject"},
                {"type", "text-single"},
                {"label", translate:translate(Lang, "Subject")}],
-              ?VVALUEL(OldSubject)},
+              vvaluel(OldSubject)},
              {xmlelement, "field",
               [{"var", "body"},
                {"type", "text-multi"},
                {"label", translate:translate(Lang, "Message body")}],
-              ?VVALUEL(OldBody)}]
+              vvaluel(OldBody)}]
      end}.
 
 join_lines([]) ->