[myserver-commit] [SCM] GNU MyServer branch, master, updated. 733464f43301f5b9c1082b59fa8c344ae50f93f1

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  733464f43301f5b9c1082b59fa8c344ae50f93f1 (commit)
      from  ae82dd0f2f97b295fce9e33f3b17a79fc0d5f7ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 733464f43301f5b9c1082b59fa8c344ae50f93f1
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Nov 1 03:46:41 2009 +0100

    Fix a conflict with gnulib renaming the Ftp::stat function name to 
Ftp::statCmd.

diff --git a/myserver/include/protocol/ftp/ftp.h 
b/myserver/include/protocol/ftp/ftp.h
index 581191b..2f7680c 100644
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -32,8 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
 02110-1301  USA
 # include <include/conf/security/security_token.h>
 class Ftp;
 
-#undef stat
-
 class FtpuserData:public ProtocolBuffer
 {
 public:
@@ -158,7 +156,7 @@ public:
   void pwd ();
   void rest (const std::string & srestPoint);
   void syst ();
-  void stat (const std::string & sParam = "");
+  void statCmd (const std::string & sParam = "");
   void allo (int nSize, int nRecordSize = -1);
 
   void stor (const std::string & sPath);
diff --git a/myserver/src/protocol/ftp/ftp.cpp 
b/myserver/src/protocol/ftp/ftp.cpp
index 597edfc..787f295 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -2184,7 +2184,7 @@ void Ftp::syst ()
   ftpReply (215, sTempText);
 }
 
-void Ftp::stat (const std::string & sParam /* = "" */ )
+void Ftp::statCmd (const std::string & sParam /* = "" */ )
 {
   if (!userLoggedIn ())
     return;
diff --git a/myserver/src/protocol/ftp/ftp_parser.cpp 
b/myserver/src/protocol/ftp/ftp_parser.cpp
index deea0ab..bedac40 100644
--- a/myserver/src/protocol/ftp/ftp_parser.cpp
+++ b/myserver/src/protocol/ftp/ftp_parser.cpp
@@ -1839,7 +1839,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 198 "ftp_parser.ypp"
     {
-                       pContext->stat();
+                       pContext->statCmd();
                }
     break;
 
diff --git a/myserver/src/protocol/ftp/ftp_parser.ypp 
b/myserver/src/protocol/ftp/ftp_parser.ypp
index 589a4d3..3b9c3fd 100755
--- a/myserver/src/protocol/ftp/ftp_parser.ypp
+++ b/myserver/src/protocol/ftp/ftp_parser.ypp
@@ -196,7 +196,7 @@ cmd         : USER_FTP_COMMAND SPACE_FTP_SEP STRING_FTP_ARG 
CRLF_FTP_SEP
                }
                | STAT_FTP_COMMAND CRLF_FTP_SEP
                {
-                       pContext->stat();
+                       pContext->statCmd();
                }
                | QUIT_FTP_COMMAND CRLF_FTP_SEP
                {

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/protocol/ftp/ftp.h      |    4 +---
 myserver/src/protocol/ftp/ftp.cpp        |    2 +-
 myserver/src/protocol/ftp/ftp_parser.cpp |    2 +-
 myserver/src/protocol/ftp/ftp_parser.ypp |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU MyServer