summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-03-09 15:23:12 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-03-09 15:25:17 +0100
commit8552df6514e2c28ac3d1fdbc377e4f55fa8bb32e (patch)
tree06c05ee56d4d0f20c43e25a479a237ebba02cdee
parentlibtests/stringto01: Fix for GCC 5.0 (diff)
downloadrtems-8552df6514e2c28ac3d1fdbc377e4f55fa8bb32e.tar.bz2
sysconf: Simplify
-rw-r--r--cpukit/posix/src/sysconf.c39
1 files changed, 17 insertions, 22 deletions
diff --git a/cpukit/posix/src/sysconf.c b/cpukit/posix/src/sysconf.c
index 05158a2298..7bbf865788 100644
--- a/cpukit/posix/src/sysconf.c
+++ b/cpukit/posix/src/sysconf.c
@@ -22,8 +22,7 @@
#include <unistd.h>
#include <errno.h>
-#include <rtems/score/todimpl.h>
-#include <rtems/system.h>
+#include <rtems.h>
#include <rtems/seterr.h>
#include <rtems/libio_.h>
@@ -37,26 +36,22 @@ long sysconf(
int name
)
{
- if ( name == _SC_CLK_TCK )
- return (TOD_MICROSECONDS_PER_SECOND /
- rtems_configuration_get_microseconds_per_tick());
-
- if ( name == _SC_OPEN_MAX )
- return rtems_libio_number_iops;
-
- if ( name == _SC_GETPW_R_SIZE_MAX )
- return 1024;
-
- if ( name == _SC_PAGESIZE )
- return PAGE_SIZE;
-
- if ( name == _SC_SYMLOOP_MAX )
- return RTEMS_FILESYSTEM_SYMLOOP_MAX;
-
+ switch ( name ) {
+ case _SC_CLK_TCK:
+ return (long) rtems_clock_get_ticks_per_second();
+ case _SC_OPEN_MAX:
+ return rtems_libio_number_iops;
+ case _SC_GETPW_R_SIZE_MAX:
+ return 1024;
+ case _SC_PAGESIZE:
+ return PAGE_SIZE;
+ case _SC_SYMLOOP_MAX:
+ return RTEMS_FILESYSTEM_SYMLOOP_MAX;
#if defined(__sparc__)
- if ( name == 515 ) /* Solaris _SC_STACK_PROT */
- return 0;
+ case 515: /* Solaris _SC_STACK_PROT */
+ return 0;
#endif
-
- rtems_set_errno_and_return_minus_one( EINVAL );
+ default:
+ rtems_set_errno_and_return_minus_one( EINVAL );
+ }
}