summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-03-27 15:50:39 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-03-27 15:50:39 +0000
commit88d9ce922535a77ac07e6e83f03b4ef2686bca23 (patch)
tree0c5d83c4822566c1802d9e7b66a49879540b7676 /src
parent6acf7eb8f62368dd6ec248a3834925cc9d1c3ffa (diff)
downloadrabbitmq-server-git-88d9ce922535a77ac07e6e83f03b4ef2686bca23.tar.gz
Remove pointless branches found by dialyzer.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_monitor.erl4
-rw-r--r--src/rabbit_plugins.erl3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl
index 4a2337b943..ab4437802d 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 4ac6c4a01c..c0fb05e247 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) ->