diff options
| author | mouring <mouring@cvs.openbsd.org> | 2001-05-06 17:52:09 +0000 |
|---|---|---|
| committer | mouring <mouring@cvs.openbsd.org> | 2001-05-06 17:52:09 +0000 |
| commit | 1d21b5bba56295c44dad8da83fac136a3ab3c50c (patch) | |
| tree | 74dd15ca51386003deb798d1a974a21e115e778b /usr.bin | |
| parent | 5523e987d33d01fc8867b7e73ab4072ef3c23ded (diff) | |
Use const for 'prompt'. Brought over from portable tree.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/cli.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/cli.h | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/readpass.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/readpass.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/ssh/cli.c b/usr.bin/ssh/cli.c index 8f0b2b87e36..7fe705742fa 100644 --- a/usr.bin/ssh/cli.c +++ b/usr.bin/ssh/cli.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $ */ +/* $OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $"); +RCSID("$OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $"); #include "xmalloc.h" #include "log.h" @@ -162,7 +162,7 @@ cli_read(char* buf, int size, int echo) } static int -cli_write(char* buf, int size) +cli_write(const char* buf, int size) { int i, len, pos, ret = 0; char *output, *p; @@ -194,7 +194,7 @@ cli_write(char* buf, int size) * buffer is storing the response. */ char* -cli_read_passphrase(char* prompt, int from_stdin, int echo_enable) +cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable) { char buf[BUFSIZ]; char* p; diff --git a/usr.bin/ssh/cli.h b/usr.bin/ssh/cli.h index 6f57c9b8ad0..59d93549919 100644 --- a/usr.bin/ssh/cli.h +++ b/usr.bin/ssh/cli.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ +/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ +/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */ #ifndef CLI_H #define CLI_H @@ -35,8 +35,8 @@ * of response depending on arg. Tries to ensure that no other userland * buffer is storing the response. */ -char * cli_read_passphrase(char * prompt, int from_stdin, int echo_enable); -char * cli_prompt(char * prompt, int echo_enable); +char* cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable); +char* cli_prompt(char* prompt, int echo_enable); void cli_mesg(char * mesg); #endif /* CLI_H */ diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c index 71085973b95..d059272e74b 100644 --- a/usr.bin/ssh/readpass.c +++ b/usr.bin/ssh/readpass.c @@ -32,7 +32,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readpass.c,v 1.16 2001/05/02 01:25:39 mouring Exp $"); +RCSID("$OpenBSD: readpass.c,v 1.17 2001/05/06 17:52:07 mouring Exp $"); #include "xmalloc.h" #include "cli.h" @@ -96,7 +96,7 @@ ssh_askpass(char *askpass, const char *msg) * compatibility with existing code. */ char * -read_passphrase(char *prompt, int from_stdin) +read_passphrase(const char *prompt, int from_stdin) { char *askpass = NULL; int use_askpass = 0, ttyfd; diff --git a/usr.bin/ssh/readpass.h b/usr.bin/ssh/readpass.h index d8da448a7a7..55ed294da76 100644 --- a/usr.bin/ssh/readpass.h +++ b/usr.bin/ssh/readpass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.h,v 1.2 2001/01/29 01:58:17 niklas Exp $ */ +/* $OpenBSD: readpass.h,v 1.3 2001/05/06 17:52:08 mouring Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -17,4 +17,4 @@ * passphrase (allocated with xmalloc). Exits if EOF is encountered. If * from_stdin is true, the passphrase will be read from stdin instead. */ -char *read_passphrase(char *prompt, int from_stdin); +char *read_passphrase(const char *prompt, int from_stdin); |