Changeset 472c09d in mainline for uspace/srv/fs

Timestamp:

2010-02-03T15:18:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b4cbef1

Parents:

28be7fa

Message:

more consistent naming scheme:

async_data_blob_receive → async_data_receive
async_data_string_receive → async_string_receive
CLIPBOARD_TAG_BLOB → CLIPBOARD_TAG_DATA

async_data_receive can now check the granularity of the received data
async_string_receive can now return the raw size of the received data

replace several common patterns of async_data_write_receive/_finalize
with a single async_data_receive/_string_receive (this greatly improves
code readability)

Location:

uspace/srv/fs

Files:

• devfs/devfs_ops.c (modified) (1 diff)
• fat/fat_ops.c (modified) (1 diff)
• tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/srv/fs/devfs/devfs_ops.c

@@ -419 +419 @@
         
         /* Accept the mount options */
-        ipcarg_t retval = async_data_string_receive(&opts, 0);
+        ipcarg_t retval = async_string_receive(&opts, 0, NULL);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);

uspace/srv/fs/fat/fat_ops.c

@@ -974 +974 @@
         uint16_t bps;
         uint16_t rde;
-        int rc;
-
-        /* accept the mount options */
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        char *opts = malloc(size + 1);
-        if (!opts) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
-        if (retval != EOK) {
-                ipc_answer_0(rid, retval);
-                free(opts);
-                return;
-        }
-        opts[size] = '\0';
+        
+        /* Accept the mount options */
+        char *opts;
+        int rc = async_string_receive(&opts, 0, NULL);
+        
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
+                return;
+        }
 
         /* Check for option enabling write through. */

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -439 +439 @@
 {
         dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-        int rc;
-
-        /* accept the mount options */
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        char *opts = malloc(size + 1);
-        if (!opts) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
-        if (retval != EOK) {
-                ipc_answer_0(rid, retval);
-                free(opts);
-                return;
-        }
-        opts[size] = '\0';
+        
+        /* Accept the mount options */
+        char *opts;
+        int rc = async_string_receive(&opts, 0, NULL);
+        
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
+                return;
+        }
 
         /* Initialize TMPFS instance. */