diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 17:09:36 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-09-05 17:09:36 +1000 |
| commit | 3b95108a3af11df4b731730da416dd9fa751af8f (patch) | |
| tree | 223564c3fe83bb6e50c542c40dfb241a9a875978 /src/mod_announce.erl | |
| parent | Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline... (diff) | |
Replace VVALUEL macro with function in order to shut up the dialyzer
Diffstat (limited to 'src/mod_announce.erl')
| -rw-r--r-- | src/mod_announce.erl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mod_announce.erl b/src/mod_announce.erl index 6f61ae30..ce271461 100644 --- a/src/mod_announce.erl +++ b/src/mod_announce.erl @@ -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([]) -> |