Changeset eda925a in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-02-04T15:46:51Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d32358f

Parents:

b4cbef1

Message:

improve naming conventions:
merge async_data_receive() and async_string_receive() into async_data_write_accept()
rename async_data_void() to async_data_write_void()
rename async_data_forward_fast() to async_data_write_forward_fast()
rename async_data_forward_n_m to async_data_write_forward_n_m

File:

• uspace/srv/vfs/vfs_ops.c (modified) (11 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -267 +267 @@
         /* We want the client to send us the mount point. */
         char *mp;
-        int rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
+        int rc = async_data_write_accept((char **) &mp, true, 0, MAX_PATH_LEN,
+            0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -275 +276 @@
         /* Now we expect to receive the mount options. */
         char *opts;
-        rc = async_string_receive(&opts, MAX_MNTOPTS_LEN, NULL);
+        rc = async_data_write_accept((char **) &opts, true, 0, MAX_MNTOPTS_LEN,
+            0, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -287 +289 @@
          */
         char *fs_name;
-        rc = async_string_receive(&fs_name, FS_NAME_MAXLEN, NULL);
+        rc = async_data_write_accept((char **) &fs_name, true, 0, FS_NAME_MAXLEN,
+            0, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -357 +360 @@
          * Receive the mount point path.
          */
-        rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
+        rc = async_data_write_accept((char **) &mp, true, 0, MAX_PATH_LEN,
+            0, NULL);
         if (rc != EOK)
                 ipc_answer_0(rid, rc);
@@ -522 +526 @@
         
         char *path;
-        int rc = async_string_receive(&path, 0, NULL);
+        int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -836 +840 @@
                     &answer);
         } else {
-                rc = async_data_forward_3_1(fs_phone, VFS_OUT_WRITE,
+                rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
                     file->node->dev_handle, file->node->index, file->pos,
                     &answer);
@@ -1007 +1011 @@
 {
         char *path;
-        int rc = async_string_receive(&path, 0, NULL);
+        int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1061 +1065 @@
         
         char *path;
-        int rc = async_string_receive(&path, 0, NULL);
+        int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1083 +1087 @@
         
         char *path;
-        int rc = async_string_receive(&path, 0, NULL);
+        int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1118 +1122 @@
         /* Retrieve the old path. */
         char *old;
-        int rc = async_string_receive(&old, 0, NULL);
+        int rc = async_data_write_accept((char **) &old, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1126 +1130 @@
         /* Retrieve the new path. */
         char *new;
-        rc = async_string_receive(&new, 0, NULL);
+        rc = async_data_write_accept((char **) &new, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 free(old);