From b17ff4913cc7f3d87e41da83a26655b4f0b9001f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 6 May 2005 14:57:43 +0000 Subject: 2005-05-06 Joel Sherrill * libblock/src/blkdev.c, libfs/src/dosfs/fat_file.c, libfs/src/dosfs/fat_file.h, libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_create.c, libfs/src/dosfs/msdos_dir.c, libfs/src/dosfs/msdos_initsupp.c, libfs/src/dosfs/msdos_misc.c: Removed warnings. --- cpukit/libfs/src/dosfs/fat_file.c | 6 +++--- cpukit/libfs/src/dosfs/fat_file.h | 4 ++-- cpukit/libfs/src/dosfs/msdos.h | 2 +- cpukit/libfs/src/dosfs/msdos_create.c | 4 ++-- cpukit/libfs/src/dosfs/msdos_dir.c | 9 +++++---- cpukit/libfs/src/dosfs/msdos_initsupp.c | 2 +- cpukit/libfs/src/dosfs/msdos_misc.c | 15 +++++++++------ 7 files changed, 23 insertions(+), 19 deletions(-) (limited to 'cpukit/libfs') diff --git a/cpukit/libfs/src/dosfs/fat_file.c b/cpukit/libfs/src/dosfs/fat_file.c index 4db3f626a2..69e1d9a7e0 100644 --- a/cpukit/libfs/src/dosfs/fat_file.c +++ b/cpukit/libfs/src/dosfs/fat_file.c @@ -258,8 +258,8 @@ fat_file_read( fat_file_fd_t *fat_fd, uint32_t start, uint32_t count, - char *buf - ) + uint8_t *buf +) { int rc = RC_OK; ssize_t ret = 0; @@ -363,7 +363,7 @@ fat_file_write( fat_file_fd_t *fat_fd, uint32_t start, uint32_t count, - const char *buf + const uint8_t *buf ) { int rc = 0; diff --git a/cpukit/libfs/src/dosfs/fat_file.h b/cpukit/libfs/src/dosfs/fat_file.h index 4ac2e06b9f..9b0766e6e7 100644 --- a/cpukit/libfs/src/dosfs/fat_file.h +++ b/cpukit/libfs/src/dosfs/fat_file.h @@ -149,14 +149,14 @@ fat_file_read(rtems_filesystem_mount_table_entry_t *mt_entry, fat_file_fd_t *fat_fd, uint32_t start, uint32_t count, - char *buf); + uint8_t *buf); ssize_t fat_file_write(rtems_filesystem_mount_table_entry_t *mt_entry, fat_file_fd_t *fat_fd, uint32_t start, uint32_t count, - const char *buf); + const uint8_t *buf); int fat_file_extend(rtems_filesystem_mount_table_entry_t *mt_entry, diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h index ca35e77163..a916ed22ca 100644 --- a/cpukit/libfs/src/dosfs/msdos.h +++ b/cpukit/libfs/src/dosfs/msdos.h @@ -83,7 +83,7 @@ typedef rtems_filesystem_node_types_t msdos_node_type_t; */ #define MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE 32 /* 32 bytes */ -#define MSDOS_DIR_NAME(x) (uint8_t *)((x) + 0) +#define MSDOS_DIR_NAME(x) (char *)((x) + 0) #define MSDOS_DIR_ATTR(x) (uint8_t *)((x) + 11) #define MSDOS_DIR_NT_RES(x) (uint8_t *)((x) + 12) #define MSDOS_DIR_CRT_TIME_TENTH(x) (uint8_t *)((x) + 13) diff --git a/cpukit/libfs/src/dosfs/msdos_create.c b/cpukit/libfs/src/dosfs/msdos_create.c index 20cc217989..8c238d396c 100644 --- a/cpukit/libfs/src/dosfs/msdos_create.c +++ b/cpukit/libfs/src/dosfs/msdos_create.c @@ -214,7 +214,7 @@ msdos_creat_node( */ ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE * 2, - dot_dotdot); + (uint8_t *)dot_dotdot); if (ret < 0) { rc = -1; @@ -233,7 +233,7 @@ msdos_creat_node( /* rewrite dot entry */ ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE, - DOT_NODE_P(dot_dotdot)); + (uint8_t *)DOT_NODE_P(dot_dotdot)); if (ret < 0) { rc = -1; diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c index 4afc404592..38699a73a7 100644 --- a/cpukit/libfs/src/dosfs/msdos_dir.c +++ b/cpukit/libfs/src/dosfs/msdos_dir.c @@ -260,7 +260,8 @@ msdos_dir_read(rtems_libio_t *iop, void *buffer, uint32_t count) return cmpltd; } - if ((*MSDOS_DIR_NAME(fs_info->cl_buf + i)) == + /* have to look at the DIR_NAME as "raw" 8-bit data */ + if ((*(uint8_t *)MSDOS_DIR_NAME(fs_info->cl_buf + i)) == MSDOS_THIS_DIR_ENTRY_EMPTY) continue; @@ -309,9 +310,9 @@ msdos_dir_read(rtems_libio_t *iop, void *buffer, uint32_t count) * convert dir entry from fixed 8+3 format (without dot) * to 0..8 + 1dot + 0..3 format */ - tmp_dirent.d_namlen = - msdos_format_dirent_with_dot(tmp_dirent.d_name, - fs_info->cl_buf + i); /* src text */ + tmp_dirent.d_namlen = msdos_format_dirent_with_dot( + tmp_dirent.d_name, + (char *) fs_info->cl_buf + i); /* src text */ memcpy(buffer + cmpltd, &tmp_dirent, sizeof(struct dirent)); iop->offset = iop->offset + sizeof(struct dirent); diff --git a/cpukit/libfs/src/dosfs/msdos_initsupp.c b/cpukit/libfs/src/dosfs/msdos_initsupp.c index 006fb38d09..73a76f00c3 100644 --- a/cpukit/libfs/src/dosfs/msdos_initsupp.c +++ b/cpukit/libfs/src/dosfs/msdos_initsupp.c @@ -118,7 +118,7 @@ msdos_initialize_support( cl_buf_size = fs_info->fat.vol.bpc; } - fs_info->cl_buf = (char *)calloc(cl_buf_size, sizeof(char)); + fs_info->cl_buf = (uint8_t *)calloc(cl_buf_size, sizeof(char)); if (fs_info->cl_buf == NULL) { fat_file_close(temp_mt_entry, fat_fd); diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c index 2a4fc41ab2..b256c5e5e1 100644 --- a/cpukit/libfs/src/dosfs/msdos_misc.c +++ b/cpukit/libfs/src/dosfs/msdos_misc.c @@ -285,7 +285,7 @@ msdos_get_name_node( ret = fat_file_write(parent_loc->mt_entry, fat_fd, fat_fd->fat_file_size, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE, - name_dir_entry); + (uint8_t *)name_dir_entry); if (ret == -1) return -1; @@ -706,11 +706,12 @@ msdos_dir_is_empty( assert(ret == fs_info->fat.vol.bps); + /* have to look at the DIR_NAME as "raw" 8-bit data */ for (i = 0; i < fs_info->fat.vol.bps; i += MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE) { - if (((*MSDOS_DIR_NAME(fs_info->cl_buf + i)) == + if (((*(uint8_t *)MSDOS_DIR_NAME(fs_info->cl_buf + i)) == MSDOS_THIS_DIR_ENTRY_EMPTY) || (strncmp(MSDOS_DIR_NAME((fs_info->cl_buf + i)), MSDOS_DOT_NAME, MSDOS_SHORT_NAME_LEN) == 0) || @@ -790,12 +791,13 @@ msdos_find_name_in_fat_file( assert(ret == bts2rd); + /* have to look at the DIR_NAME as "raw" 8-bit data */ for (i = 0; i < bts2rd; i += MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE) { /* is the entry empty ? */ - if (((*MSDOS_DIR_NAME(fs_info->cl_buf + i)) == + if (((*(uint8_t *)MSDOS_DIR_NAME(fs_info->cl_buf + i)) == MSDOS_THIS_DIR_ENTRY_AND_REST_EMPTY) || - ((*MSDOS_DIR_NAME(fs_info->cl_buf + i)) == + ((*(uint8_t *)MSDOS_DIR_NAME(fs_info->cl_buf + i)) == MSDOS_THIS_DIR_ENTRY_EMPTY)) { /* whether we are looking for an empty entry */ @@ -813,7 +815,7 @@ msdos_find_name_in_fat_file( /* write new node entry */ ret = fat_file_write(mt_entry, fat_fd, j * bts2rd + i, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE, - name_dir_entry); + (uint8_t *)name_dir_entry); if (ret != MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE) return -1; @@ -914,8 +916,9 @@ msdos_find_node_by_cluster_num_in_fat_file( MSDOS_THIS_DIR_ENTRY_AND_REST_EMPTY) return MSDOS_NAME_NOT_FOUND_ERR; + /* have to look at the DIR_NAME as "raw" 8-bit data */ /* if this entry is empty - skip it */ - if ((*MSDOS_DIR_NAME(fs_info->cl_buf + i)) == + if ((*(uint8_t *)MSDOS_DIR_NAME(fs_info->cl_buf + i)) == MSDOS_THIS_DIR_ENTRY_EMPTY) continue; -- cgit v1.2.3