Changeset c735cd5 in rtems

Timestamp:

Mar 5, 2015, 9:34:28 AM (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

16b2de35

Parents:

6fd5b4e

git-author:

Sebastian Huber <sebastian.huber@…> (03/05/15 09:34:28)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/05/15 10:23:10)

Message:

dosfs: Fix warnings

Location:

cpukit/libfs/src/dosfs

Files:

• fat_file.h (modified) (1 diff)
• msdos.h (modified) (2 diffs)
• msdos_create.c (modified) (3 diffs)
• msdos_eval.c (modified) (1 diff)
• msdos_mknod.c (modified) (2 diffs)
• msdos_rename.c (modified) (1 diff)
• msdos_rmnod.c (modified) (1 diff)

cpukit/libfs/src/dosfs/fat_file.h

@@ -40 +40 @@
 typedef enum {
   FAT_DIRECTORY = 0,
+  FAT_HARD_LINK = 2, /* pseudo type */
   FAT_FILE = 4
 } fat_file_type_t;

cpukit/libfs/src/dosfs/msdos.h

@@ -86 +86 @@
 #define MSDOS_VOLUME_SEMAPHORE_TIMEOUT    RTEMS_NO_TIMEOUT
 
-/* Node types */
-typedef enum {
-  MSDOS_DIRECTORY = 0,
-  MSDOS_REGULAR_FILE = 4,
-  MSDOS_HARD_LINK = 2 /* pseudo type */
-} msdos_node_type_t;
-
 /*
  * Macros for fetching fields from 32 bytes long FAT Directory Entry
@@ -371 +364 @@
  */
 int msdos_creat_node(const rtems_filesystem_location_info_t *parent_loc,
-                     msdos_node_type_t                       type,
+                     fat_file_type_t                         type,
                      const char                             *name,
                      int                                     name_len,

cpukit/libfs/src/dosfs/msdos_create.c

@@ -60 +60 @@
 int
 msdos_creat_node(const rtems_filesystem_location_info_t  *parent_loc,
-                 msdos_node_type_t                        type,
+                 fat_file_type_t                          type,
                  const char                              *name,
                  int                                      name_len,
@@ -116 +116 @@
     *MSDOS_DIR_FILE_SIZE(short_node) = MSDOS_INIT_DIR_SIZE;
 
-    if (type == MSDOS_DIRECTORY) {
+    if (type == FAT_DIRECTORY) {
       *MSDOS_DIR_ATTR(short_node) |= MSDOS_ATTR_DIRECTORY;
     }
-    else if (type == MSDOS_HARD_LINK) {
+    else if (type == FAT_HARD_LINK) {
       /*
        * when we establish a (temporary) hard link,
@@ -178 +178 @@
      * to do
      */
-    if (type == MSDOS_DIRECTORY)
+    if (type == FAT_DIRECTORY)
     {
         /* open new directory as fat-file */

cpukit/libfs/src/dosfs/msdos_eval.c

@@ -65 +65 @@
   fat_file_fd_t *fat_fd = currentloc->node_access;
 
-  return fat_fd->fat_file_type == MSDOS_DIRECTORY;
+  return fat_fd->fat_file_type == FAT_DIRECTORY;
 }
 

cpukit/libfs/src/dosfs/msdos_mknod.c

@@ -44 +44 @@
 {
     int                  rc = RC_OK;
-    msdos_node_type_t    type = 0;
+    fat_file_type_t      type = 0;
 
     /*
@@ -51 +51 @@
     if (S_ISDIR(mode))
     {
-       type = MSDOS_DIRECTORY;
+       type = FAT_DIRECTORY;
     }
     else if (S_ISREG(mode))
     {
-        type = MSDOS_REGULAR_FILE;
+        type = FAT_FILE;
     }
     else

cpukit/libfs/src/dosfs/msdos_rename.c

@@ -52 +52 @@
      */
     rc = msdos_creat_node(new_parent_loc,
-                          MSDOS_HARD_LINK,new_name,new_namelen,S_IFREG,
+                          FAT_HARD_LINK,new_name,new_namelen,S_IFREG,
                           old_fat_fd);
     if (rc != RC_OK)

cpukit/libfs/src/dosfs/msdos_rmnod.c

@@ -29 +29 @@
     fat_file_fd_t     *fat_fd = pathloc->node_access;
 
-    if (fat_fd->fat_file_type == MSDOS_DIRECTORY)
+    if (fat_fd->fat_file_type == FAT_FILE)
     {
         bool is_empty = false;