diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-27 15:50:39 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-27 15:50:39 +0000 |
| commit | 8abc5465a93aff05337d24f18e920373371d1b54 (patch) | |
| tree | 0c5d83c4822566c1802d9e7b66a49879540b7676 | |
| parent | 5ef6c3c22b9507928cd48a9c1df109c35451dc08 (diff) | |
| download | rabbitmq-server-8abc5465a93aff05337d24f18e920373371d1b54.tar.gz | |
Remove pointless branches found by dialyzer.
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_plugins.erl | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index 4a2337b9..ab443780 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -186,9 +186,7 @@ get_disk_free(Dir, {unix, Sun}) get_disk_free(Dir, {unix, _}) -> parse_free_unix(rabbit_misc:os_cmd("/bin/df -kP " ++ Dir)); get_disk_free(Dir, {win32, _}) -> - parse_free_win32(rabbit_misc:os_cmd("dir /-C /W \"" ++ Dir ++ "\"")); -get_disk_free(_, Platform) -> - {unknown, Platform}. + parse_free_win32(rabbit_misc:os_cmd("dir /-C /W \"" ++ Dir ++ "\"")). parse_free_unix(CommandResult) -> [_, Stats | _] = string:tokens(CommandResult, "\n"), diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 4ac6c4a0..c0fb05e2 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -143,8 +143,7 @@ prepare_dir_plugin(PluginAppDescPath) -> delete_recursively(Fn) -> case rabbit_file:recursive_delete([Fn]) of ok -> ok; - {error, {Path, E}} -> {error, {cannot_delete, Path, E}}; - Error -> Error + {error, {Path, E}} -> {error, {cannot_delete, Path, E}} end. prepare_plugin(#plugin{type = ez, location = Location}, ExpandDir) -> |