diff options
author | Joel Sherrill <joel@rtems.org> | 2017-04-14 13:55:48 -0500 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2017-04-18 11:24:44 -0500 |
commit | 54bdf0c7e5d689da76d41ccbbf2c9dc830fd8c4e (patch) | |
tree | 9df296747c4d42e9580c04ad5f7d4e1ca469b532 /cpukit/libfs | |
parent | testsuite: Fix rtems-test-check not excluding tests. (diff) | |
download | rtems-54bdf0c7e5d689da76d41ccbbf2c9dc830fd8c4e.tar.bz2 |
rtems/inttypes.h: New file. Uses contents from cpukit
Provide extentions to <inttpes.h> PRIxxx constants for more POSIX types.
Start with existing definitions found in RTEMS Project owned code
in cpukit/.
updates #2983.
Diffstat (limited to 'cpukit/libfs')
-rw-r--r-- | cpukit/libfs/src/nfsclient/src/dirutils.c | 19 | ||||
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-dir.c | 9 | ||||
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c | 9 | ||||
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-rtems.c | 8 |
4 files changed, 5 insertions, 40 deletions
diff --git a/cpukit/libfs/src/nfsclient/src/dirutils.c b/cpukit/libfs/src/nfsclient/src/dirutils.c index 5dd7fcf3b8..7155ef998a 100644 --- a/cpukit/libfs/src/nfsclient/src/dirutils.c +++ b/cpukit/libfs/src/nfsclient/src/dirutils.c @@ -70,22 +70,7 @@ #include <limits.h> /* PATH_MAX */ #include <inttypes.h> /* PRI* */ - -#if SIZEOF_MODE_T == 8 -#define PRIomode_t PRIo64 -#elif SIZEOF_MODE_T == 4 -#define PRIomode_t PRIo32 -#else -#error "unsupport size of mode_t" -#endif - -#if SIZEOF_OFF_T == 8 -#define PRIdoff_t PRIo64 -#elif SIZEOF_OFF_T == 4 -#define PRIdoff_t PRIo32 -#else -#error "unsupported size of off_t" -#endif +#include <rtems/inttypes.h> /* extended PRI* */ #ifdef HAVE_CEXP #include <cexpHelp.h> @@ -142,7 +127,7 @@ char *t; t = "@"; break; } - printf("%10li, %10" PRIdoff_t "b, %5i.%-5i 0%04" PRIomode_t " %s%s\n", + printf("%10li, %10" PRIooff_t "b, %5i.%-5i 0%04" PRIomode_t " %s%s\n", buf->st_ino, buf->st_size, buf->st_uid, diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.c b/cpukit/libfs/src/rfs/rtems-rfs-dir.c index 5a39cd47cd..58bf305f4e 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-dir.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-dir.c @@ -28,16 +28,9 @@ #endif #include <inttypes.h> +#include <rtems/inttypes.h> #include <string.h> -#if SIZEOF_OFF_T == 8 -#define PRIooff_t PRIo64 -#elif SIZEOF_OFF_T == 4 -#define PRIooff_t PRIo32 -#else -#error "unsupported size of off_t" -#endif - #include <rtems/rfs/rtems-rfs-block.h> #include <rtems/rfs/rtems-rfs-buffer.h> #include <rtems/rfs/rtems-rfs-file-system.h> diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c index 8902a0d269..31df78acf1 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c @@ -21,16 +21,9 @@ #endif #include <inttypes.h> +#include <rtems/inttypes.h> #include <string.h> -#if SIZEOF_OFF_T == 8 -#define PRIdoff_t PRId64 -#elif SIZEOF_OFF_T == 4 -#define PRIdoff_t PRId32 -#else -#error "unsupported size of off_t" -#endif - #include <rtems/rfs/rtems-rfs-file.h> #include "rtems-rfs-rtems.h" diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c index d3393d672a..5ce526a8ed 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c @@ -25,13 +25,7 @@ #include <string.h> #include <stdlib.h> -#if SIZEOF_MODE_T == 8 -#define PRIomode_t PRIo64 -#elif SIZEOF_MODE_T == 4 -#define PRIomode_t PRIo32 -#else -#error "unsupport size of mode_t" -#endif +#include <rtems/inttypes.h> #include <rtems/rfs/rtems-rfs-file.h> #include <rtems/rfs/rtems-rfs-dir.h> |