upstream commit

update sftp client and server to new buffer API. pretty
 much just mechanical changes; with & ok markus

1 files changed, 4 insertions, 3 deletions

diff --git a/sftp-common.h b/sftp-common.h
index 9ed86c070..2e778a9ca 100644
--- a/sftp-common.h
+++ b/sftp-common.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.h,v 1.11 2010/01/13 01:40:16 djm Exp $ */
+/* $OpenBSD: sftp-common.h,v 1.12 2015/01/14 13:54:13 djm Exp $ */
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -28,6 +28,7 @@
 /* Maximum packet that we are willing to send/accept */
 #define SFTP_MAX_MSG_LENGTH     (256 * 1024)
 
+struct sshbuf;
 typedef struct Attrib Attrib;
 
 /* File attributes */
@@ -44,8 +45,8 @@ struct Attrib {
 void     attrib_clear(Attrib *);
 void     stat_to_attrib(const struct stat *, Attrib *);
 void     attrib_to_stat(const Attrib *, struct stat *);
-Attrib  *decode_attrib(Buffer *);
-void     encode_attrib(Buffer *, const Attrib *);
+int      decode_attrib(struct sshbuf *, Attrib *);
+int      encode_attrib(struct sshbuf *, const Attrib *);
 char    *ls_file(const char *, const struct stat *, int, int);
 
 const char *fx2txt(int);