Changeset 84239b1 in mainline for uspace/srv

Timestamp:

2018-03-11T19:39:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3d47c97

Parents:

850fd32

Message:

And there was much fixing.

Location:

uspace/srv

Files:

• fs/mfs/mfs_ops.c (modified) (2 diffs)
• hid/rfb/rfb.h (modified) (1 diff)
• net/slip/slip.c (modified) (1 diff)
• vfs/vfs.h (modified) (2 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -825 +825 @@
 {
         errno_t rc;
+        errno_t tmp;
         fs_node_t *fn = NULL;
 
@@ -926 +927 @@
         return rc;
 out_error:
-        ;
-        errno_t tmp = mfs_node_put(fn);
+        tmp = mfs_node_put(fn);
         async_answer_0(callid, tmp != EOK ? tmp : rc);
         return tmp != EOK ? tmp : rc;

uspace/srv/hid/rfb/rfb.h

@@ -139 +139 @@
         uint16_t first_color;
         uint16_t color_count;
-} __attribute((packed)) rfb_set_color_map_entries_t;
+} __attribute__((packed)) rfb_set_color_map_entries_t;
 
 typedef struct {

uspace/srv/net/slip/slip.c

@@ -239 +239 @@
 
         while (true) {
-                for (sdu.size = 0; sdu.size < sizeof(recv_final); /**/) {
+                sdu.size = 0;
+                while (sdu.size < sizeof(recv_final)) {
                         ch = read_buffered(chardev);
                         switch (ch) {

uspace/srv/vfs/vfs.h

@@ -60 +60 @@
 } fs_info_t;
 
-/**
- * VFS_PAIR uniquely represents a file system instance.
- */
-#define VFS_PAIR \
-        fs_handle_t fs_handle; \
+/** Uniquely represents a file system instance. */
+typedef struct {
+        fs_handle_t fs_handle;
         service_id_t service_id;
-
-/**
- * VFS_TRIPLET uniquely identifies a file system node (e.g. directory, file) but
- * doesn't contain any state. For a stateful structure, see vfs_node_t.
+} vfs_pair_t;
+
+/** Uniquely identifies a file system node (e.g. directory, file)
+ * but doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
  * @note        fs_handle, service_id and index are meant to be returned in one
  *              IPC reply.
  */
-#define VFS_TRIPLET \
-        VFS_PAIR; \
+typedef struct {
+        fs_handle_t fs_handle;
+        service_id_t service_id;
         fs_index_t index;
-
-typedef struct {
-        VFS_PAIR;
-} vfs_pair_t;
-
-typedef struct {
-        VFS_TRIPLET;
 } vfs_triplet_t;
 
@@ -103 +95 @@
  */
 typedef struct _vfs_node {
-        VFS_TRIPLET;            /**< Identity of the node. */
+        /*
+         * Identity of the node
+         */
+
+        fs_handle_t fs_handle;
+        service_id_t service_id;
+        fs_index_t index;
 
         /**