Changeset 2b3dd78 in mainline for uspace/lib/fs/libfs.h

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/fs/libfs.h (modified) (2 diffs)

uspace/lib/fs/libfs.h

@@ -43 +43 @@
 
 typedef struct {
-        errno_t (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
-        errno_t (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
-        errno_t (* unmounted)(service_id_t);
-        errno_t (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);
-        errno_t (* write)(service_id_t, fs_index_t, aoff64_t, size_t *,
+        errno_t (*fsprobe)(service_id_t, vfs_fs_probe_info_t *);
+        errno_t (*mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
+        errno_t (*unmounted)(service_id_t);
+        errno_t (*read)(service_id_t, fs_index_t, aoff64_t, size_t *);
+        errno_t (*write)(service_id_t, fs_index_t, aoff64_t, size_t *,
             aoff64_t *);
-        errno_t (* truncate)(service_id_t, fs_index_t, aoff64_t);
-        errno_t (* close)(service_id_t, fs_index_t);
-        errno_t (* destroy)(service_id_t, fs_index_t);
-        errno_t (* sync)(service_id_t, fs_index_t);
+        errno_t (*truncate)(service_id_t, fs_index_t, aoff64_t);
+        errno_t (*close)(service_id_t, fs_index_t);
+        errno_t (*destroy)(service_id_t, fs_index_t);
+        errno_t (*sync)(service_id_t, fs_index_t);
 } vfs_out_ops_t;
 
@@ -65 +65 @@
          * argument holds the output argument.
          */
-        errno_t (* root_get)(fs_node_t **, service_id_t);
-        errno_t (* match)(fs_node_t **, fs_node_t *, const char *);
-        errno_t (* node_get)(fs_node_t **, service_id_t, fs_index_t);
-        errno_t (* node_open)(fs_node_t *);
-        errno_t (* node_put)(fs_node_t *);
-        errno_t (* create)(fs_node_t **, service_id_t, int);
-        errno_t (* destroy)(fs_node_t *);
-        errno_t (* link)(fs_node_t *, fs_node_t *, const char *);
-        errno_t (* unlink)(fs_node_t *, fs_node_t *, const char *);
-        errno_t (* has_children)(bool *, fs_node_t *);
+        errno_t (*root_get)(fs_node_t **, service_id_t);
+        errno_t (*match)(fs_node_t **, fs_node_t *, const char *);
+        errno_t (*node_get)(fs_node_t **, service_id_t, fs_index_t);
+        errno_t (*node_open)(fs_node_t *);
+        errno_t (*node_put)(fs_node_t *);
+        errno_t (*create)(fs_node_t **, service_id_t, int);
+        errno_t (*destroy)(fs_node_t *);
+        errno_t (*link)(fs_node_t *, fs_node_t *, const char *);
+        errno_t (*unlink)(fs_node_t *, fs_node_t *, const char *);
+        errno_t (*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 *);
-        aoff64_t (* size_get)(fs_node_t *);
-        unsigned int (* lnkcnt_get)(fs_node_t *);
-        bool (* is_directory)(fs_node_t *);
-        bool (* is_file)(fs_node_t *);
-        service_id_t (* service_get)(fs_node_t *);
-        errno_t (* size_block)(service_id_t, uint32_t *);
-        errno_t (* total_block_count)(service_id_t, uint64_t *);
-        errno_t (* free_block_count)(service_id_t, uint64_t *);
+        fs_index_t (*index_get)(fs_node_t *);
+        aoff64_t (*size_get)(fs_node_t *);
+        unsigned int (*lnkcnt_get)(fs_node_t *);
+        bool (*is_directory)(fs_node_t *);
+        bool (*is_file)(fs_node_t *);
+        service_id_t (*service_get)(fs_node_t *);
+        errno_t (*size_block)(service_id_t, uint32_t *);
+        errno_t (*total_block_count)(service_id_t, uint64_t *);
+        errno_t (*free_block_count)(service_id_t, uint64_t *);
 } libfs_ops_t;