From 00bd5c9a2243952bebd21064eab563debd182422 Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Fri, 26 Oct 2012 17:10:21 +0200 Subject: [PATCH] Renamed sfFtpListingDirectory_getFilename() to getName() --- include/SFML/Network/Ftp.h | 12 ++++++------ src/SFML/Network/Ftp.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/SFML/Network/Ftp.h b/include/SFML/Network/Ftp.h index 6133b30..0db9bb6 100644 --- a/include/SFML/Network/Ftp.h +++ b/include/SFML/Network/Ftp.h @@ -155,25 +155,25 @@ CSFML_NETWORK_API sfFtpStatus sfFtpListingResponse_getStatus(const sfFtpListingR CSFML_NETWORK_API const char* sfFtpListingResponse_getMessage(const sfFtpListingResponse* ftpListingResponse); //////////////////////////////////////////////////////////// -/// \brief Return the number of filenames contained in a FTP listing response +/// \brief Return the number of directory/file names contained in a FTP listing response /// /// \param ftpListingResponse Ftp listing response /// -/// \return Total number of filenames available +/// \return Total number of names available /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API size_t sfFtpListingResponse_getCount(const sfFtpListingResponse* ftpListingResponse); //////////////////////////////////////////////////////////// -/// \brief Return a filename contained in a FTP listing response +/// \brief Return a directory/file name contained in a FTP listing response /// /// \param ftpListingResponse Ftp listing response -/// \param index Index of the filename to get (in range [0 .. GetCount]) +/// \param index Index of the name to get (in range [0 .. getCount]) /// -/// \return Array containing the requested filenames +/// \return The requested name /// //////////////////////////////////////////////////////////// -CSFML_NETWORK_API const char* sfFtpListingResponse_getFilename(const sfFtpListingResponse* ftpListingResponse, size_t index); +CSFML_NETWORK_API const char* sfFtpListingResponse_getName(const sfFtpListingResponse* ftpListingResponse, size_t index); //////////////////////////////////////////////////////////// /// \brief Destroy a FTP directory response diff --git a/src/SFML/Network/Ftp.cpp b/src/SFML/Network/Ftp.cpp index daedc3d..16ed02e 100644 --- a/src/SFML/Network/Ftp.cpp +++ b/src/SFML/Network/Ftp.cpp @@ -68,16 +68,16 @@ size_t sfFtpListingResponse_getCount(const sfFtpListingResponse* ftpListingRespo { CSFML_CHECK_RETURN(ftpListingResponse, 0); - return ftpListingResponse->This.getFilenames().size(); + return ftpListingResponse->This.getListing().size(); } //////////////////////////////////////////////////////////// -const char* sfFtpListingResponse_getFilename(const sfFtpListingResponse* ftpListingResponse, size_t index) +const char* sfFtpListingResponse_getName(const sfFtpListingResponse* ftpListingResponse, size_t index) { CSFML_CHECK_RETURN(ftpListingResponse, NULL); - return ftpListingResponse->This.getFilenames()[index].c_str(); + return ftpListingResponse->This.getListing()[index].c_str(); }