diff options
author | Ingela Anderton Andin <[email protected]> | 2016-01-28 15:44:15 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-01-28 16:13:58 +0100 |
commit | ba8d87765f490d99c9768dd116bb1a2e75354cc6 (patch) | |
tree | 90e4628f32237d9529b997b0380c1bea1c2775d8 /lib/inets/src/tftp | |
parent | 1523be48ab4071b158412f4b06fe9c8d6ba3e73c (diff) | |
download | otp-ba8d87765f490d99c9768dd116bb1a2e75354cc6.tar.gz otp-ba8d87765f490d99c9768dd116bb1a2e75354cc6.tar.bz2 otp-ba8d87765f490d99c9768dd116bb1a2e75354cc6.zip |
inets: Use re instead of inets_regexp
Diffstat (limited to 'lib/inets/src/tftp')
-rw-r--r-- | lib/inets/src/tftp/tftp_engine.erl | 4 | ||||
-rw-r--r-- | lib/inets/src/tftp/tftp_lib.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl index d0510e795b..8d282a1e9d 100644 --- a/lib/inets/src/tftp/tftp_engine.erl +++ b/lib/inets/src/tftp/tftp_engine.erl @@ -1153,8 +1153,8 @@ match_callback(Filename, Callbacks) -> end. do_match_callback(Filename, [C | Tail]) when is_record(C, callback) -> - case catch inets_regexp:match(Filename, C#callback.internal) of - {match, _, _} -> + case catch re:run(Filename, C#callback.internal, [{capture, none}]) of + match -> {ok, C}; nomatch -> do_match_callback(Filename, Tail); diff --git a/lib/inets/src/tftp/tftp_lib.erl b/lib/inets/src/tftp/tftp_lib.erl index 71327f8023..01dea97d07 100644 --- a/lib/inets/src/tftp/tftp_lib.erl +++ b/lib/inets/src/tftp/tftp_lib.erl @@ -184,7 +184,7 @@ do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) -> callback -> case Val of {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) -> - case inets_regexp:parse(RegExp) of + case re:compile(RegExp) of {ok, Internal} -> Callback = #callback{regexp = RegExp, internal = Internal, @@ -253,7 +253,7 @@ do_parse_config(Options, Config) when is_record(Config, config) -> add_default_callbacks(Callbacks) -> RegExp = "", - {ok, Internal} = inets_regexp:parse(RegExp), + {ok, Internal} = re:compile(RegExp), File = #callback{regexp = RegExp, internal = Internal, module = tftp_file, |