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.

4 files changed, 6 insertions, 8 deletions

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;