From cfe23d34e441114c59db43e672e57f9840475e32 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 10 Feb 2008 22:20:44 +1100 Subject: [PATCH] - 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@ --- ChangeLog | 11 ++++++++++- sftp-client.c | 6 +++++- sftp-client.h | 8 +------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cea5164e6..03db03ddd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +20080210 + - OpenBSD CVS Sync + - 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@ + 20080119 - (djm) Silence noice from expr in ssh-copy-id; patch from mikel AT mikelward.com @@ -3525,4 +3534,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4819 2008/01/19 21:56:00 djm Exp $ +$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 @@ -/* $OpenBSD: sftp-client.c,v 1.77 2007/09/16 00:55:52 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.78 2008/01/11 07:22:27 chl Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -534,6 +534,7 @@ do_lstat(struct sftp_conn *conn, char *path, int quiet) return(get_decode_stat(conn->fd_in, id, quiet)); } +#ifdef notyet Attrib * do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet) { @@ -545,6 +546,7 @@ do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet) return(get_decode_stat(conn->fd_in, id, quiet)); } +#endif int do_setstat(struct sftp_conn *conn, char *path, Attrib *a) @@ -686,6 +688,7 @@ do_symlink(struct sftp_conn *conn, char *oldpath, char *newpath) return(status); } +#ifdef notyet char * do_readlink(struct sftp_conn *conn, char *path) { @@ -732,6 +735,7 @@ do_readlink(struct sftp_conn *conn, char *path) return(filename); } +#endif static void 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 @@ -/* $OpenBSD: sftp-client.h,v 1.14 2005/04/26 12:59:02 jmc Exp $ */ +/* $OpenBSD: sftp-client.h,v 1.15 2008/01/11 07:22:28 chl Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller @@ -61,9 +61,6 @@ Attrib *do_stat(struct sftp_conn *, char *, int); /* Get file attributes of 'path' (does not follow symlinks) */ Attrib *do_lstat(struct sftp_conn *, char *, int); -/* Get file attributes of open file 'handle' */ -Attrib *do_fstat(struct sftp_conn *, char *, u_int, int); - /* Set file attributes of 'path' */ int do_setstat(struct sftp_conn *, char *, Attrib *); @@ -79,9 +76,6 @@ int do_rename(struct sftp_conn *, char *, char *); /* Rename 'oldpath' to 'newpath' */ int do_symlink(struct sftp_conn *, char *, char *); -/* Return target of symlink 'path' - caller must free result */ -char *do_readlink(struct sftp_conn *, char *); - /* XXX: add callbacks to do_download/do_upload so we can do progress meter */ /*