Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/loc.c

    rcde999a r0239846  
    3636#include <async.h>
    3737#include <errno.h>
    38 #include <stdlib.h>
     38#include <malloc.h>
    3939#include <stdbool.h>
    4040
     
    121121                        return rc;
    122122               
    123                 int retval;
     123                sysarg_t retval;
    124124                async_wait_for(req, &retval);
    125125                if (retval != EOK)
     
    245245        ipc_call_t answer;
    246246        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));
    248248       
    249249        if (retval != EOK) {
     
    278278        ipc_call_t answer;
    279279        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));
    281281       
    282282        if (retval != EOK) {
     
    314314{
    315315        async_exch_t *exch;
    316         int retval;
     316        sysarg_t retval;
    317317       
    318318        exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
     
    339339        aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0,
    340340            &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));
    342342       
    343343        loc_exchange_end(exch);
     
    371371 * @param name          Place to store pointer to new string. Caller should
    372372 *                      free it using free().
    373  * @return              EOK on success or an error code
     373 * @return              EOK on success or negative error code
    374374 */
    375375static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name)
     
    379379        ipc_call_t dreply;
    380380        size_t act_size;
    381         int dretval;
     381        sysarg_t dretval;
    382382       
    383383        *name = NULL;
     
    397397        }
    398398       
    399         int retval;
     399        sysarg_t retval;
    400400        async_wait_for(req, &retval);
    401401       
     
    421421 * @param name          Place to store pointer to new string. Caller should
    422422 *                      free it using free().
    423  * @return              EOK on success or an error code
     423 * @return              EOK on success or negative error code
    424424 */
    425425int loc_category_get_name(category_id_t cat_id, char **name)
     
    435435 * @param name          Place to store pointer to new string. Caller should
    436436 *                      free it using free().
    437  * @return              EOK on success or an error code
     437 * @return              EOK on success or negative error code
    438438 */
    439439int loc_service_get_name(service_id_t svc_id, char **name)
     
    449449 * @param name          Place to store pointer to new string. Caller should
    450450 *                      free it using free().
    451  * @return              EOK on success or an error code
     451 * @return              EOK on success or negative error code
    452452 */
    453453int loc_service_get_server_name(service_id_t svc_id, char **name)
     
    472472        aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0,
    473473            &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));
    475475       
    476476        loc_exchange_end(exch);
     
    503503 * @param cat_id        Place to store ID
    504504 * @param flags         IPC_FLAG_BLOCKING to wait for location service to start
    505  * @return              EOK on success or an error code
     505 * @return              EOK on success or negative error code
    506506 */
    507507int loc_category_get_id(const char *name, category_id_t *cat_id,
     
    521521        aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID,
    522522            &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));
    524524       
    525525        loc_exchange_end(exch);
     
    574574}
    575575
    576 /**
    577  * @return ID of a new NULL device, or -1 if failed.
    578  */
    579576int loc_null_create(void)
    580577{
     
    613610 * @param svc_id        Service ID
    614611 * @param cat_id        Category ID
    615  * @return              EOK on success or an error code
     612 * @return              EOK on success or negative error code
    616613 */
    617614int loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id)
    618615{
    619616        async_exch_t *exch;
    620         int retval;
     617        sysarg_t retval;
    621618       
    622619        exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
     
    695692                }
    696693               
    697                 int retval;
     694                sysarg_t retval;
    698695                async_wait_for(req, &retval);
    699696               
     
    744741                }
    745742               
    746                 int retval;
     743                sysarg_t retval;
    747744                async_wait_for(req, &retval);
    748745               
     
    771768        }
    772769       
    773         int retval;
     770        sysarg_t retval;
    774771        async_wait_for(req, &retval);
    775772       
     
    790787 * @param data          Place to store pointer to array of IDs
    791788 * @param count         Place to store number of IDs
    792  * @return              EOK on success or an error code
     789 * @return              EOK on success or negative error code
    793790 */
    794791static int loc_get_ids_internal(sysarg_t method, sysarg_t arg1,
     
    836833 * @param data          Place to store pointer to array of IDs
    837834 * @param count         Place to store number of IDs
    838  * @return              EOK on success or an error code
     835 * @return              EOK on success or negative error code
    839836 */
    840837int loc_category_get_svcs(category_id_t cat_id, service_id_t **data,
     
    851848 * @param data          Place to store pointer to array of IDs
    852849 * @param count         Place to store number of IDs
    853  * @return              EOK on success or an error code
     850 * @return              EOK on success or negative error code
    854851 */
    855852int loc_get_categories(category_id_t **data, size_t *count)
Note: See TracChangeset for help on using the changeset viewer.