From 5b4023aaecd0d2676dff5c267ae322fc0f6c02e3 Mon Sep 17 00:00:00 2001
From: Kelly McLaughlin <kelly@basho.com>
Date: Mon, 28 Jul 2014 12:05:03 -0600
Subject: [PATCH] Revert "Merge branch 'feature/nodetool-zero-arg-rpc' into
 develop"

This reverts commit 93db72ef65d714e5e8d849fff558be3940992f2a, reversing
changes made to a56fe9b021e3543a24fdfc98f1c16704b41e62c6.
---
 priv/base/nodetool | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/priv/base/nodetool b/priv/base/nodetool
index df964e1..23503d7 100755
--- a/priv/base/nodetool
+++ b/priv/base/nodetool
@@ -63,17 +63,6 @@ main(Args) ->
             io:format("~p\n", [rpc:call(TargetNode, init, restart, [], RpcTimeout)]);
         ["reboot"] ->
             io:format("~p\n", [rpc:call(TargetNode, init, reboot, [], RpcTimeout)]);
-        ["rpc", Module, Function] ->
-            case rpc:call(TargetNode, list_to_atom(Module), list_to_atom(Function),
-                          [], RpcTimeout) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format(standard_error, "RPC to ~p failed: ~p\n", [TargetNode, Reason]),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
         ["rpc", Module, Function | RpcArgs] ->
             case rpc:call(TargetNode, list_to_atom(Module), list_to_atom(Function),
                           [RpcArgs], RpcTimeout) of
@@ -85,16 +74,6 @@ main(Args) ->
                 _ ->
                     halt(1)
             end;
-        ["rpc_infinity", Module, Function] ->
-            case rpc:call(TargetNode, list_to_atom(Module), list_to_atom(Function), [], infinity) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format(standard_error, "RPC to ~p failed: ~p\n", [TargetNode, Reason]),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
         ["rpc_infinity", Module, Function | RpcArgs] ->
             case rpc:call(TargetNode, list_to_atom(Module), list_to_atom(Function), [RpcArgs], infinity) of
                 ok ->
@@ -188,13 +167,13 @@ chkconfig(File) ->
             io:format("ok\n"),
             halt(0);
         {error, {Line, Mod, Term}} ->
-            io:format(standard_error,
-                      ["Error on line ",
+            io:format(standard_error, 
+                      ["Error on line ", 
                        file:format_error({Line, Mod, Term}), "\n"], []),
             halt(1);
         {error, R} ->
             io:format(standard_error,
-                      ["Error reading config file: ",
+                      ["Error reading config file: ", 
                        file:format_error(R), "\n"], []),
             halt(1)
     end.