summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-04-14 23:09:43 +0100
committerMatthias Radestock <matthias@lshift.net>2009-04-14 23:09:43 +0100
commit3e5d61ddc3ee1bf2173a603142543045489da81b (patch)
tree0fa18bc22ef7eb501b54d7be5430983c2e6382cf
parent3f4040d9937088b93ae8050923ec53e1f028829a (diff)
downloadrabbitmq-server-bug20597.tar.gz
keep dialyzer happybug20597
- the spec for rabbit_misc:format_stderr/2 was wrong, - for rabbit_{control,multi}:start/0 we need to add a spec so we can specify the no_return() caused by the calls to halt()
-rw-r--r--src/rabbit_control.erl13
-rw-r--r--src/rabbit_misc.erl2
-rw-r--r--src/rabbit_multi.erl11
3 files changed, 25 insertions, 1 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index cbc11b40..352d7e75 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -38,6 +38,19 @@
-define(RPC_TIMEOUT, 30000).
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start/0 :: () -> no_return()).
+-spec(stop/0 :: () -> 'ok').
+-spec(action/4 :: (atom(), erlang_node(), [string()],
+ fun ((string(), [any()]) -> 'ok')) -> 'ok').
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
start() ->
FullCommand = init:get_plain_arguments(),
#params{quiet = Quiet, node = Node, command = Command, args = Args} =
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index b15ad68e..1fcd9a61 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -105,7 +105,7 @@
-spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}).
-spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}).
-spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok').
--spec(format_stderr/2 :: (string(), [any()]) -> 'true').
+-spec(format_stderr/2 :: (string(), [any()]) -> 'ok').
-endif.
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index 5e8edd53..d9197535 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -36,6 +36,17 @@
-define(RPC_SLEEP, 500).
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start/0 :: () -> no_return()).
+-spec(stop/0 :: () -> 'ok').
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
start() ->
RpcTimeout =
case init:get_argument(maxwait) of