[xmerl] Fix compiler and dialyzer warnings

1 files changed, 47 insertions, 3 deletions

diff --git a/lib/xmerl/src/xmerl_sax_parser_utf8.erlsrc b/lib/xmerl/src/xmerl_sax_parser_utf8.erlsrc
index d46d60d237..f41d06d013 100644
--- a/lib/xmerl/src/xmerl_sax_parser_utf8.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_utf8.erlsrc
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,11 +34,55 @@
 -define(APPEND_STRING(Rest, New), <<Rest/binary, New/binary>>).
 -define(TO_INPUT_FORMAT(Val), unicode:characters_to_binary(Val, unicode, utf8)).
 
-
-%% STRING_REST and STRING_UNBOUND_REST is only different in the list case
 -define(STRING_UNBOUND_REST(MatchChar, Rest), <<MatchChar/utf8, Rest/binary>>).
 -define(BYTE_ORDER_MARK_1, <<16#EF>>).
 -define(BYTE_ORDER_MARK_2, <<16#EF, 16#BB>>).
 -define(BYTE_ORDER_MARK_REST(Rest), <<16#EF, 16#BB, 16#BF, Rest/binary>>).
 
+-define(PARSE_BYTE_ORDER_MARK(Bytes, State),
+        parse_byte_order_mark(?STRING_EMPTY, State) ->
+               cf(?STRING_EMPTY, State, fun parse_byte_order_mark/2);
+        parse_byte_order_mark(?BYTE_ORDER_MARK_1, State) ->
+               cf(?BYTE_ORDER_MARK_1, State, fun parse_byte_order_mark/2);
+        parse_byte_order_mark(?BYTE_ORDER_MARK_2, State) ->
+               cf(?BYTE_ORDER_MARK_2, State, fun parse_byte_order_mark/2);
+        parse_byte_order_mark(?BYTE_ORDER_MARK_REST(Rest), State) ->
+               parse_xml_decl(Rest, State);
+        parse_byte_order_mark(Bytes, State) ->
+               parse_xml_decl(Bytes, State)).
+
+-define(PARSE_XML_DECL(Bytes, State), 
+        parse_xml_decl(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State) when is_binary(Bytes) ->
+               case unicode:characters_to_list(Bytes, Enc) of 
+                   {incomplete, _, _} ->
+                       cf(Bytes, State, fun parse_xml_decl/2);
+                   {error, _Encoded, _Rest} ->
+                       ?fatal_error(State,  lists:flatten(io_lib:format("Bad character, not in ~p\n", [Enc])));
+                   _ ->
+                       parse_prolog(Bytes, State)
+               end;       
+        parse_xml_decl(Bytes, State) ->
+               parse_prolog(Bytes, State)).
+
+-define(WHITESPACE(Bytes, State, Acc),
+        whitespace(?STRING_UNBOUND_REST(_C, _) = Bytes, State, Acc) -> 
+               {lists:reverse(Acc), Bytes, State};
+        whitespace(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State, Acc) when is_binary(Bytes) -> 
+               case unicode:characters_to_list(Bytes, Enc) of 
+                   {incomplete, _, _} ->
+                       cf(Bytes, State, Acc, fun whitespace/3);
+                   {error, _Encoded, _Rest} ->
+                       ?fatal_error(State, lists:flatten(io_lib:format("Bad character, not in ~p\n", [Enc])))
+               end).
 
+-define(PARSE_EXTERNAL_ENTITY_BYTE_ORDER_MARK(Bytes, State),
+        parse_external_entity_byte_order_mark(?STRING_EMPTY, State) ->
+               cf(?STRING_EMPTY, State, fun parse_external_entity_byte_order_mark/2);
+        parse_external_entity_byte_order_mark(?BYTE_ORDER_MARK_1, State) ->
+               cf(?BYTE_ORDER_MARK_1, State, fun parse_external_entity_byte_order_mark/2);
+        parse_external_entity_byte_order_mark(?BYTE_ORDER_MARK_2, State) ->
+               cf(?BYTE_ORDER_MARK_2, State, fun parse_external_entity_byte_order_mark/2);
+        parse_external_entity_byte_order_mark(?BYTE_ORDER_MARK_REST(Rest), State) ->
+               parse_external_entity_1(Rest, State);
+        parse_external_entity_byte_order_mark(Bytes, State) ->
+               parse_external_entity_1(Bytes, State)).