diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-12-13 09:36:01 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-12-13 09:36:01 +0000 |
| commit | 4534ba300e7ab8113b07a2c44e54cdda27761363 (patch) | |
| tree | 7fe16f50ac2a56ded66961c1bba8f79a5e6e893c | |
| parent | 4b2746331189715bb668299fa6d7f5108b31bcce (diff) | |
2011-12-13 Ralf Corsépius <ralf.corsepius@rtems.org>
* fileio/init.c: Comment out setup_nvdisk (Unused).
Make shell_nvdisk_trace, shell_nvdisk_erase, shell_bdbuf_trace,
disk_test_set_block_size, disk_test_write_blocks, disk_test_block_sizes,
parse_size_arg, create_ramdisk, create_nvdisk static.
* nsecs/init.c: Make my_ctime, subtract_em static.
| -rw-r--r-- | testsuites/samples/ChangeLog | 8 | ||||
| -rw-r--r-- | testsuites/samples/fileio/init.c | 20 | ||||
| -rw-r--r-- | testsuites/samples/nsecs/init.c | 4 |
3 files changed, 21 insertions, 11 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index 6d01464863..d18f7bda47 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,11 @@ +2011-12-13 Ralf Corsépius <ralf.corsepius@rtems.org> + + * fileio/init.c: Comment out setup_nvdisk (Unused). + Make shell_nvdisk_trace, shell_nvdisk_erase, shell_bdbuf_trace, + disk_test_set_block_size, disk_test_write_blocks, disk_test_block_sizes, + parse_size_arg, create_ramdisk, create_nvdisk static. + * nsecs/init.c: Make my_ctime, subtract_em static. + 2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> PR 1589/build diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c index f32e5a66c9..f8c33fc261 100644 --- a/testsuites/samples/fileio/init.c +++ b/testsuites/samples/fileio/init.c @@ -128,6 +128,7 @@ rtems_driver_address_table rtems_nvdisk_io_ops = { control_entry: rtems_blkdev_generic_ioctl }; +#if 0 int setup_nvdisk (const char* mntpath) { @@ -165,6 +166,7 @@ setup_nvdisk (const char* mntpath) return 0; } +#endif /* * Table of FAT file systems that will be mounted @@ -228,7 +230,7 @@ fstab_t fs_table[] = { #ifdef USE_SHELL -int +static int shell_nvdisk_trace (int argc, char* argv[]) { const char* driver; @@ -261,7 +263,7 @@ shell_nvdisk_trace (int argc, char* argv[]) return 0; } -int +static int shell_nvdisk_erase (int argc, char* argv[]) { const char* driver = NULL; @@ -309,7 +311,7 @@ shell_nvdisk_erase (int argc, char* argv[]) return 0; } -int +static int shell_bdbuf_trace (int argc, char* argv[]) { #if RTEMS_BDBUF_TRACE @@ -322,7 +324,7 @@ shell_bdbuf_trace (int argc, char* argv[]) return 0; } -int +static int disk_test_set_block_size (dev_t dev, size_t size) { rtems_disk_device* dd; @@ -342,7 +344,7 @@ disk_test_set_block_size (dev_t dev, size_t size) return rc; } -int +static int disk_test_write_blocks (dev_t dev, int start, int count, size_t size) { int block; @@ -384,7 +386,7 @@ disk_test_write_blocks (dev_t dev, int start, int count, size_t size) return 0; } -int +static int disk_test_block_sizes (int argc, char *argv[]) { struct stat st; @@ -414,7 +416,7 @@ disk_test_block_sizes (int argc, char *argv[]) return disk_test_write_blocks (st.st_rdev, start, count, size); } -size_t +static size_t parse_size_arg (const char* arg) { size_t size; @@ -442,7 +444,7 @@ parse_size_arg (const char* arg) return size * scalar; } -int +static int create_ramdisk (int argc, char *argv[]) { rtems_device_major_number major; @@ -515,7 +517,7 @@ create_ramdisk (int argc, char *argv[]) return 0; } -int +static int create_nvdisk (int argc, char *argv[]) { rtems_device_major_number major; diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c index c96772ab14..9199dd02cc 100644 --- a/testsuites/samples/nsecs/init.c +++ b/testsuites/samples/nsecs/init.c @@ -30,7 +30,7 @@ #include "tmacros.h" #include "pritime.h" -char *my_ctime( time_t t ) +static char *my_ctime( time_t t ) { static char b[32]; ctime_r(&t, b); @@ -38,7 +38,7 @@ char *my_ctime( time_t t ) return b; } -void subtract_em( +static void subtract_em( struct timespec *start, struct timespec *stop, struct timespec *t |