aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-11-27 08:28:13 +0100
committerIngela Anderton Andin <[email protected]>2013-11-27 08:28:13 +0100
commitc3c686b6d38cd8e6344fea1ae62492932e5272e9 (patch)
tree5dd94d7bb3ef1dfba574a215f0d5e69f5698a6b5
parentfb8b76bff0a43ae5bf3982a9b70e2bcfbc8ceedb (diff)
parent7211a984fc82b6c1dd8f710af15674ee7112ff53 (diff)
downloadotp-c3c686b6d38cd8e6344fea1ae62492932e5272e9.tar.gz
otp-c3c686b6d38cd8e6344fea1ae62492932e5272e9.tar.bz2
otp-c3c686b6d38cd8e6344fea1ae62492932e5272e9.zip
Merge branch 'maint'
-rw-r--r--lib/ssh/src/ssh_io.erl5
-rw-r--r--lib/ssh/src/ssh_no_io.erl10
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index 01fc713569..832b144db9 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -24,7 +24,6 @@
-module(ssh_io).
-export([yes_no/2, read_password/2, read_line/2, format/2]).
--import(lists, [reverse/1]).
-include("ssh.hrl").
read_line(Prompt, Ssh) ->
@@ -81,7 +80,7 @@ format(Fmt, Args) ->
trim(Line) when is_list(Line) ->
- reverse(trim1(reverse(trim1(Line))));
+ lists:reverse(trim1(lists:reverse(trim1(Line))));
trim(Other) -> Other.
trim1([$\s|Cs]) -> trim(Cs);
diff --git a/lib/ssh/src/ssh_no_io.erl b/lib/ssh/src/ssh_no_io.erl
index 9f83506cdd..825a0d4af5 100644
--- a/lib/ssh/src/ssh_no_io.erl
+++ b/lib/ssh/src/ssh_no_io.erl
@@ -24,27 +24,27 @@
-module(ssh_no_io).
-include("ssh_transport.hrl").
--export([yes_no/1, read_password/1, read_line/1, format/2]).
+-export([yes_no/2, read_password/2, read_line/2, format/2]).
-yes_no(_Prompt) ->
+yes_no(_, _) ->
throw({{no_io_allowed, yes_no},
#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
description = "User interaction is not allowed",
language = "en"}}).
-read_password(_Prompt) ->
+read_password(_, _) ->
throw({{no_io_allowed, read_password},
#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
description = "User interaction is not allowed",
language = "en"}}).
-read_line(_Prompt) ->
+read_line(_, _) ->
throw({{no_io_allowed, read_line},
#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
description = "User interaction is not allowed",
language = "en"}} ).
-format(_Fmt, _Args) ->
+format(_, _) ->
throw({{no_io_allowed, format},
#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
description = "User interaction is not allowed",