Changeset eb13ef8 in mainline for uspace/lib/fs/libfs.c
- Timestamp:
- 2019-02-06T13:25:12Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- fafb8e5
- Parents:
- bb97118
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:04:02)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/fs/libfs.c
rbb97118 reb13ef8 79 79 static void vfs_out_fsprobe(ipc_call_t *req) 80 80 { 81 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);81 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 82 82 errno_t rc; 83 83 vfs_fs_probe_info_t info; … … 106 106 static void vfs_out_mounted(ipc_call_t *req) 107 107 { 108 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);108 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 109 109 char *opts; 110 110 errno_t rc; … … 132 132 static void vfs_out_unmounted(ipc_call_t *req) 133 133 { 134 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);134 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 135 135 errno_t rc; 136 136 … … 152 152 static void vfs_out_read(ipc_call_t *req) 153 153 { 154 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);155 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);156 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3( *req),157 IPC_GET_ARG4( *req));154 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 155 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 156 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(req), 157 IPC_GET_ARG4(req)); 158 158 size_t rbytes; 159 159 errno_t rc; … … 169 169 static void vfs_out_write(ipc_call_t *req) 170 170 { 171 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);172 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);173 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3( *req),174 IPC_GET_ARG4( *req));171 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 172 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 173 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(req), 174 IPC_GET_ARG4(req)); 175 175 size_t wbytes; 176 176 aoff64_t nsize; … … 188 188 static void vfs_out_truncate(ipc_call_t *req) 189 189 { 190 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);191 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);192 aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3( *req),193 IPC_GET_ARG4( *req));190 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 191 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 192 aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(req), 193 IPC_GET_ARG4(req)); 194 194 errno_t rc; 195 195 … … 201 201 static void vfs_out_close(ipc_call_t *req) 202 202 { 203 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);204 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);203 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 204 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 205 205 errno_t rc; 206 206 … … 212 212 static void vfs_out_destroy(ipc_call_t *req) 213 213 { 214 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);215 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);214 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 215 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 216 216 217 217 errno_t rc; … … 239 239 static void vfs_out_sync(ipc_call_t *req) 240 240 { 241 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);242 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);241 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 242 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 243 243 errno_t rc; 244 244 … … 255 255 static void vfs_out_is_empty(ipc_call_t *req) 256 256 { 257 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);258 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);257 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 258 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 259 259 errno_t rc; 260 260 … … 290 290 async_get_call(&call); 291 291 292 if (!IPC_GET_IMETHOD( call)) {292 if (!IPC_GET_IMETHOD(&call)) { 293 293 async_answer_0(&call, EOK); 294 294 return; 295 295 } 296 296 297 switch (IPC_GET_IMETHOD( call)) {297 switch (IPC_GET_IMETHOD(&call)) { 298 298 case VFS_OUT_FSPROBE: 299 299 vfs_out_fsprobe(&call); … … 424 424 */ 425 425 async_wait_for(req, NULL); 426 reg.fs_handle = (int) IPC_GET_ARG1( answer);427 428 return IPC_GET_RETVAL( answer);426 reg.fs_handle = (int) IPC_GET_ARG1(&answer); 427 428 return IPC_GET_RETVAL(&answer); 429 429 } 430 430 … … 490 490 void libfs_link(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req) 491 491 { 492 service_id_t parent_sid = IPC_GET_ARG1( *req);493 fs_index_t parent_index = IPC_GET_ARG2( *req);494 fs_index_t child_index = IPC_GET_ARG3( *req);492 service_id_t parent_sid = IPC_GET_ARG1(req); 493 fs_index_t parent_index = IPC_GET_ARG2(req); 494 fs_index_t child_index = IPC_GET_ARG3(req); 495 495 496 496 char component[NAME_MAX + 1]; … … 536 536 void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req) 537 537 { 538 unsigned first = IPC_GET_ARG1( *req);539 unsigned len = IPC_GET_ARG2( *req);540 service_id_t service_id = IPC_GET_ARG3( *req);541 fs_index_t index = IPC_GET_ARG4( *req);542 int lflag = IPC_GET_ARG5( *req);538 unsigned first = IPC_GET_ARG1(req); 539 unsigned len = IPC_GET_ARG2(req); 540 service_id_t service_id = IPC_GET_ARG3(req); 541 fs_index_t index = IPC_GET_ARG4(req); 542 int lflag = IPC_GET_ARG5(req); 543 543 544 544 // TODO: Validate flags. … … 716 716 void libfs_stat(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req) 717 717 { 718 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);719 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);718 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 719 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 720 720 721 721 fs_node_t *fn; … … 753 753 void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req) 754 754 { 755 service_id_t service_id = (service_id_t) IPC_GET_ARG1( *req);756 fs_index_t index = (fs_index_t) IPC_GET_ARG2( *req);755 service_id_t service_id = (service_id_t) IPC_GET_ARG1(req); 756 fs_index_t index = (fs_index_t) IPC_GET_ARG2(req); 757 757 758 758 fs_node_t *fn; … … 810 810 void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req) 811 811 { 812 service_id_t service_id = IPC_GET_ARG1( *req);813 fs_index_t index = IPC_GET_ARG2( *req);812 service_id_t service_id = IPC_GET_ARG1(req); 813 fs_index_t index = IPC_GET_ARG2(req); 814 814 815 815 fs_node_t *fn;
Note:
See TracChangeset
for help on using the changeset viewer.