Changeset b7fd2a0 in mainline for uspace/lib/nettl


Ignore:
Timestamp:
2018-01-13T03:10:29Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a53ed3a
Parents:
36f0738
Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:
uspace/lib/nettl
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/nettl/include/nettl/amap.h

    r36f0738 rb7fd2a0  
    9191} amap_flags_t;
    9292
    93 extern int amap_create(amap_t **);
     93extern errno_t amap_create(amap_t **);
    9494extern void amap_destroy(amap_t *);
    95 extern int amap_insert(amap_t *, inet_ep2_t *, void *, amap_flags_t,
     95extern errno_t amap_insert(amap_t *, inet_ep2_t *, void *, amap_flags_t,
    9696    inet_ep2_t *);
    9797extern void amap_remove(amap_t *, inet_ep2_t *);
    98 extern int amap_find_match(amap_t *, inet_ep2_t *, void **);
     98extern errno_t amap_find_match(amap_t *, inet_ep2_t *, void **);
    9999
    100100#endif

  • uspace/lib/nettl/include/nettl/portrng.h

    r36f0738 rb7fd2a0  
    5858} portrng_flags_t;
    5959
    60 extern int portrng_create(portrng_t **);
     60extern errno_t portrng_create(portrng_t **);
    6161extern void portrng_destroy(portrng_t *);
    62 extern int portrng_alloc(portrng_t *, uint16_t, void *,
     62extern errno_t portrng_alloc(portrng_t *, uint16_t, void *,
    6363    portrng_flags_t, uint16_t *);
    64 extern int portrng_find_port(portrng_t *, uint16_t, void **);
     64extern errno_t portrng_find_port(portrng_t *, uint16_t, void **);
    6565extern void portrng_free_port(portrng_t *, uint16_t);
    6666extern bool portrng_empty(portrng_t *);

  • uspace/lib/nettl/src/amap.c

    r36f0738 rb7fd2a0  
    8080 * @return EOk on success, ENOMEM if out of memory
    8181 */
    82 int amap_create(amap_t **rmap)
     82errno_t amap_create(amap_t **rmap)
    8383{
    8484        amap_t *map;
    85         int rc;
     85        errno_t rc;
    8686
    8787        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_create()");
    … …  
    131131 * @return EOK on success, ENOENT if not found
    132132 */
    133 static int amap_repla_find(amap_t *map, inet_ep_t *rep, inet_addr_t *la,
     133static errno_t amap_repla_find(amap_t *map, inet_ep_t *rep, inet_addr_t *la,
    134134    amap_repla_t **rrepla)
    135135{
    … …  
    175175 * @return EOK on success, ENOMEM if out of memory
    176176 */
    177 static int amap_repla_insert(amap_t *map, inet_ep_t *rep, inet_addr_t *la,
     177static errno_t amap_repla_insert(amap_t *map, inet_ep_t *rep, inet_addr_t *la,
    178178    amap_repla_t **rrepla)
    179179{
    180180        amap_repla_t *repla;
    181         int rc;
     181        errno_t rc;
    182182
    183183        repla = calloc(1, sizeof(amap_repla_t));
    … …  
    225225 * @return EOK on success, ENOENT if not found.
    226226 */
    227 static int amap_laddr_find(amap_t *map, inet_addr_t *addr,
     227static errno_t amap_laddr_find(amap_t *map, inet_addr_t *addr,
    228228    amap_laddr_t **rladdr)
    229229{
    … …  
    248248 * @return EOK on success, ENOMEM if out of memory
    249249 */
    250 static int amap_laddr_insert(amap_t *map, inet_addr_t *addr,
     250static errno_t amap_laddr_insert(amap_t *map, inet_addr_t *addr,
    251251    amap_laddr_t **rladdr)
    252252{
    253253        amap_laddr_t *laddr;
    254         int rc;
     254        errno_t rc;
    255255
    256256        laddr = calloc(1, sizeof(amap_laddr_t));
    … …  
    297297 * @return EOK on success, ENOENT if not found.
    298298 */
    299 static int amap_llink_find(amap_t *map, sysarg_t link_id,
     299static errno_t amap_llink_find(amap_t *map, sysarg_t link_id,
    300300    amap_llink_t **rllink)
    301301{
    … …  
    320320 * @return EOK on success, ENOMEM if out of memory
    321321 */
    322 static int amap_llink_insert(amap_t *map, sysarg_t link_id,
     322static errno_t amap_llink_insert(amap_t *map, sysarg_t link_id,
    323323    amap_llink_t **rllink)
    324324{
    325325        amap_llink_t *llink;
    326         int rc;
     326        errno_t rc;
    327327
    328328        llink = calloc(1, sizeof(amap_llink_t));
    … …  
    372372 *         ENOMEM if out of memory
    373373 */
    374 static int amap_insert_repla(amap_t *map, inet_ep2_t *epp, void *arg,
     374static errno_t amap_insert_repla(amap_t *map, inet_ep2_t *epp, void *arg,
    375375    amap_flags_t flags, inet_ep2_t *aepp)
    376376{
    377377        amap_repla_t *repla;
    378378        inet_ep2_t mepp;
    379         int rc;
     379        errno_t rc;
    380380
    381381        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_insert_repla()");
    … …  
    417417 *         ENOMEM if out of memory
    418418 */
    419 static int amap_insert_laddr(amap_t *map, inet_ep2_t *epp, void *arg,
     419static errno_t amap_insert_laddr(amap_t *map, inet_ep2_t *epp, void *arg,
    420420    amap_flags_t flags, inet_ep2_t *aepp)
    421421{
    422422        amap_laddr_t *laddr;
    423423        inet_ep2_t mepp;
    424         int rc;
     424        errno_t rc;
    425425
    426426        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_insert_laddr()");
    … …  
    461461 *         ENOMEM if out of memory
    462462 */
    463 static int amap_insert_llink(amap_t *map, inet_ep2_t *epp, void *arg,
     463static errno_t amap_insert_llink(amap_t *map, inet_ep2_t *epp, void *arg,
    464464    amap_flags_t flags, inet_ep2_t *aepp)
    465465{
    466466        amap_llink_t *llink;
    467467        inet_ep2_t mepp;
    468         int rc;
     468        errno_t rc;
    469469
    470470        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_insert_llink()");
    … …  
    505505 *         ENOMEM if out of memory
    506506 */
    507 static int amap_insert_unspec(amap_t *map, inet_ep2_t *epp, void *arg,
     507static errno_t amap_insert_unspec(amap_t *map, inet_ep2_t *epp, void *arg,
    508508    amap_flags_t flags, inet_ep2_t *aepp)
    509509{
    510510        inet_ep2_t mepp;
    511         int rc;
     511        errno_t rc;
    512512
    513513        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_insert_unspec()");
    … …  
    538538 *         ENOMEM if out of memory
    539539 */
    540 int amap_insert(amap_t *map, inet_ep2_t *epp, void *arg, amap_flags_t flags,
     540errno_t amap_insert(amap_t *map, inet_ep2_t *epp, void *arg, amap_flags_t flags,
    541541    inet_ep2_t *aepp)
    542542{
    543543        bool raddr, rport, laddr, llink;
    544544        inet_ep2_t mepp;
    545         int rc;
     545        errno_t rc;
    546546
    547547        log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_insert()");
    … …  
    599599{
    600600        amap_repla_t *repla;
    601         int rc;
     601        errno_t rc;
    602602
    603603        rc = amap_repla_find(map, &epp->remote, &epp->local.addr, &repla);
    … …  
    624624{
    625625        amap_laddr_t *laddr;
    626         int rc;
     626        errno_t rc;
    627627
    628628        rc = amap_laddr_find(map, &epp->local.addr, &laddr);
    … …  
    649649{
    650650        amap_llink_t *llink;
    651         int rc;
     651        errno_t rc;
    652652
    653653        rc = amap_llink_find(map, epp->local_link, &llink);
    … …  
    721721 * @return      EOK on success, ENOENT if not found.
    722722 */
    723 int amap_find_match(amap_t *map, inet_ep2_t *epp, void **rarg)
    724 {
    725         int rc;
     723errno_t amap_find_match(amap_t *map, inet_ep2_t *epp, void **rarg)
     724{
     725        errno_t rc;
    726726        amap_repla_t *repla;
    727727        amap_laddr_t *laddr;

  • uspace/lib/nettl/src/portrng.c

    r36f0738 rb7fd2a0  
    5151 * @return EOK on success, ENOMEM if out of memory
    5252 */
    53 int portrng_create(portrng_t **rpr)
     53errno_t portrng_create(portrng_t **rpr)
    5454{
    5555        portrng_t *pr;
    … …  
    9393 *         @c pf_allow_system was not set.
    9494 */
    95 int portrng_alloc(portrng_t *pr, uint16_t pnum, void *arg,
     95errno_t portrng_alloc(portrng_t *pr, uint16_t pnum, void *arg,
    9696    portrng_flags_t flags, uint16_t *apnum)
    9797{
    … …  
    163163 * @return EOK on success, ENOENT if specified port number is not allocated
    164164 */
    165 int portrng_find_port(portrng_t *pr, uint16_t pnum, void **rarg)
     165errno_t portrng_find_port(portrng_t *pr, uint16_t pnum, void **rarg)
    166166{
    167167        list_foreach(pr->used, lprng, portrng_port_t, port) {
Note: See TracChangeset for help on using the changeset viewer.