Changeset b7fd2a0 in mainline for uspace/drv/root


Ignore:
Timestamp:
2018-01-13T03:10:29Z (8 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/drv/root
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/root/root/root.c

    r36f0738 rb7fd2a0  
    6464#define VIRTUAL_FUN_MATCH_SCORE 100
    6565
    66 static int root_dev_add(ddf_dev_t *dev);
    67 static int root_fun_online(ddf_fun_t *fun);
    68 static int root_fun_offline(ddf_fun_t *fun);
     66static errno_t root_dev_add(ddf_dev_t *dev);
     67static errno_t root_fun_online(ddf_fun_t *fun);
     68static errno_t root_fun_offline(ddf_fun_t *fun);
    6969
    7070/** The root device driver's standard operations. */
    … …  
    8686 * @return      EOK on success or an error code
    8787 */
    88 static int add_virtual_root_fun(ddf_dev_t *dev)
     88static errno_t add_virtual_root_fun(ddf_dev_t *dev)
    8989{
    9090        const char *name = VIRTUAL_FUN_NAME;
    9191        ddf_fun_t *fun;
    92         int rc;
     92        errno_t rc;
    9393
    9494        ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. "
    … …  
    127127 * @return      EOK on success or an error code
    128128 */
    129 static int add_platform_fun(ddf_dev_t *dev)
     129static errno_t add_platform_fun(ddf_dev_t *dev)
    130130{
    131131        char *match_id;
    … …  
    135135        const char *name = PLATFORM_FUN_NAME;
    136136        ddf_fun_t *fun;
    137         int rc;
     137        errno_t rc;
    138138
    139139        /* Get platform name from sysinfo. */
    … …  
    201201 *                      of HW and pseudo devices).
    202202 */
    203 static int root_dev_add(ddf_dev_t *dev)
     203static errno_t root_dev_add(ddf_dev_t *dev)
    204204{
    205205        ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
    … …  
    211211         * vital for the system.
    212212         */
    213         int res = add_virtual_root_fun(dev);
     213        errno_t res = add_virtual_root_fun(dev);
    214214        if (res != EOK)
    215215                ddf_msg(LVL_WARN, "Failed to add virtual child.");
    … …  
    223223}
    224224
    225 static int root_fun_online(ddf_fun_t *fun)
     225static errno_t root_fun_online(ddf_fun_t *fun)
    226226{
    227227        ddf_msg(LVL_DEBUG, "root_fun_online()");
    … …  
    229229}
    230230
    231 static int root_fun_offline(ddf_fun_t *fun)
     231static errno_t root_fun_offline(ddf_fun_t *fun)
    232232{
    233233        ddf_msg(LVL_DEBUG, "root_fun_offline()");

  • uspace/drv/root/virt/virt.c

    r36f0738 rb7fd2a0  
    6262};
    6363
    64 static int virt_dev_add(ddf_dev_t *dev);
    65 static int virt_dev_remove(ddf_dev_t *dev);
    66 static int virt_fun_online(ddf_fun_t *fun);
    67 static int virt_fun_offline(ddf_fun_t *fun);
     64static errno_t virt_dev_add(ddf_dev_t *dev);
     65static errno_t virt_dev_remove(ddf_dev_t *dev);
     66static errno_t virt_fun_online(ddf_fun_t *fun);
     67static errno_t virt_fun_offline(ddf_fun_t *fun);
    6868
    6969static driver_ops_t virt_ops = {
    … …  
    100100 * @return              EOK on success or an error code.
    101101 */
    102 static int virt_add_fun(virt_t *virt, virtual_function_t *vfun)
     102static errno_t virt_add_fun(virt_t *virt, virtual_function_t *vfun)
    103103{
    104104        ddf_dev_t *vdev = virt->dev;
    105105        ddf_fun_t *fun;
    106106        virt_fun_t *rvfun;
    107         int rc;
     107        errno_t rc;
    108108
    109109        ddf_msg(LVL_DEBUG, "Registering function `%s' (match \"%s\")",
    … …  
    148148}
    149149
    150 static int virt_fun_remove(virt_fun_t *rvfun)
    151 {
    152         int rc;
     150static errno_t virt_fun_remove(virt_fun_t *rvfun)
     151{
     152        errno_t rc;
    153153        const char *name = ddf_fun_get_name(rvfun->fun);
    154154
    … …  
    172172
    173173
    174 static int virt_dev_add(ddf_dev_t *dev)
     174static errno_t virt_dev_add(ddf_dev_t *dev)
    175175{
    176176        virt_t *virt;
    … …  
    205205}
    206206
    207 static int virt_dev_remove(ddf_dev_t *dev)
     207static errno_t virt_dev_remove(ddf_dev_t *dev)
    208208{
    209209        virt_t *virt = (virt_t *)ddf_dev_data_get(dev);
    210         int rc;
     210        errno_t rc;
    211211
    212212        while (!list_empty(&virt->functions)) {
    … …  
    224224}
    225225
    226 static int virt_fun_online(ddf_fun_t *fun)
     226static errno_t virt_fun_online(ddf_fun_t *fun)
    227227{
    228228        ddf_msg(LVL_DEBUG, "virt_fun_online()");
    … …  
    230230}
    231231
    232 static int virt_fun_offline(ddf_fun_t *fun)
     232static errno_t virt_fun_offline(ddf_fun_t *fun)
    233233{
    234234        ddf_msg(LVL_DEBUG, "virt_fun_offline()");
Note: See TracChangeset for help on using the changeset viewer.