2009-06-12 Chris Johns <chrisj@rtems.org>

        * libblock/include/rtems/flashdisk.h,
        libblock/include/rtems/nvdisk.h, libblock/src/flashdisk.c,
        libblock/src/nvdisk.c: Change names to match the RAM disk change.
        * libcsupport/src/eval.c: Remove some warnings.

6 files changed, 18 insertions, 15 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9844271305..f821067e01 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-12	Chris Johns <chrisj@rtems.org>
 
+	* libblock/include/rtems/flashdisk.h,
+	libblock/include/rtems/nvdisk.h, libblock/src/flashdisk.c,
+	libblock/src/nvdisk.c: Change names to match the RAM disk change. 
+	* libcsupport/src/eval.c: Remove some warnings.
+	
+2009-06-12	Chris Johns <chrisj@rtems.org>
+
 	* libblock/src/bdbuf.c: Update comments.
 	* libblock/src/bdpart.c, libblock/src/ide_part_table.c: Get the
 	device from the rdev field of the stat buf.
diff --git a/cpukit/libblock/include/rtems/flashdisk.h b/cpukit/libblock/include/rtems/flashdisk.h
index 997dd1805c..4240060596 100644
--- a/cpukit/libblock/include/rtems/flashdisk.h
+++ b/cpukit/libblock/include/rtems/flashdisk.h
@@ -21,7 +21,7 @@
 /**
  * The base name of the flash disks.
  */
-#define RTEMS_FLASHDISK_DEVICE_BASE_NAME "/dev/flashdisk"
+#define RTEMS_FLASHDISK_DEVICE_BASE_NAME "/dev/fdd"
 
 /**
  * Flash disk specific ioctl request types. To use open the
diff --git a/cpukit/libblock/include/rtems/nvdisk.h b/cpukit/libblock/include/rtems/nvdisk.h
index 24b62f665e..68ef1fd9d8 100644
--- a/cpukit/libblock/include/rtems/nvdisk.h
+++ b/cpukit/libblock/include/rtems/nvdisk.h
@@ -31,7 +31,7 @@
 /**
  * The base name of the nv disks.
  */
-#define RTEMS_NVDISK_DEVICE_BASE_NAME "/dev/nvdisk"
+#define RTEMS_NVDISK_DEVICE_BASE_NAME "/dev/nvd"
 
 /**
  * NV disk specific ioctl request types. To use open the
diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c
index 939391761b..b59d54ad6c 100644
--- a/cpukit/libblock/src/flashdisk.c
+++ b/cpukit/libblock/src/flashdisk.c
@@ -2456,7 +2456,7 @@ rtems_fdisk_initialize (rtems_device_major_number major,
 
   for (minor = 0; minor < rtems_flashdisk_configuration_size; minor++, c++)
   {
-    char     name[sizeof (RTEMS_FLASHDISK_DEVICE_BASE_NAME) + 10];
+    char     name[] = RTEMS_FLASHDISK_DEVICE_BASE_NAME "a";
     dev_t    dev = rtems_filesystem_make_dev_t (major, minor);
     uint32_t device;
     uint32_t blocks = 0;
@@ -2464,8 +2464,7 @@ rtems_fdisk_initialize (rtems_device_major_number major,
 
     fd = &rtems_flashdisks[minor];
   
-    snprintf (name, sizeof (name),
-              RTEMS_FLASHDISK_DEVICE_BASE_NAME "%" PRIu32, minor);
+    name [sizeof(RTEMS_FLASHDISK_DEVICE_BASE_NAME)] += minor;
   
     fd->major              = major;
     fd->minor              = minor;
diff --git a/cpukit/libblock/src/nvdisk.c b/cpukit/libblock/src/nvdisk.c
index 4f45d97942..acf2656b3a 100644
--- a/cpukit/libblock/src/nvdisk.c
+++ b/cpukit/libblock/src/nvdisk.c
@@ -790,15 +790,14 @@ rtems_nvdisk_initialize (rtems_device_major_number major,
 
   for (minor = 0; minor < rtems_nvdisk_configuration_size; minor++, c++)
   {
-    char     name[sizeof (RTEMS_NVDISK_DEVICE_BASE_NAME) + 10];
+    char     name[] = RTEMS_NVDISK_DEVICE_BASE_NAME "a";
     dev_t    dev = rtems_filesystem_make_dev_t (major, minor);
     uint32_t device;
     uint32_t blocks = 0;
 
     nvd = &rtems_nvdisks[minor];
   
-    snprintf (name, sizeof (name),
-              RTEMS_NVDISK_DEVICE_BASE_NAME "%" PRIu32, minor);
+    name [sizeof(RTEMS_NVDISK_DEVICE_BASE_NAME)] += minor;
   
     nvd->major        = major;
     nvd->minor        = minor;
diff --git a/cpukit/libcsupport/src/eval.c b/cpukit/libcsupport/src/eval.c
index 5870155189..d3ccc7c78d 100644
--- a/cpukit/libcsupport/src/eval.c
+++ b/cpukit/libcsupport/src/eval.c
@@ -29,7 +29,7 @@ int rtems_filesystem_evaluate_relative_path(
   int                                follow_link
 )
 {
-  int                           i;
+  //int                           i;
   int                           result;
   rtems_filesystem_node_types_t type;
 
@@ -46,7 +46,7 @@ int rtems_filesystem_evaluate_relative_path(
   if ( !pathloc->ops->evalpath_h )
     rtems_set_errno_and_return_minus_one( ENOTSUP );
 
-  result = (*pathloc->ops->evalpath_h)( &pathname[i], pathnamelen, flags, pathloc );
+  result = (*pathloc->ops->evalpath_h)( pathname, pathnamelen, flags, pathloc );
 
   /*
    * Get the Node type and determine if you need to follow the link or
@@ -99,9 +99,7 @@ int rtems_filesystem_evaluate_path(
   int                                follow_link
 )
 {
-  int                           i;
-  int                           result;
-  rtems_filesystem_node_types_t type;
+  int                           i = 0;
 
   /*
    * Verify Input parameters.
@@ -122,8 +120,8 @@ int rtems_filesystem_evaluate_path(
   /*
    * We evaluation the path relative to the start location we get got.
    */
-  return rtems_filesystem_evaluate_relative_path( pathname,
-                                                  pathnamelen,
+  return rtems_filesystem_evaluate_relative_path( &pathname[i],
+                                                  pathnamelen - i,
                                                   flags,
                                                   pathloc,
                                                   follow_link );