Hi
The restrict keyword was propagated down to the filesystem
statvfs handlers inappropriately. This patch should
remove the restrict keyword from them while leaving it
on the statvfs() prototype and method.
OK to commit?
--
Joel Sherrill, Ph.D. Director of Research & Development
joel.sherr...@oarcorp.com On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
>From 03e54614a3ca200d67736b8f0ae73a3063edcbee Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherr...@oarcorp.com>
Date: Wed, 27 Nov 2013 13:06:16 -0600
Subject: [PATCH] statvfs filesystem handlers: Remove restrict
---
cpukit/libcsupport/include/rtems/libio.h | 8 ++++----
cpukit/libfs/src/defaults/default_statvfs.c | 4 ++--
cpukit/libfs/src/dosfs/msdos.h | 12 ++++++------
cpukit/libfs/src/dosfs/msdos_dir.c | 4 ++--
cpukit/libfs/src/dosfs/msdos_file.c | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index c1b7b73..21d57eb 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -485,8 +485,8 @@ typedef int (*rtems_filesystem_rename_t)(
* @see rtems_filesystem_default_statvfs().
*/
typedef int (*rtems_filesystem_statvfs_t)(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct statvfs *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct statvfs *buf
);
/**
@@ -738,8 +738,8 @@ int rtems_filesystem_default_rename(
* @see rtems_filesystem_statvfs_t.
*/
int rtems_filesystem_default_statvfs(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct statvfs *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct statvfs *buf
);
/** @} */
diff --git a/cpukit/libfs/src/defaults/default_statvfs.c b/cpukit/libfs/src/defaults/default_statvfs.c
index 41ac1c0..139d0b0 100644
--- a/cpukit/libfs/src/defaults/default_statvfs.c
+++ b/cpukit/libfs/src/defaults/default_statvfs.c
@@ -21,8 +21,8 @@
#include <rtems/seterr.h>
int rtems_filesystem_default_statvfs(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct statvfs *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct statvfs *buf
)
{
rtems_set_errno_and_return_minus_one( ENOSYS );
diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h
index 2fa3b58..57865d5 100644
--- a/cpukit/libfs/src/dosfs/msdos.h
+++ b/cpukit/libfs/src/dosfs/msdos.h
@@ -313,8 +313,8 @@ int msdos_rename(
);
int msdos_statvfs(
- const rtems_filesystem_location_info_t *__restrict root_loc,
- struct statvfs *__restrict sb);
+ const rtems_filesystem_location_info_t *root_loc,
+ struct statvfs *sb);
void msdos_lock(const rtems_filesystem_mount_table_entry_t *mt_entry);
@@ -348,8 +348,8 @@ ssize_t msdos_file_write(
);
int msdos_file_stat(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct stat *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct stat *buf
);
int
@@ -371,8 +371,8 @@ ssize_t msdos_dir_read(
int msdos_dir_sync(rtems_libio_t *iop);
int msdos_dir_stat(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct stat *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct stat *buf
);
/**
diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c
index ffc9f7f..d7f6823 100644
--- a/cpukit/libfs/src/dosfs/msdos_dir.c
+++ b/cpukit/libfs/src/dosfs/msdos_dir.c
@@ -383,8 +383,8 @@ msdos_dir_read(rtems_libio_t *iop, void *buffer, size_t count)
*/
int
msdos_dir_stat(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct stat *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct stat *buf
)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c
index 03bf6d6..b19b848 100644
--- a/cpukit/libfs/src/dosfs/msdos_file.c
+++ b/cpukit/libfs/src/dosfs/msdos_file.c
@@ -189,8 +189,8 @@ msdos_file_write(rtems_libio_t *iop,const void *buffer, size_t count)
*/
int
msdos_file_stat(
- const rtems_filesystem_location_info_t *__restrict loc,
- struct stat *__restrict buf
+ const rtems_filesystem_location_info_t *loc,
+ struct stat *buf
)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
--
1.7.1
_______________________________________________
rtems-devel mailing list
rtems-devel@rtems.org
http://www.rtems.org/mailman/listinfo/rtems-devel
