2006-08-29 Joel Sherrill <joel@OARcorp.com>

	* libfs/src/dosfs/fat.h, libfs/src/dosfs/msdos.h,
	libfs/src/dosfs/msdos_create.c, libfs/src/dosfs/msdos_eval.c,
	libfs/src/dosfs/msdos_file.c, libfs/src/dosfs/msdos_free.c,
	libfs/src/dosfs/msdos_fsunmount.c, libfs/src/dosfs/msdos_init.c,
	libfs/src/dosfs/msdos_misc.c, libfs/src/dosfs/msdos_mknod.c,
	libfs/src/imfs/imfs_debug.c: Remove warnings.

12 files changed, 137 insertions, 148 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index fbde254f9f..3d7fa3a036 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29	Joel Sherrill <joel@OARcorp.com>
+
+	* libfs/src/dosfs/fat.h, libfs/src/dosfs/msdos.h,
+	libfs/src/dosfs/msdos_create.c, libfs/src/dosfs/msdos_eval.c,
+	libfs/src/dosfs/msdos_file.c, libfs/src/dosfs/msdos_free.c,
+	libfs/src/dosfs/msdos_fsunmount.c, libfs/src/dosfs/msdos_init.c,
+	libfs/src/dosfs/msdos_misc.c, libfs/src/dosfs/msdos_mknod.c,
+	libfs/src/imfs/imfs_debug.c: Remove warnings.
+
 2006-08-21	Till Straumann <strauman@slac.stanford.edu>
 
 	* libnetworking/net/if_ethersubr.c: (ether_ioctl)
diff --git a/cpukit/libfs/src/dosfs/fat.h b/cpukit/libfs/src/dosfs/fat.h
index f4d1c60408..3a951b114e 100644
--- a/cpukit/libfs/src/dosfs/fat.h
+++ b/cpukit/libfs/src/dosfs/fat.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <rtems/bdbuf.h>
 
 #ifndef RC_OK
-#define RC_OK 0x00000000
+#define RC_OK 0
 #endif
 
 /*
@@ -129,8 +129,9 @@ extern "C" {
                  } while (0)
 
 #define FAT_SET_VAL32(x, ofs,val) do {               \
-                 FAT_SET_VAL16((x),(ofs),(val));     \
-                 FAT_SET_VAL16((x),(ofs)+2,(val)>>16);\
+                 uint32_t val1 = val;                \
+                 FAT_SET_VAL16((x),(ofs),(val1)&&0xffff);\
+                 FAT_SET_VAL16((x),(ofs)+2,(val1)>>16);\
                  } while (0)
 
 /* macros to access boot sector fields */
diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h
index f1b7528715..b4ea6abe40 100644
--- a/cpukit/libfs/src/dosfs/msdos.h
+++ b/cpukit/libfs/src/dosfs/msdos.h
@@ -25,9 +25,7 @@ extern "C" {
 #include "fat.h"
 #include "fat_file.h"
 
-#define MSDOS_NAME_NOT_FOUND_ERR  0xDD000001
-
-typedef uint32_t msdos_status_t;
+#define MSDOS_NAME_NOT_FOUND_ERR  0x7D01
 
 /*
  * This structure identifies the instance of the filesystem on the MSDOS
@@ -197,85 +195,79 @@ typedef enum msdos_token_types_e
 #define MSDOS_DPS512_NUM    16
 
 /* Prototypes */
-msdos_status_t
-msdos_initialize(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
+int msdos_initialize(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
 
-msdos_status_t
-msdos_shut_down(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
+int msdos_shut_down(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
 
-msdos_status_t
-msdos_eval_path(const char                       *pathname, /* IN */
-                int                               flags,    /* IN */
-                rtems_filesystem_location_info_t *pathloc   /* IN/OUT */);
+int msdos_eval_path(
+  const char                       *pathname, /* IN */
+  int                               flags,    /* IN */
+  rtems_filesystem_location_info_t *pathloc   /* IN/OUT */
+);
 
-msdos_status_t
-msdos_eval4make(const char                       *path,     /* IN */
-                rtems_filesystem_location_info_t *pathloc,  /* IN/OUT */
-                const char                       **name     /* OUT    */);
+int msdos_eval4make(
+  const char                       *path,     /* IN */
+  rtems_filesystem_location_info_t *pathloc,  /* IN/OUT */
+  const char                       **name     /* OUT    */
+);
 
-int
-msdos_unlink(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_unlink(rtems_filesystem_location_info_t *pathloc /* IN */);
 
-msdos_status_t
-msdos_free_node_info(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_free_node_info(rtems_filesystem_location_info_t *pathloc /* IN */);
 
-rtems_filesystem_node_types_t
-msdos_node_type(rtems_filesystem_location_info_t    *pathloc);
+int msdos_node_type(rtems_filesystem_location_info_t    *pathloc);
 
-msdos_status_t
-msdos_mknod(const char                       *path,   /* IN */
-            mode_t                            mode,   /* IN */
-            dev_t                             dev,    /* IN */
-            rtems_filesystem_location_info_t *pathloc /* IN/OUT */);
+int msdos_mknod(
+  const char                       *path,   /* IN */
+  mode_t                            mode,   /* IN */
+  dev_t                             dev,    /* IN */
+  rtems_filesystem_location_info_t *pathloc /* IN/OUT */
+);
 
-msdos_status_t
-msdos_utime(rtems_filesystem_location_info_t *pathloc, /* IN */
-            time_t                            actime,  /* IN */
-            time_t                            modtime  /* IN */);
+int msdos_utime(
+  rtems_filesystem_location_info_t *pathloc, /* IN */
+  time_t                            actime,  /* IN */
+  time_t                            modtime  /* IN */
+);
 
-int
-msdos_initialize_support(
+int msdos_initialize_support(
   rtems_filesystem_mount_table_entry_t *temp_mt_entry,
   rtems_filesystem_operations_table    *op_table,
   rtems_filesystem_file_handlers_r     *file_handlers,
   rtems_filesystem_file_handlers_r     *directory_handlers
 );
 
-int
-msdos_file_open(
+int msdos_file_open(
   rtems_libio_t *iop,             /* IN  */
   const char    *pathname,        /* IN  */
   uint32_t       flag,            /* IN  */
   uint32_t       mode             /* IN  */
 );
 
-int
-msdos_file_close(rtems_libio_t *iop /* IN  */);
+int msdos_file_close(rtems_libio_t *iop /* IN  */);
 
-ssize_t
-msdos_file_read(
+ssize_t msdos_file_read(
   rtems_libio_t *iop,              /* IN  */
   void          *buffer,           /* IN  */
   uint32_t       count             /* IN  */
 );
 
-ssize_t
-msdos_file_write(
+ssize_t msdos_file_write(
   rtems_libio_t *iop,             /* IN  */
   const void    *buffer,          /* IN  */
   uint32_t       count            /* IN  */
 );
 
-int
-msdos_file_lseek(
+int msdos_file_lseek(
   rtems_libio_t        *iop,              /* IN  */
   off_t                 offset,           /* IN  */
   int                   whence            /* IN  */
 );
 
-int
-msdos_file_stat(rtems_filesystem_location_info_t *loc, /* IN  */
-                struct stat                      *buf  /* OUT */);
+int msdos_file_stat(
+  rtems_filesystem_location_info_t *loc, /* IN  */
+  struct stat                      *buf  /* OUT */
+);
 
 int
 msdos_file_ftruncate(
@@ -283,66 +275,55 @@ msdos_file_ftruncate(
   off_t          length             /* IN  */
 );
 
-int
-msdos_file_sync(rtems_libio_t *iop);
+int msdos_file_sync(rtems_libio_t *iop);
 
-int
-msdos_file_datasync(rtems_libio_t *iop);
+int msdos_file_datasync(rtems_libio_t *iop);
 
-int
-msdos_file_ioctl(
+int msdos_file_ioctl(
   rtems_libio_t *iop,             /* IN  */
   uint32_t       command,         /* IN  */
   void          *buffer           /* IN  */
 );
 
-msdos_status_t
-msdos_file_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_file_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
 
-msdos_status_t
-msdos_file_link(rtems_filesystem_location_info_t *to_loc,
-		rtems_filesystem_location_info_t *pa_loc,
-		const char                       *token);
+int msdos_file_link(
+  rtems_filesystem_location_info_t *to_loc,
+  rtems_filesystem_location_info_t *pa_loc,
+  const char                       *token
+);
 
-int
-msdos_dir_open(
+int msdos_dir_open(
   rtems_libio_t *iop,             /* IN  */
   const char    *pathname,        /* IN  */
   uint32_t       flag,            /* IN  */
   uint32_t       mode             /* IN  */
 );
 
-int
-msdos_dir_close(rtems_libio_t *iop /* IN  */);
+int msdos_dir_close(rtems_libio_t *iop /* IN  */);
 
-ssize_t
-msdos_dir_read(
+ssize_t msdos_dir_read(
   rtems_libio_t *iop,              /* IN  */
   void          *buffer,           /* IN  */
   uint32_t       count             /* IN  */
 );
 
-int
-msdos_dir_lseek(
+int msdos_dir_lseek(
   rtems_libio_t        *iop,              /* IN  */
   off_t                 offset,           /* IN  */
   int                   whence            /* IN  */
 );
 
-int
-msdos_dir_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_dir_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
 
-int
-msdos_dir_sync(rtems_libio_t *iop);
+int msdos_dir_sync(rtems_libio_t *iop);
 
-int
-msdos_dir_stat(
+int msdos_dir_stat(
   rtems_filesystem_location_info_t *loc,         /* IN  */
   struct stat                      *buf          /* OUT */
 );
 
-int
-msdos_creat_node(rtems_filesystem_location_info_t  *parent_loc,
+int msdos_creat_node(rtems_filesystem_location_info_t  *parent_loc,
                  msdos_node_type_t                  type,
                  char                              *name,
                  mode_t                             mode,
@@ -353,65 +334,66 @@ msdos_token_types_t msdos_get_token(const char *path,
                                     char       *token,
                                     int        *token_len);
 
-int
-msdos_find_name(rtems_filesystem_location_info_t *parent_loc,
-                char                             *name);
+int msdos_find_name(
+  rtems_filesystem_location_info_t *parent_loc,
+  char                             *name
+);
 
-msdos_status_t
-msdos_get_name_node(rtems_filesystem_location_info_t *parent_loc,
-                    char                             *name,
-                    fat_auxiliary_t                  *paux,
-                    char                             *name_dir_entry);
+int msdos_get_name_node(
+  rtems_filesystem_location_info_t *parent_loc,
+  char                             *name,
+  fat_auxiliary_t                  *paux,
+  char                             *name_dir_entry
+);
 
-int
-msdos_dir_info_remove(rtems_filesystem_location_info_t *pathloc);
+int msdos_dir_info_remove(rtems_filesystem_location_info_t *pathloc);
 
-int
-msdos_filename_unix2dos(char *un, int unlen, char *dn);
+int msdos_filename_unix2dos(char *un, int unlen, char *dn);
 
-void
-msdos_date_unix2dos(unsigned int tsp, unsigned short *ddp,
-                    unsigned short *dtp);
+void msdos_date_unix2dos(
+  unsigned int tsp, unsigned short *ddp,
+  unsigned short *dtp);
 
-unsigned int
-msdos_date_dos2unix(unsigned int dd, unsigned int dt);
+unsigned int msdos_date_dos2unix(unsigned int dd, unsigned int dt);
 
-int
-msdos_set_first_cluster_num(rtems_filesystem_mount_table_entry_t *mt_entry,
-                            fat_file_fd_t                        *fat_fd);
+int msdos_set_first_cluster_num(
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  fat_file_fd_t                        *fat_fd
+);
 
-int
-msdos_set_file_size(rtems_filesystem_mount_table_entry_t *mt_entry,
-                    fat_file_fd_t                        *fat_fd);
+int msdos_set_file_size(
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  fat_file_fd_t                        *fat_fd
+);
 
-int
-msdos_set_first_char4file_name(rtems_filesystem_mount_table_entry_t *mt_entry,
-                               uint32_t    cl,
-                               uint32_t    ofs,
-                               unsigned char first_char);
+int msdos_set_first_char4file_name(
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  uint32_t    cl,
+  uint32_t    ofs,
+  unsigned char first_char
+);
 
-int
-msdos_set_dir_wrt_time_and_date(
+int msdos_set_dir_wrt_time_and_date(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     fat_file_fd_t                        *fat_fd
 );
 
 
-int
-msdos_dir_is_empty(rtems_filesystem_mount_table_entry_t *mt_entry,
-                   fat_file_fd_t                        *fat_fd,
-                   rtems_boolean                        *ret_val);
+int msdos_dir_is_empty(
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  fat_file_fd_t                        *fat_fd,
+  rtems_boolean                        *ret_val
+);
 
-msdos_status_t
-msdos_find_name_in_fat_file(
+int msdos_find_name_in_fat_file(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     fat_file_fd_t                        *fat_fd,
     char                                 *name,
     fat_auxiliary_t                      *paux,
-    char                                 *name_dir_entry);
+    char                                 *name_dir_entry
+);
 
-msdos_status_t
-msdos_find_node_by_cluster_num_in_fat_file(
+int msdos_find_node_by_cluster_num_in_fat_file(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     fat_file_fd_t                        *fat_fd,
     uint32_t                              cl4find,
@@ -419,8 +401,7 @@ msdos_find_node_by_cluster_num_in_fat_file(
     char                                 *dir_entry
 );
 
-int
-msdos_get_dotdot_dir_info_cluster_num_and_offset(
+int msdos_get_dotdot_dir_info_cluster_num_and_offset(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     uint32_t                              cln,
     fat_auxiliary_t                      *paux,
diff --git a/cpukit/libfs/src/dosfs/msdos_create.c b/cpukit/libfs/src/dosfs/msdos_create.c
index 280e2de31c..8c238d396c 100644
--- a/cpukit/libfs/src/dosfs/msdos_create.c
+++ b/cpukit/libfs/src/dosfs/msdos_create.c
@@ -285,7 +285,7 @@ err:
  * RETURNS:
  *     RC_OK on success, or -1 if error occured (errno set appropriately)
  */
-msdos_status_t
+int
 msdos_file_link(rtems_filesystem_location_info_t *to_loc,
 		rtems_filesystem_location_info_t *par_loc,
 		const char                       *token
diff --git a/cpukit/libfs/src/dosfs/msdos_eval.c b/cpukit/libfs/src/dosfs/msdos_eval.c
index dd614ace23..3e620b96a8 100644
--- a/cpukit/libfs/src/dosfs/msdos_eval.c
+++ b/cpukit/libfs/src/dosfs/msdos_eval.c
@@ -69,14 +69,14 @@ msdos_set_handlers(rtems_filesystem_location_info_t *loc)
  *     (errno set appropriately)
  *
  */
-msdos_status_t
+int
 msdos_eval_path(
     const char                        *pathname,
     int                                flags,
     rtems_filesystem_location_info_t  *pathloc
     )
 {
-    msdos_status_t                    rc = RC_OK;
+    int                               rc = RC_OK;
     rtems_status_code                 sc = RTEMS_SUCCESSFUL;
     msdos_fs_info_t                  *fs_info = pathloc->mt_entry->fs_info;
     fat_file_fd_t                    *fat_fd = NULL;
@@ -250,14 +250,14 @@ err:
  *     RC_OK, filled pathloc for parent directory and name of new node on
  *     success, or -1 if error occured (errno set appropriately)
  */
-msdos_status_t
+int
 msdos_eval4make(
     const char                         *path,
     rtems_filesystem_location_info_t   *pathloc,
     const char                        **name
     )
 {
-    msdos_status_t                    rc = RC_OK;
+    int                               rc = RC_OK;
     rtems_status_code                 sc = RTEMS_SUCCESSFUL;
     msdos_fs_info_t                  *fs_info = pathloc->mt_entry->fs_info;
     fat_file_fd_t                    *fat_fd = NULL;
diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c
index 12cf5ac6e7..14bd96b325 100644
--- a/cpukit/libfs/src/dosfs/msdos_file.c
+++ b/cpukit/libfs/src/dosfs/msdos_file.c
@@ -455,10 +455,10 @@ msdos_file_ioctl(rtems_libio_t *iop,uint32_t   command, void *buffer)
  * RETURNS:
  *     RC_OK on success, or -1 if error occured (errno set appropriately)
  */
-msdos_status_t
+int
 msdos_file_rmnod(rtems_filesystem_location_info_t *pathloc)
 {
-    msdos_status_t     rc = RC_OK;
+    int                rc = RC_OK;
     rtems_status_code  sc = RTEMS_SUCCESSFUL;
     msdos_fs_info_t   *fs_info = pathloc->mt_entry->fs_info;
     fat_file_fd_t     *fat_fd = pathloc->node_access;
diff --git a/cpukit/libfs/src/dosfs/msdos_free.c b/cpukit/libfs/src/dosfs/msdos_free.c
index db9ff9c984..2fb74e2387 100644
--- a/cpukit/libfs/src/dosfs/msdos_free.c
+++ b/cpukit/libfs/src/dosfs/msdos_free.c
@@ -37,7 +37,7 @@
  *     RC_OK on success, or -1 code if error occured
  *
  */
-msdos_status_t
+int
 msdos_free_node_info(rtems_filesystem_location_info_t *pathloc)
 {
     int                rc = RC_OK;
diff --git a/cpukit/libfs/src/dosfs/msdos_fsunmount.c b/cpukit/libfs/src/dosfs/msdos_fsunmount.c
index 796dd55aeb..bd978179e2 100644
--- a/cpukit/libfs/src/dosfs/msdos_fsunmount.c
+++ b/cpukit/libfs/src/dosfs/msdos_fsunmount.c
@@ -43,10 +43,10 @@
  *     RC_OK on success, or -1 if error occured (errno set apropriately).
  *
  */
-msdos_status_t
+int
 msdos_shut_down(rtems_filesystem_mount_table_entry_t *temp_mt_entry)
 {
-    msdos_status_t   rc = RC_OK;
+    int              rc = RC_OK;
     msdos_fs_info_t *fs_info = temp_mt_entry->fs_info;
     fat_file_fd_t   *fat_fd = temp_mt_entry->mt_fs_root.node_access;
 
diff --git a/cpukit/libfs/src/dosfs/msdos_init.c b/cpukit/libfs/src/dosfs/msdos_init.c
index afeaeae3c9..d5d61d9103 100644
--- a/cpukit/libfs/src/dosfs/msdos_init.c
+++ b/cpukit/libfs/src/dosfs/msdos_init.c
@@ -51,10 +51,9 @@ rtems_filesystem_operations_table  msdos_ops = {
  *     RC_OK on success, or -1 if error occured (errno set apropriately).
  *
  */
-msdos_status_t
-msdos_initialize(rtems_filesystem_mount_table_entry_t *temp_mt_entry)
+int msdos_initialize(rtems_filesystem_mount_table_entry_t *temp_mt_entry)
 {
-    msdos_status_t rc;
+    int rc;
 
     rc = msdos_initialize_support(temp_mt_entry,
                                   &msdos_ops,
diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c
index 0924929deb..b7e6ab3523 100644
--- a/cpukit/libfs/src/dosfs/msdos_misc.c
+++ b/cpukit/libfs/src/dosfs/msdos_misc.c
@@ -252,7 +252,7 @@ msdos_find_name(
  *     error occured (errno set apropriately)
  *
  */
-msdos_status_t
+int
 msdos_get_name_node(
     rtems_filesystem_location_info_t *parent_loc,
     char                             *name,
@@ -260,7 +260,7 @@ msdos_get_name_node(
     char                             *name_dir_entry
     )
 {
-    msdos_status_t   rc = RC_OK;
+    int              rc = RC_OK;
     ssize_t          ret = 0;
     msdos_fs_info_t *fs_info = parent_loc->mt_entry->fs_info;
     fat_file_fd_t   *fat_fd = parent_loc->node_access;
@@ -762,8 +762,7 @@ msdos_dir_is_empty(
  *     appropriately)
  *
  */
-msdos_status_t
-msdos_find_name_in_fat_file(
+int msdos_find_name_in_fat_file(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     fat_file_fd_t                        *fat_fd,
     char                                 *name,
@@ -771,7 +770,7 @@ msdos_find_name_in_fat_file(
     char                                 *name_dir_entry
     )
 {
-    msdos_status_t   rc = RC_OK;
+    int              rc = RC_OK;
     ssize_t          ret = 0;
     msdos_fs_info_t *fs_info = mt_entry->fs_info;
     uint32_t         i = 0, j = 0;
@@ -880,8 +879,7 @@ msdos_find_name_in_fat_file(
  *     RC_OK on success, or error code if error occured
  *
  */
-msdos_status_t
-msdos_find_node_by_cluster_num_in_fat_file(
+int msdos_find_node_by_cluster_num_in_fat_file(
     rtems_filesystem_mount_table_entry_t *mt_entry,
     fat_file_fd_t                        *fat_fd,
     uint32_t                              cl4find,
@@ -889,7 +887,7 @@ msdos_find_node_by_cluster_num_in_fat_file(
     char                                 *dir_entry
     )
 {
-    msdos_status_t   rc = RC_OK;
+    int              rc = RC_OK;
     ssize_t          ret = 0;
     msdos_fs_info_t *fs_info = mt_entry->fs_info;
     uint32_t         bts2rd = 0;
diff --git a/cpukit/libfs/src/dosfs/msdos_mknod.c b/cpukit/libfs/src/dosfs/msdos_mknod.c
index 7c59d9800e..cdc12da092 100644
--- a/cpukit/libfs/src/dosfs/msdos_mknod.c
+++ b/cpukit/libfs/src/dosfs/msdos_mknod.c
@@ -45,15 +45,14 @@
  *     RC_OK on succes, or -1 if error occured and set errno
  *
  */
-msdos_status_t
-msdos_mknod(
+int msdos_mknod(
     const char                        *token,
     mode_t                             mode,
     dev_t                              dev,
     rtems_filesystem_location_info_t  *pathloc
-    )
+)
 {
-    msdos_status_t       rc = RC_OK;
+    int                  rc = RC_OK;
     rtems_status_code    sc = RTEMS_SUCCESSFUL;
     msdos_fs_info_t     *fs_info = pathloc->mt_entry->fs_info;
     msdos_token_types_t  type = 0;
diff --git a/cpukit/libfs/src/imfs/imfs_debug.c b/cpukit/libfs/src/imfs/imfs_debug.c
index e42198a4b8..8b53aea1d6 100644
--- a/cpukit/libfs/src/imfs/imfs_debug.c
+++ b/cpukit/libfs/src/imfs/imfs_debug.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>   /* for close */
+#include <inttypes.h>
 
 #include <stdio.h>
 #include <sys/stat.h>
@@ -61,13 +62,13 @@ void IMFS_print_jnode(
       break;
 
     case IMFS_DEVICE:
-      fprintf(stdout, " (device %d, %d)",
+      fprintf(stdout, " (device %" PRId32 ", %" PRId32 ")",
         the_jnode->info.device.major, the_jnode->info.device.minor );
       break;
 
     case IMFS_LINEAR_FILE:
-      fprintf(stdout, " (file %d %p)",
-        (int)the_jnode->info.linearfile.size,
+      fprintf(stdout, " (file %" PRId32 " %p)",
+        (uint32_t)the_jnode->info.linearfile.size,
         the_jnode->info.linearfile.direct
       );
       break;
@@ -75,14 +76,15 @@ void IMFS_print_jnode(
     case IMFS_MEMORY_FILE:
       /* Useful when debugging .. varies between targets  */
 #if 0
-      fprintf(stdout, " (file %d %p %p %p)",
-        (int)the_jnode->info.file.size,
+      fprintf(stdout, " (file %" PRId32 " %p %p %p)",
+        (uint32_t)the_jnode->info.file.size,
         the_jnode->info.file.indirect,
         the_jnode->info.file.doubly_indirect,
         the_jnode->info.file.triply_indirect
       );
 #else
-      fprintf(stdout, " (file %d)", (int)the_jnode->info.file.size );
+      fprintf(stdout, " (file %" PRId32 ")",
+        (uint32_t)the_jnode->info.file.size );
 #endif
       break;