Changeset 5f70118 in mainline for uspace/lib/libfs/libfs.h

Timestamp:

2010-01-10T12:16:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/libfs/libfs.h (modified) (1 diff)

uspace/lib/libfs/libfs.h

@@ -56 +56 @@
 
 typedef struct {
-        fs_node_t * (* match)(fs_node_t *, const char *);
-        fs_node_t * (* node_get)(dev_handle_t, fs_index_t);
-        void (* node_put)(fs_node_t *);
-        fs_node_t * (* create)(dev_handle_t, int);
+        /*
+         * The first set of methods are functions that return an integer error
+         * code. If some additional return value is to be returned, the first
+         * argument holds the output argument.
+         */
+        int (* root_get)(fs_node_t **, dev_handle_t);
+        int (* match)(fs_node_t **, fs_node_t *, const char *);
+        int (* node_get)(fs_node_t **, dev_handle_t, fs_index_t);
+        int (* node_open)(fs_node_t *);
+        int (* node_put)(fs_node_t *);
+        int (* create)(fs_node_t **, dev_handle_t, int);
         int (* destroy)(fs_node_t *);
         int (* link)(fs_node_t *, fs_node_t *, const char *);
         int (* unlink)(fs_node_t *, fs_node_t *, const char *);
+        int (* has_children)(bool *, fs_node_t *);
+        /*
+         * The second set of methods are usually mere getters that do not return
+         * an integer error code.
+         */
         fs_index_t (* index_get)(fs_node_t *);
         size_t (* size_get)(fs_node_t *);
-        unsigned (* lnkcnt_get)(fs_node_t *);
-        bool (* has_children)(fs_node_t *);
-        fs_node_t *(* root_get)(dev_handle_t);
+        unsigned int (* lnkcnt_get)(fs_node_t *);
         char (* plb_get_char)(unsigned pos);
         bool (* is_directory)(fs_node_t *);
         bool (* is_file)(fs_node_t *);
+        dev_handle_t (* device_get)(fs_node_t *);
 } libfs_ops_t;