diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-19 23:21:34 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-19 23:21:34 +0100 |
| commit | 034957f33eba181214877d62b534270ba41402fe (patch) | |
| tree | 6e7985104eaa21b3808c6d9135e9deddf8dd2a5a | |
| parent | c51e194871494407b03901726ae259b20699d9b4 (diff) | |
| download | rabbitmq-server-bug22677.tar.gz | |
applied qa notes; refactoringbug22677
| -rw-r--r-- | src/rabbit_access_control.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_dialyzer.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_exchange_type_topic.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 6 |
5 files changed, 11 insertions, 17 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 24960200..2a84b89b 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -174,9 +174,10 @@ check_resource_access(Username, [#user_permission{permission = P}] -> case re:run( Name, - element(permission_index(Permission), P)) of - {match, _} -> true; - nomatch -> false + element(permission_index(Permission), P), + [{capture, none}]) of + match -> true; + nomatch -> false end end, if Res -> ok; diff --git a/src/rabbit_dialyzer.erl b/src/rabbit_dialyzer.erl index 96658d53..51bd6b1f 100644 --- a/src/rabbit_dialyzer.erl +++ b/src/rabbit_dialyzer.erl @@ -55,14 +55,8 @@ create_basic_plt(BasicPltPath) -> dialyzer_cl:start(OptsRecord), ok. -splitIntoFilenames(FilesString) -> - lists:dropwhile(fun([]) -> true; - (_) -> false - end, - re:split(FilesString, " ", [{return, list}, trim])). - add_to_plt(PltPath, FilesString) -> - Files = splitIntoFilenames(FilesString), + Files = string:tokens(FilesString, " "), DialyzerWarnings = dialyzer:run([{analysis_type, plt_add}, {init_plt, PltPath}, {output_plt, PltPath}, @@ -71,7 +65,7 @@ add_to_plt(PltPath, FilesString) -> ok. dialyze_files(PltPath, ModifiedFiles) -> - Files = splitIntoFilenames(ModifiedFiles), + Files = string:tokens(ModifiedFiles, " "), DialyzerWarnings = dialyzer:run([{init_plt, PltPath}, {files, Files}]), case DialyzerWarnings of diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl index 53f36cde..89b2441e 100644 --- a/src/rabbit_exchange_type_topic.erl +++ b/src/rabbit_exchange_type_topic.erl @@ -67,8 +67,7 @@ publish(#exchange{name = Name}, Delivery = Delivery). split_topic_key(Key) -> - KeySplit = re:split(Key, "\\.", [{return, list}]), - KeySplit. + re:split(Key, "\\.", [{return, list}]). topic_matches(PatternKey, RoutingKey) -> P = split_topic_key(PatternKey), diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index f04df8a0..28e45807 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -581,7 +581,7 @@ string_to_pid(Str) -> binary_to_term(<<131,103,NodeEnc/binary,Id:32,Ser:32,0:8>>); nomatch -> throw(Err) - end. + end. version_compare(A, B, lte) -> case version_compare(A, B) of diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 5fda588b..3facef17 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -309,9 +309,9 @@ is_dead(Pid) -> {win32, fun () -> Res = os:cmd("tasklist /nh /fi \"pid eq " ++ PidS ++ "\""), - case re:run(Res, "erl\\.exe") of - {match, _} -> false; - _ -> true + case re:run(Res, "erl\\.exe", [{capture, none}]) of + match -> false; + _ -> true end end}]). |