2010-06-10 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* libnetworking/rtems/ftpfs.h, libnetworking/lib/ftpfs.c:  Removed
	rtems_ftpfs_mount().

3 files changed, 12 insertions, 41 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9ce8f6621a..6d2efc40f7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-10	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
+	* libnetworking/rtems/ftpfs.h, libnetworking/lib/ftpfs.c:  Removed
+	rtems_ftpfs_mount().
+
+2010-06-10	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
 	* libcsupport/src/mount-mktgt.c: New file.
 	* libcsupport/Makefile.am: Reflect change above.
 	* libcsupport/include/rtems/libio.h: Declare
diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c
index 659a5e3e43..c9d6363863 100644
--- a/cpukit/libnetworking/lib/ftpfs.c
+++ b/cpukit/libnetworking/lib/ftpfs.c
@@ -132,33 +132,6 @@ static int rtems_ftpfs_set_connection_timeout(
   return 0;
 }
 
-rtems_status_code rtems_ftpfs_mount(const char *mount_point)
-{
-  int rv = 0;
-
-  if (mount_point == NULL) {
-    mount_point = RTEMS_FTPFS_MOUNT_POINT_DEFAULT;
-  }
-
-  rv = rtems_mkdir(mount_point, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (rv != 0) {
-    return RTEMS_IO_ERROR;
-  }
-
-  rv = mount(
-    NULL,
-    mount_point,
-    RTEMS_FILESYSTEM_TYPE_FTPFS,
-    RTEMS_FILESYSTEM_READ_WRITE,
-    NULL
-  );
-  if (rv != 0) {
-    return RTEMS_IO_ERROR;
-  }
-
-  return RTEMS_SUCCESSFUL;
-}
-
 static rtems_status_code rtems_ftpfs_do_ioctl(
   const char *mount_point,
   ioctl_command_t req,
diff --git a/cpukit/libnetworking/rtems/ftpfs.h b/cpukit/libnetworking/rtems/ftpfs.h
index 8d11696ecf..0bb500229d 100644
--- a/cpukit/libnetworking/rtems/ftpfs.h
+++ b/cpukit/libnetworking/rtems/ftpfs.h
@@ -49,8 +49,12 @@ extern "C" {
  * @brief The FTP file system (FTP client) can be used to transfer files from
  * or to remote hosts.
  *
- * You can mount the FTP file system with a call to rtems_ftpfs_mount().
- * Alternatively you can use mount() directly.
+ * You can mount the FTP file system with a call to mount() or
+ * mount_and_make_target_path() with the @ref RTEMS_FILESYSTEM_TYPE_FTPFS file
+ * system type.
+ *
+ * You have to add @ref CONFIGURE_FILESYSTEM_FTPFS to your application
+ * configuration.
  *
  * You can open files either read-only or write-only.  A seek is not allowed.
  * A close terminates the control and data connections.
@@ -93,17 +97,6 @@ typedef enum {
 } rtems_ftpfs_ioctl_numbers;
 
 /**
- * @brief Creates the mount point @a mount_point and mounts the FTP file
- * system.
- * 	 
- * If @a mount_point is @c NULL the default mount point 	 
- * @ref RTEMS_FTPFS_MOUNT_POINT_DEFAULT will be used. 	 
- * 	 
- * It is mounted with read and write access. 	 
- */ 	 
-rtems_status_code rtems_ftpfs_mount( const char *mount_point);
-
-/**
  * @brief Returns in @a verbose if the verbose mode is enabled or disabled for
  * the file system at @a mount_point.
  *
@@ -155,7 +148,7 @@ rtems_status_code rtems_ftpfs_set_timeout(
 /** @} */
 
 /**
- * Do not call directly, use rtems_ftpfs_mount() or mount().
+ * @brief Do not call directly, use mount().
  */
 int rtems_ftpfs_initialize(
   rtems_filesystem_mount_table_entry_t *mt_entry,