Changeset b7fd2a0 in mainline for uspace/lib/c/generic/loc.c
- Timestamp:
- 2018-01-13T03:10:29Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a53ed3a
- Parents:
- 36f0738
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/loc.c
r36f0738 rb7fd2a0 103 103 * 104 104 */ 105 static int loc_callback_create(void)105 static errno_t loc_callback_create(void) 106 106 { 107 107 if (!loc_callback_created) { … … 113 113 114 114 port_id_t port; 115 int rc = async_create_callback_port(exch, INTERFACE_LOC_CB, 0, 0,115 errno_t rc = async_create_callback_port(exch, INTERFACE_LOC_CB, 0, 0, 116 116 loc_cb_conn, NULL, &port); 117 117 … … 121 121 return rc; 122 122 123 int retval;123 errno_t retval; 124 124 async_wait_for(req, &retval); 125 125 if (retval != EOK) … … 239 239 240 240 /** Register new driver with loc. */ 241 int loc_server_register(const char *name)241 errno_t loc_server_register(const char *name) 242 242 { 243 243 async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 245 245 ipc_call_t answer; 246 246 aid_t req = async_send_2(exch, LOC_SERVER_REGISTER, 0, 0, &answer); 247 int retval = async_data_write_start(exch, name, str_size(name));247 errno_t retval = async_data_write_start(exch, name, str_size(name)); 248 248 249 249 if (retval != EOK) { … … 272 272 * 273 273 */ 274 int loc_service_register(const char *fqsn, service_id_t *sid)274 errno_t loc_service_register(const char *fqsn, service_id_t *sid) 275 275 { 276 276 async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 278 278 ipc_call_t answer; 279 279 aid_t req = async_send_0(exch, LOC_SERVICE_REGISTER, &answer); 280 int retval = async_data_write_start(exch, fqsn, str_size(fqsn));280 errno_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); 281 281 282 282 if (retval != EOK) { … … 311 311 * @param sid Service ID 312 312 */ 313 int loc_service_unregister(service_id_t sid)313 errno_t loc_service_unregister(service_id_t sid) 314 314 { 315 315 async_exch_t *exch; 316 int retval;316 errno_t retval; 317 317 318 318 exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 320 320 loc_exchange_end(exch); 321 321 322 return ( int)retval;323 } 324 325 int loc_service_get_id(const char *fqdn, service_id_t *handle,322 return (errno_t)retval; 323 } 324 325 errno_t loc_service_get_id(const char *fqdn, service_id_t *handle, 326 326 unsigned int flags) 327 327 { … … 339 339 aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0, 340 340 &answer); 341 int retval = async_data_write_start(exch, fqdn, str_size(fqdn));341 errno_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); 342 342 343 343 loc_exchange_end(exch); … … 373 373 * @return EOK on success or an error code 374 374 */ 375 static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name)375 static errno_t loc_get_name_internal(sysarg_t method, sysarg_t id, char **name) 376 376 { 377 377 async_exch_t *exch; … … 379 379 ipc_call_t dreply; 380 380 size_t act_size; 381 int dretval;381 errno_t dretval; 382 382 383 383 *name = NULL; … … 397 397 } 398 398 399 int retval;399 errno_t retval; 400 400 async_wait_for(req, &retval); 401 401 … … 423 423 * @return EOK on success or an error code 424 424 */ 425 int loc_category_get_name(category_id_t cat_id, char **name)425 errno_t loc_category_get_name(category_id_t cat_id, char **name) 426 426 { 427 427 return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name); … … 437 437 * @return EOK on success or an error code 438 438 */ 439 int loc_service_get_name(service_id_t svc_id, char **name)439 errno_t loc_service_get_name(service_id_t svc_id, char **name) 440 440 { 441 441 return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name); … … 451 451 * @return EOK on success or an error code 452 452 */ 453 int loc_service_get_server_name(service_id_t svc_id, char **name)453 errno_t loc_service_get_server_name(service_id_t svc_id, char **name) 454 454 { 455 455 return loc_get_name_internal(LOC_SERVICE_GET_SERVER_NAME, svc_id, name); 456 456 } 457 457 458 int loc_namespace_get_id(const char *name, service_id_t *handle,458 errno_t loc_namespace_get_id(const char *name, service_id_t *handle, 459 459 unsigned int flags) 460 460 { … … 472 472 aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0, 473 473 &answer); 474 int retval = async_data_write_start(exch, name, str_size(name));474 errno_t retval = async_data_write_start(exch, name, str_size(name)); 475 475 476 476 loc_exchange_end(exch); … … 505 505 * @return EOK on success or an error code 506 506 */ 507 int loc_category_get_id(const char *name, category_id_t *cat_id,507 errno_t loc_category_get_id(const char *name, category_id_t *cat_id, 508 508 unsigned int flags) 509 509 { … … 521 521 aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID, 522 522 &answer); 523 int retval = async_data_write_start(exch, name, str_size(name));523 errno_t retval = async_data_write_start(exch, name, str_size(name)); 524 524 525 525 loc_exchange_end(exch); … … 551 551 552 552 sysarg_t type; 553 int retval = async_req_1_1(exch, LOC_ID_PROBE, handle, &type);553 errno_t retval = async_req_1_1(exch, LOC_ID_PROBE, handle, &type); 554 554 555 555 loc_exchange_end(exch); … … 582 582 583 583 sysarg_t null_id; 584 int retval = async_req_0_1(exch, LOC_NULL_CREATE, &null_id);584 errno_t retval = async_req_0_1(exch, LOC_NULL_CREATE, &null_id); 585 585 586 586 loc_exchange_end(exch); … … 602 602 { 603 603 sysarg_t count; 604 int retval = async_req_0_1(exch, LOC_GET_NAMESPACE_COUNT, &count);604 errno_t retval = async_req_0_1(exch, LOC_GET_NAMESPACE_COUNT, &count); 605 605 if (retval != EOK) 606 606 return 0; … … 615 615 * @return EOK on success or an error code 616 616 */ 617 int loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id)617 errno_t loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id) 618 618 { 619 619 async_exch_t *exch; 620 int retval;620 errno_t retval; 621 621 622 622 exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 631 631 { 632 632 sysarg_t count; 633 int retval = async_req_1_1(exch, LOC_GET_SERVICE_COUNT, ns_handle,633 errno_t retval = async_req_1_1(exch, LOC_GET_SERVICE_COUNT, ns_handle, 634 634 &count); 635 635 if (retval != EOK) … … 676 676 ipc_call_t answer; 677 677 aid_t req = async_send_0(exch, LOC_GET_NAMESPACES, &answer); 678 int rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t));678 errno_t rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); 679 679 680 680 loc_exchange_end(exch); … … 695 695 } 696 696 697 int retval;697 errno_t retval; 698 698 async_wait_for(req, &retval); 699 699 … … 725 725 ipc_call_t answer; 726 726 aid_t req = async_send_1(exch, LOC_GET_SERVICES, ns_handle, &answer); 727 int rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t));727 errno_t rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); 728 728 729 729 loc_exchange_end(exch); … … 744 744 } 745 745 746 int retval;746 errno_t retval; 747 747 async_wait_for(req, &retval); 748 748 … … 755 755 } 756 756 757 static int loc_category_get_ids_once(sysarg_t method, sysarg_t arg1,757 static errno_t loc_category_get_ids_once(sysarg_t method, sysarg_t arg1, 758 758 sysarg_t *id_buf, size_t buf_size, size_t *act_size) 759 759 { … … 762 762 ipc_call_t answer; 763 763 aid_t req = async_send_1(exch, method, arg1, &answer); 764 int rc = async_data_read_start(exch, id_buf, buf_size);764 errno_t rc = async_data_read_start(exch, id_buf, buf_size); 765 765 766 766 loc_exchange_end(exch); … … 771 771 } 772 772 773 int retval;773 errno_t retval; 774 774 async_wait_for(req, &retval); 775 775 … … 792 792 * @return EOK on success or an error code 793 793 */ 794 static int loc_get_ids_internal(sysarg_t method, sysarg_t arg1,794 static errno_t loc_get_ids_internal(sysarg_t method, sysarg_t arg1, 795 795 sysarg_t **data, size_t *count) 796 796 { … … 799 799 800 800 size_t act_size = 0; 801 int rc = loc_category_get_ids_once(method, arg1, NULL, 0,801 errno_t rc = loc_category_get_ids_once(method, arg1, NULL, 0, 802 802 &act_size); 803 803 if (rc != EOK) … … 838 838 * @return EOK on success or an error code 839 839 */ 840 int loc_category_get_svcs(category_id_t cat_id, service_id_t **data,840 errno_t loc_category_get_svcs(category_id_t cat_id, service_id_t **data, 841 841 size_t *count) 842 842 { … … 853 853 * @return EOK on success or an error code 854 854 */ 855 int loc_get_categories(category_id_t **data, size_t *count)855 errno_t loc_get_categories(category_id_t **data, size_t *count) 856 856 { 857 857 return loc_get_ids_internal(LOC_GET_CATEGORIES, 0, … … 859 859 } 860 860 861 int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)861 errno_t loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun) 862 862 { 863 863 fibril_mutex_lock(&loc_callback_mutex);
Note:
See TracChangeset
for help on using the changeset viewer.