diff options
author | Damien Miller <djm@mindrot.org> | 2008-02-10 22:20:44 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-02-10 22:20:44 +1100 |
commit | cfe23d34e441114c59db43e672e57f9840475e32 (patch) | |
tree | 3dc29497429930f7571ebe5248336bc766440d91 | |
parent | 49d2a2826aec4c0aba41ea76b1bb7fa446d6fd55 (diff) |
- chl@cvs.openbsd.org 2008/01/11 07:22:28
[sftp-client.c sftp-client.h]
disable unused functions
initially from tobias@, but disabled them by placing them in
"#ifdef notyet" which was asked by djm@
ok djm@ tobias@
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | sftp-client.c | 6 | ||||
-rw-r--r-- | sftp-client.h | 8 |
3 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20080210 | ||
2 | - OpenBSD CVS Sync | ||
3 | - chl@cvs.openbsd.org 2008/01/11 07:22:28 | ||
4 | [sftp-client.c sftp-client.h] | ||
5 | disable unused functions | ||
6 | initially from tobias@, but disabled them by placing them in | ||
7 | "#ifdef notyet" which was asked by djm@ | ||
8 | ok djm@ tobias@ | ||
9 | |||
1 | 20080119 | 10 | 20080119 |
2 | - (djm) Silence noice from expr in ssh-copy-id; patch from | 11 | - (djm) Silence noice from expr in ssh-copy-id; patch from |
3 | mikel AT mikelward.com | 12 | mikel AT mikelward.com |
@@ -3525,4 +3534,4 @@ | |||
3525 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3534 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3526 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3535 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3527 | 3536 | ||
3528 | $Id: ChangeLog,v 1.4819 2008/01/19 21:56:00 djm Exp $ | 3537 | $Id: ChangeLog,v 1.4820 2008/02/10 11:20:44 djm Exp $ |
diff --git a/sftp-client.c b/sftp-client.c index c12d1d38e..7df46379c 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.77 2007/09/16 00:55:52 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.78 2008/01/11 07:22:27 chl Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -534,6 +534,7 @@ do_lstat(struct sftp_conn *conn, char *path, int quiet) | |||
534 | return(get_decode_stat(conn->fd_in, id, quiet)); | 534 | return(get_decode_stat(conn->fd_in, id, quiet)); |
535 | } | 535 | } |
536 | 536 | ||
537 | #ifdef notyet | ||
537 | Attrib * | 538 | Attrib * |
538 | do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet) | 539 | do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet) |
539 | { | 540 | { |
@@ -545,6 +546,7 @@ do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet) | |||
545 | 546 | ||
546 | return(get_decode_stat(conn->fd_in, id, quiet)); | 547 | return(get_decode_stat(conn->fd_in, id, quiet)); |
547 | } | 548 | } |
549 | #endif | ||
548 | 550 | ||
549 | int | 551 | int |
550 | do_setstat(struct sftp_conn *conn, char *path, Attrib *a) | 552 | do_setstat(struct sftp_conn *conn, char *path, Attrib *a) |
@@ -686,6 +688,7 @@ do_symlink(struct sftp_conn *conn, char *oldpath, char *newpath) | |||
686 | return(status); | 688 | return(status); |
687 | } | 689 | } |
688 | 690 | ||
691 | #ifdef notyet | ||
689 | char * | 692 | char * |
690 | do_readlink(struct sftp_conn *conn, char *path) | 693 | do_readlink(struct sftp_conn *conn, char *path) |
691 | { | 694 | { |
@@ -732,6 +735,7 @@ do_readlink(struct sftp_conn *conn, char *path) | |||
732 | 735 | ||
733 | return(filename); | 736 | return(filename); |
734 | } | 737 | } |
738 | #endif | ||
735 | 739 | ||
736 | static void | 740 | static void |
737 | send_read_request(int fd_out, u_int id, u_int64_t offset, u_int len, | 741 | send_read_request(int fd_out, u_int id, u_int64_t offset, u_int len, |
diff --git a/sftp-client.h b/sftp-client.h index c8a41f377..fd0630e9a 100644 --- a/sftp-client.h +++ b/sftp-client.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.h,v 1.14 2005/04/26 12:59:02 jmc Exp $ */ | 1 | /* $OpenBSD: sftp-client.h,v 1.15 2008/01/11 07:22:28 chl Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 4 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
@@ -61,9 +61,6 @@ Attrib *do_stat(struct sftp_conn *, char *, int); | |||
61 | /* Get file attributes of 'path' (does not follow symlinks) */ | 61 | /* Get file attributes of 'path' (does not follow symlinks) */ |
62 | Attrib *do_lstat(struct sftp_conn *, char *, int); | 62 | Attrib *do_lstat(struct sftp_conn *, char *, int); |
63 | 63 | ||
64 | /* Get file attributes of open file 'handle' */ | ||
65 | Attrib *do_fstat(struct sftp_conn *, char *, u_int, int); | ||
66 | |||
67 | /* Set file attributes of 'path' */ | 64 | /* Set file attributes of 'path' */ |
68 | int do_setstat(struct sftp_conn *, char *, Attrib *); | 65 | int do_setstat(struct sftp_conn *, char *, Attrib *); |
69 | 66 | ||
@@ -79,9 +76,6 @@ int do_rename(struct sftp_conn *, char *, char *); | |||
79 | /* Rename 'oldpath' to 'newpath' */ | 76 | /* Rename 'oldpath' to 'newpath' */ |
80 | int do_symlink(struct sftp_conn *, char *, char *); | 77 | int do_symlink(struct sftp_conn *, char *, char *); |
81 | 78 | ||
82 | /* Return target of symlink 'path' - caller must free result */ | ||
83 | char *do_readlink(struct sftp_conn *, char *); | ||
84 | |||
85 | /* XXX: add callbacks to do_download/do_upload so we can do progress meter */ | 79 | /* XXX: add callbacks to do_download/do_upload so we can do progress meter */ |
86 | 80 | ||
87 | /* | 81 | /* |