Changeset 8d6a41c in mainline for uspace/lib/c

Timestamp:

2011-11-05T13:00:34Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45ffe9f

Parents:

72fda53

Message:

Remove the mtab_list_ent structure.

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (3 diffs)
• include/vfs/vfs_mtab.h (modified) (2 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -35 +35 @@
 #include <vfs/canonify.h>
 #include <vfs/vfs.h>
-#include <vfs/vfs_mtab.h>
 #include <vfs/vfs_sess.h>
 #include <macros.h>
@@ -849 +848 @@
 
         for (i = 0; i < num_mounted_fs; ++i) {
-                mtab_list_ent_t *mtab_list_ent;
                 mtab_ent_t *mtab_ent;
 
-                mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
-                if (!mtab_list_ent) {
+                mtab_ent = malloc(sizeof(mtab_ent_t));
+                if (!mtab_ent) {
                         rc = ENOMEM;
                         goto exit;
                 }
 
-                memset(mtab_list_ent, 0, sizeof(mtab_list_ent_t));
-
-                mtab_ent = &mtab_list_ent->mtab_ent;
+                memset(mtab_ent, 0, sizeof(mtab_ent_t));
 
                 rc = async_data_read_start(exch, (void *) mtab_ent->mp,
@@ -890 +886 @@
                 mtab_ent->fs_handle = p[2];
 
-                link_initialize(&mtab_list_ent->link);
-                list_append(&mtab_list_ent->link, mtab_list);
+                link_initialize(&mtab_ent->link);
+                list_append(&mtab_ent->link, mtab_list);
         }
 

uspace/lib/c/include/vfs/vfs_mtab.h

@@ -40 +40 @@
 
 typedef struct mtab_ent {
+        link_t link;
         char mp[MAX_PATH_LEN];
         char opts[MAX_MNTOPTS_LEN];
@@ -48 +49 @@
 } mtab_ent_t;
 
-typedef struct mtab_list_ent {
-        link_t link;
-        mtab_ent_t mtab_ent;
-} mtab_list_ent_t;
-
 #endif