Always match against missing required variables

vmeeting-io · Jul 16, 2019 · 08a1efb · 08a1efb
1 parent 31413d7
commit 08a1efb
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 6 deletions.
diff --git a/src/flex_offline.erl b/src/flex_offline.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -215,6 +217,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_number_of_messages(non_neg_integer() |

diff --git a/src/http_upload.erl b/src/http_upload.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/2, encode/3, encode/4]).
@@ -217,6 +219,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec 'encode_max-file-size'(non_neg_integer() |

diff --git a/src/mam_query.erl b/src/mam_query.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -294,6 +296,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_with(jid:jid() | undefined, binary(),

diff --git a/src/muc_register.erl b/src/muc_register.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).

diff --git a/src/muc_request.erl b/src/muc_request.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).

diff --git a/src/muc_roomconfig.erl b/src/muc_roomconfig.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -1381,6 +1383,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_maxhistoryfetch(binary(), binary(),

diff --git a/src/muc_roominfo.erl b/src/muc_roominfo.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -674,6 +676,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_maxhistoryfetch(non_neg_integer() |

diff --git a/src/pubsub_get_pending.erl b/src/pubsub_get_pending.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).

diff --git a/src/pubsub_meta_data.erl b/src/pubsub_meta_data.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -525,6 +527,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_contact([jid:jid()], binary(),

diff --git a/src/pubsub_node_config.erl b/src/pubsub_node_config.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -1290,6 +1292,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_access_model(access_model() | undefined,

diff --git a/src/pubsub_publish_options.erl b/src/pubsub_publish_options.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -258,6 +260,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_persist_items(boolean() | undefined,

diff --git a/src/pubsub_subscribe_authorization.erl b/src/pubsub_subscribe_authorization.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).

diff --git a/src/pubsub_subscribe_options.erl b/src/pubsub_subscribe_options.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -453,6 +455,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec encode_deliver(boolean() | undefined, binary(),

diff --git a/src/push_summary.erl b/src/push_summary.erl
@@ -12,6 +12,8 @@
 	   {dec_bool, 1}, {enc_bool, 1}, {dec_ip, 1},
 	   {enc_ip, 1}]}).
 
+-compile(nowarn_unused_vars).
+
 -dialyzer({nowarn_function, {dec_int, 3}}).
 
 -export([encode/1, encode/2, encode/3]).
@@ -318,6 +320,9 @@ do_decode([#xdata_field{var = Var} | Fs], XMLNS,
 	   erlang:error({?MODULE, {unknown_var, Var, XMLNS}});
        true -> do_decode(Fs, XMLNS, Required, Acc)
     end;
+do_decode([], XMLNS, [Var | _], _) ->
+    erlang:error({?MODULE,
+		  {missing_required_var, Var, XMLNS}});
 do_decode([], _, [], Acc) -> Acc.
 
 -spec 'encode_message-count'(non_neg_integer() |

diff --git a/src/xdata_codec.erl b/src/xdata_codec.erl
@@ -293,6 +293,7 @@ mk_header(#state{mod_name = Mod, hrl = Include, xmlns = NS} = State) ->
     mk_comment_header(State),
     emit("~n-module(~s).~n", [Mod]),
     emit("-compile({nowarn_unused_function, ~p}).~n", [codec_funs()]),
+    emit("-compile(nowarn_unused_vars).~n"),
     emit("-dialyzer({nowarn_function, dec_int/3}).~n"),
     case NS of
 	[_] -> emit("-export([encode/1, encode/2, encode/3]).~n");
@@ -498,12 +499,8 @@ mk_decoder([], State) ->
 		 "    do_decode(Fs, XMLNS, Required, Acc)"
 		 "  end;")
     end,
-    if State#state.required /= [] ->
-	    emit("do_decode([], XMLNS, [Var|_], _) ->"
-		 "  erlang:error({?MODULE, {missing_required_var, Var, XMLNS}});~n");
-       true ->
-	    ok
-    end,
+    emit("do_decode([], XMLNS, [Var|_], _) ->"
+	 "  erlang:error({?MODULE, {missing_required_var, Var, XMLNS}});~n"),
     emit("do_decode([], _, [], Acc) -> Acc.~n").
 
 mk_encoders(Fs, State) ->