diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-18 11:42:44 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-18 11:42:44 +0200 |
| commit | a1086ac00ece8044b4055047aaac2f912a5ca18e (patch) | |
| tree | 902a18bad02dc318b61744abb4d01c704a1196ff /lib/xmerl/src/xmerl_xsd_type.erl | |
| parent | 02288f2c754c8d54d138a736fbada68706bf035e (diff) | |
| parent | 7153dd1f8baa77a6b2c2b29df56a2d0c41fa770b (diff) | |
| download | otp-a1086ac00ece8044b4055047aaac2f912a5ca18e.tar.gz otp-a1086ac00ece8044b4055047aaac2f912a5ca18e.tar.bz2 otp-a1086ac00ece8044b4055047aaac2f912a5ca18e.zip | |
Merge branch 'egil/xmerl/fix-unmatched_return/OTP-13595'
* egil/xmerl/fix-unmatched_return/OTP-13595:
xmerl: Fix unmatched return warnings
Diffstat (limited to 'lib/xmerl/src/xmerl_xsd_type.erl')
| -rw-r--r-- | lib/xmerl/src/xmerl_xsd_type.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/xmerl/src/xmerl_xsd_type.erl b/lib/xmerl/src/xmerl_xsd_type.erl index 14a673b0c0..3ee5961522 100644 --- a/lib/xmerl/src/xmerl_xsd_type.erl +++ b/lib/xmerl/src/xmerl_xsd_type.erl @@ -229,11 +229,13 @@ check_float(Value) -> %% {Mantissa,Exponent}=lists:splitwith(Pred,Value), %% SkipEe = fun([]) -> [];(L) -> tl(L) end, case string:tokens(Value,"eE") of - [Mantissa,Exponent] -> - {ok,_} = check_decimal(Mantissa), - {ok,_} = check_integer(Exponent); - [Mantissa] -> - check_decimal(Mantissa) + [Mantissa,Exponent] -> + {ok,_} = check_decimal(Mantissa), + {ok,_} = check_integer(Exponent), + ok; + [Mantissa] -> + {ok,_} = check_decimal(Mantissa), + ok end, {ok,Value}. %% case {check_decimal(Mantissa), @@ -367,7 +369,7 @@ check_dateTime("+"++_DateTime) -> check_dateTime(DateTime) -> [Date,Time] = string:tokens(DateTime,"T"), [Y,M,D] = string:tokens(Date,"-"), - check_year(Y), + {ok,_} = check_year(Y), {ok,_} = check_positive_integer(M), {ok,_} = check_positive_integer(D), check_time(Time). |