Changes in uspace/lib/c/generic/loc.c [cde999a:0239846] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/loc.c
rcde999a r0239846 36 36 #include <async.h> 37 37 #include <errno.h> 38 #include < stdlib.h>38 #include <malloc.h> 39 39 #include <stdbool.h> 40 40 … … 121 121 return rc; 122 122 123 int retval;123 sysarg_t retval; 124 124 async_wait_for(req, &retval); 125 125 if (retval != EOK) … … 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 sysarg_t retval = async_data_write_start(exch, name, str_size(name)); 248 248 249 249 if (retval != EOK) { … … 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 sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); 281 281 282 282 if (retval != EOK) { … … 314 314 { 315 315 async_exch_t *exch; 316 int retval;316 sysarg_t retval; 317 317 318 318 exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 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 sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); 342 342 343 343 loc_exchange_end(exch); … … 371 371 * @param name Place to store pointer to new string. Caller should 372 372 * free it using free(). 373 * @return EOK on success or anerror code373 * @return EOK on success or negative error code 374 374 */ 375 375 static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name) … … 379 379 ipc_call_t dreply; 380 380 size_t act_size; 381 int dretval;381 sysarg_t dretval; 382 382 383 383 *name = NULL; … … 397 397 } 398 398 399 int retval;399 sysarg_t retval; 400 400 async_wait_for(req, &retval); 401 401 … … 421 421 * @param name Place to store pointer to new string. Caller should 422 422 * free it using free(). 423 * @return EOK on success or anerror code423 * @return EOK on success or negative error code 424 424 */ 425 425 int loc_category_get_name(category_id_t cat_id, char **name) … … 435 435 * @param name Place to store pointer to new string. Caller should 436 436 * free it using free(). 437 * @return EOK on success or anerror code437 * @return EOK on success or negative error code 438 438 */ 439 439 int loc_service_get_name(service_id_t svc_id, char **name) … … 449 449 * @param name Place to store pointer to new string. Caller should 450 450 * free it using free(). 451 * @return EOK on success or anerror code451 * @return EOK on success or negative error code 452 452 */ 453 453 int loc_service_get_server_name(service_id_t svc_id, char **name) … … 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 sysarg_t retval = async_data_write_start(exch, name, str_size(name)); 475 475 476 476 loc_exchange_end(exch); … … 503 503 * @param cat_id Place to store ID 504 504 * @param flags IPC_FLAG_BLOCKING to wait for location service to start 505 * @return EOK on success or anerror code505 * @return EOK on success or negative error code 506 506 */ 507 507 int loc_category_get_id(const char *name, category_id_t *cat_id, … … 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 sysarg_t retval = async_data_write_start(exch, name, str_size(name)); 524 524 525 525 loc_exchange_end(exch); … … 574 574 } 575 575 576 /**577 * @return ID of a new NULL device, or -1 if failed.578 */579 576 int loc_null_create(void) 580 577 { … … 613 610 * @param svc_id Service ID 614 611 * @param cat_id Category ID 615 * @return EOK on success or anerror code612 * @return EOK on success or negative error code 616 613 */ 617 614 int loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id) 618 615 { 619 616 async_exch_t *exch; 620 int retval;617 sysarg_t retval; 621 618 622 619 exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); … … 695 692 } 696 693 697 int retval;694 sysarg_t retval; 698 695 async_wait_for(req, &retval); 699 696 … … 744 741 } 745 742 746 int retval;743 sysarg_t retval; 747 744 async_wait_for(req, &retval); 748 745 … … 771 768 } 772 769 773 int retval;770 sysarg_t retval; 774 771 async_wait_for(req, &retval); 775 772 … … 790 787 * @param data Place to store pointer to array of IDs 791 788 * @param count Place to store number of IDs 792 * @return EOK on success or anerror code789 * @return EOK on success or negative error code 793 790 */ 794 791 static int loc_get_ids_internal(sysarg_t method, sysarg_t arg1, … … 836 833 * @param data Place to store pointer to array of IDs 837 834 * @param count Place to store number of IDs 838 * @return EOK on success or anerror code835 * @return EOK on success or negative error code 839 836 */ 840 837 int loc_category_get_svcs(category_id_t cat_id, service_id_t **data, … … 851 848 * @param data Place to store pointer to array of IDs 852 849 * @param count Place to store number of IDs 853 * @return EOK on success or anerror code850 * @return EOK on success or negative error code 854 851 */ 855 852 int loc_get_categories(category_id_t **data, size_t *count)
Note:
See TracChangeset
for help on using the changeset viewer.