Changeset ff381a7 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2015-11-02T20:54:19Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/srv/vfs/vfs_register.c (modified) (4 diffs)

uspace/srv/vfs/vfs_register.c

@@ -113 +113 @@
 void vfs_register(ipc_callid_t rid, ipc_call_t *request)
 {
-        dprintf("Processing VFS_REGISTER request received from %p.\n",
+        dprintf("Processing VFS_REGISTER request received from %zx.\n",
             request->in_phone_hash);
         
@@ -162 +162 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(rid, EEXISTS);
+                async_answer_0(rid, EEXIST);
                 return;
         }
@@ -196 +196 @@
         ipc_callid_t callid;
         if (!async_share_in_receive(&callid, &size)) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
+                dprintf("Unexpected call\n");
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_list_lock);
@@ -210 +210 @@
          */
         if (size != PLB_SIZE) {
-                dprintf("Client suggests wrong size of PFB, size = %d\n", size);
+                dprintf("Client suggests wrong size of PFB, size = %zu\n", size);
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_list_lock);