Merge bug26082

6 files changed, 13 insertions, 16 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_exchange.erl b/src/rabbit_exchange.erl
index ad558586..4d4a2a58 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -81,9 +81,8 @@
 -spec(route/2 :: (rabbit_types:exchange(), rabbit_types:delivery())
                  -> [rabbit_amqqueue:name()]).
 -spec(delete/2 ::
-        (name(), boolean())-> 'ok' |
-                              rabbit_types:error('not_found') |
-                              rabbit_types:error('in_use')).
+        (name(),  'true') -> 'ok' | rabbit_types:error('not_found' | 'in_use');
+        (name(), 'false') -> 'ok' | rabbit_types:error('not_found')).
 -spec(validate_binding/2 ::
         (rabbit_types:exchange(), rabbit_types:binding())
         -> rabbit_types:ok_or_error({'binding_invalid', string(), [any()]})).
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) ->
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 5e2ef1e8..4cc9cd12 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -107,6 +107,10 @@ dist_port_use_check(NodeHost) ->
                    end
     end.
 
+-ifdef(use_specs).
+-spec(dist_port_use_check_fail/2 :: (non_neg_integer(), string()) ->
+                                         no_return()).
+-endif.
 dist_port_use_check_fail(Port, Host) ->
     {ok, Names} = rabbit_nodes:names(Host),
     case [N || {N, P} <- Names, P =:= Port] of
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 3d0baac2..56c19d3f 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -654,20 +654,14 @@ get_journal_handle(State = #qistate { journal_handle = Hdl }) ->
 %% Loading Journal. This isn't idempotent and will mess up the counts
 %% if you call it more than once on the same state. Assumes the counts
 %% are 0 to start with.
-load_journal(State) ->
-    case is_journal_present(State) of
+load_journal(State = #qistate { dir = Dir }) ->
+    case rabbit_file:is_file(filename:join(Dir, ?JOURNAL_FILENAME)) of
         true  -> {JournalHdl, State1} = get_journal_handle(State),
                  {ok, 0} = file_handle_cache:position(JournalHdl, 0),
                  load_journal_entries(State1);
         false -> State
     end.
 
-is_journal_present(#qistate { journal_handle = undefined,
-                              dir            = Dir }) ->
-    rabbit_file:is_file(filename:join(Dir, ?JOURNAL_FILENAME));
-is_journal_present(_) ->
-    true.
-
 %% ditto
 recover_journal(State) ->
     State1 = #qistate { segments = Segments } = load_journal(State),
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 89cfc312..53394155 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -1051,6 +1051,9 @@ auth_phase(Response,
                                                         auth_state = none}}
     end.
 
+-ifdef(use_specs).
+-spec(auth_fail/4 :: (string(), [any()], binary(), #v1{}) -> no_return()).
+-endif.
 auth_fail(Msg, Args, AuthName,
           State = #v1{connection = #connection{protocol     = Protocol,
                                                capabilities = Capabilities}}) ->