From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 5 Sep 2011 07:09:36 +0000 (+1000)
Subject: Replace VVALUEL macro with function in order to shut up the dialyzer
X-Git-Tag: v2.1.9~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b95108a3af11df4b731730da416dd9fa751af8f;p=ejabberd

Replace VVALUEL macro with function in order to shut up the dialyzer
---

diff --git a/src/mod_announce.erl b/src/mod_announce.erl
index 6f61ae301..ce271461c 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([]) ->