Re: lftp-pre3.0.0-20040116

[Alexander V. Lukyanov]

On Sat, Jan 17, 2004 at 02:04:34PM +0100, Piotr Krukowiecki wrote:
> On Fri, 16 Jan 2004, Alexander V. Lukyanov wrote:
>
> > * it should compile on linux now.
>
> On old linux too?
> Using egcs-2.91.66. Can send you config.log or whatever you want.

Apply this patch.

> SFtp.h:70: `static bool SFtp::is_valid_reply(int)' is private
> SFtp.cc:448: within this context

--
   Alexander.

Index: SFtp.h
===================================================================
RCS file: /home/lav/cvsroot/lftp/src/SFtp.h,v
retrieving revision 1.8
diff -u -p -r1.8 SFtp.h
--- SFtp.h      8 Dec 2003 10:22:06 -0000       1.8
+++ SFtp.h      18 Jan 2004 13:49:04 -0000
@@ -66,12 +66,6 @@ enum packet_type {
    SSH_FXP_EXTENDED =200,
    SSH_FXP_EXTENDED_REPLY=201
 };
-static bool is_valid_reply(int p)
-{
-   return p==SSH_FXP_VERSION
-      || p>=101 && p<=105
-      || p==SSH_FXP_EXTENDED_REPLY;
-}
 
 #define SSH_FILEXFER_ATTR_SIZE         0x00000001
 #define SSH_FILEXFER_ATTR_UIDGID       0x00000002  // used in protocol v3
@@ -117,10 +111,6 @@ enum sftp_status_t {
    SSH_FX_WRITE_PROTECT      =12,
    SSH_FX_NO_MEDIA           =13
 };
-static bool is_valid_status(int s)
-{
-   return s>=SSH_FX_OK && s<=SSH_FX_OP_UNSUPPORTED;
-}
 
    enum state_t
    {
@@ -181,6 +171,12 @@ static bool is_valid_status(int s)
    };
    class Packet
    {
+      static bool is_valid_reply(int p)
+      {
+        return p==SSH_FXP_VERSION
+           || p>=101 && p<=105
+           || p==SSH_FXP_EXTENDED_REPLY;
+      }
    protected:
       int length;
       int unpacked;