Changeset b7fd2a0 in mainline for uspace/lib/ieee80211


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/lib/ieee80211
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/ieee80211/include/ieee80211.h

    r36f0738 rb7fd2a0  
    106106         *
    107107         */
    108         int (*start)(struct ieee80211_dev *);
     108        errno_t (*start)(struct ieee80211_dev *);
    109109       
    110110        /** Scan neighborhood for networks.
    … …  
    118118         *
    119119         */
    120         int (*scan)(struct ieee80211_dev *);
     120        errno_t (*scan)(struct ieee80211_dev *);
    121121       
    122122        /** Handler for TX frames to be send from device.
    … …  
    132132         *
    133133         */
    134         int (*tx_handler)(struct ieee80211_dev *, void *, size_t);
     134        errno_t (*tx_handler)(struct ieee80211_dev *, void *, size_t);
    135135       
    136136        /** Set device operating frequency to given value.
    … …  
    142142         *
    143143         */
    144         int (*set_freq)(struct ieee80211_dev *, uint16_t);
     144        errno_t (*set_freq)(struct ieee80211_dev *, uint16_t);
    145145       
    146146        /** Callback to inform device about BSSID change.
    … …  
    152152         *
    153153         */
    154         int (*bssid_change)(struct ieee80211_dev *, bool);
     154        errno_t (*bssid_change)(struct ieee80211_dev *, bool);
    155155       
    156156        /** Callback to setup encryption key in IEEE 802.11 device.
    … …  
    164164         *
    165165         */
    166         int (*key_config)(struct ieee80211_dev *,
     166        errno_t (*key_config)(struct ieee80211_dev *,
    167167            ieee80211_key_config_t *key_conf, bool);
    168168} ieee80211_ops_t;
    … …  
    170170/* Initialization functions. */
    171171extern ieee80211_dev_t *ieee80211_device_create(void);
    172 extern int ieee80211_device_init(ieee80211_dev_t *, ddf_dev_t *);
    173 extern int ieee80211_init(ieee80211_dev_t *, ieee80211_ops_t *,
     172extern errno_t ieee80211_device_init(ieee80211_dev_t *, ddf_dev_t *);
     173extern errno_t ieee80211_init(ieee80211_dev_t *, ieee80211_ops_t *,
    174174    ieee80211_iface_t *, nic_iface_t *, ddf_dev_ops_t *);
    175175
    … …  
    201201
    202202/* Worker functions. */
    203 extern int ieee80211_rx_handler(ieee80211_dev_t *, void *, size_t);
     203extern errno_t ieee80211_rx_handler(ieee80211_dev_t *, void *, size_t);
    204204
    205205#endif

  • uspace/lib/ieee80211/include/ieee80211_iface_impl.h

    r36f0738 rb7fd2a0  
    4343#include "ieee80211.h"
    4444
    45 extern int ieee80211_get_scan_results_impl(ddf_fun_t *,
     45extern errno_t ieee80211_get_scan_results_impl(ddf_fun_t *,
    4646    ieee80211_scan_results_t *, bool);
    47 extern int ieee80211_connect_impl(ddf_fun_t *, char *, char *);
    48 extern int ieee80211_disconnect_impl(ddf_fun_t *);
     47extern errno_t ieee80211_connect_impl(ddf_fun_t *, char *, char *);
     48extern errno_t ieee80211_disconnect_impl(ddf_fun_t *);
    4949
    5050#endif  /* LIB_IEEE80211_IFACE_IMPL_H */

  • uspace/lib/ieee80211/include/ieee80211_impl.h

    r36f0738 rb7fd2a0  
    4242#include "ieee80211_private.h"
    4343
    44 extern int ieee80211_start_impl(ieee80211_dev_t *);
    45 extern int ieee80211_tx_handler_impl(ieee80211_dev_t *, void *, size_t);
    46 extern int ieee80211_set_freq_impl(ieee80211_dev_t *, uint16_t);
    47 extern int ieee80211_bssid_change_impl(ieee80211_dev_t *, bool);
    48 extern int ieee80211_key_config_impl(ieee80211_dev_t *,
     44extern errno_t ieee80211_start_impl(ieee80211_dev_t *);
     45extern errno_t ieee80211_tx_handler_impl(ieee80211_dev_t *, void *, size_t);
     46extern errno_t ieee80211_set_freq_impl(ieee80211_dev_t *, uint16_t);
     47extern errno_t ieee80211_bssid_change_impl(ieee80211_dev_t *, bool);
     48extern errno_t ieee80211_key_config_impl(ieee80211_dev_t *,
    4949    ieee80211_key_config_t *, bool);
    50 extern int ieee80211_scan_impl(ieee80211_dev_t *);
    51 extern int ieee80211_prf(uint8_t *, uint8_t *, uint8_t *, size_t);
    52 extern int ieee80211_rc4_key_unwrap(uint8_t *, uint8_t *, size_t, uint8_t *);
    53 extern int ieee80211_aes_key_unwrap(uint8_t *, uint8_t *, size_t, uint8_t *);
    54 extern int ieee80211_michael_mic(uint8_t *, uint8_t *, size_t, uint8_t *);
     50extern errno_t ieee80211_scan_impl(ieee80211_dev_t *);
     51extern errno_t ieee80211_prf(uint8_t *, uint8_t *, uint8_t *, size_t);
     52extern errno_t ieee80211_rc4_key_unwrap(uint8_t *, uint8_t *, size_t, uint8_t *);
     53extern errno_t ieee80211_aes_key_unwrap(uint8_t *, uint8_t *, size_t, uint8_t *);
     54extern errno_t ieee80211_michael_mic(uint8_t *, uint8_t *, size_t, uint8_t *);
    5555extern uint16_t uint16le_from_seq(void *);
    5656extern uint32_t uint32le_from_seq(void *);
    5757extern uint16_t uint16be_from_seq(void *);
    5858extern uint32_t uint32be_from_seq(void *);
    59 extern int rnd_sequence(uint8_t *, size_t);
     59extern errno_t rnd_sequence(uint8_t *, size_t);
    6060extern uint8_t *min_sequence(uint8_t *, uint8_t *, size_t);
    6161extern uint8_t *max_sequence(uint8_t *, uint8_t *, size_t);

  • uspace/lib/ieee80211/include/ieee80211_private.h

    r36f0738 rb7fd2a0  
    410410extern ieee80211_auth_phase_t ieee80211_get_auth_phase(ieee80211_dev_t *);
    411411extern void ieee80211_set_auth_phase(ieee80211_dev_t *, ieee80211_auth_phase_t);
    412 extern int ieee80211_probe_request(ieee80211_dev_t *, char *);
    413 extern int ieee80211_authenticate(ieee80211_dev_t *);
    414 extern int ieee80211_associate(ieee80211_dev_t *, char *);
    415 extern int ieee80211_deauthenticate(ieee80211_dev_t *);
     412extern errno_t ieee80211_probe_request(ieee80211_dev_t *, char *);
     413extern errno_t ieee80211_authenticate(ieee80211_dev_t *);
     414extern errno_t ieee80211_associate(ieee80211_dev_t *, char *);
     415extern errno_t ieee80211_deauthenticate(ieee80211_dev_t *);
    416416
    417417#endif

  • uspace/lib/ieee80211/src/ieee80211.c

    r36f0738 rb7fd2a0  
    496496}
    497497
    498 static int ieee80211_scan(void *arg)
     498static errno_t ieee80211_scan(void *arg)
    499499{
    500500        assert(arg);
    … …  
    517517 *
    518518 */
    519 static int ieee80211_open(ddf_fun_t *fun)
     519static errno_t ieee80211_open(ddf_fun_t *fun)
    520520{
    521521        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    … …  
    527527        ieee80211_dev->started = true;
    528528       
    529         int rc = ieee80211_dev->ops->start(ieee80211_dev);
     529        errno_t rc = ieee80211_dev->ops->start(ieee80211_dev);
    530530        if (rc != EOK)
    531531                return rc;
    … …  
    655655 *
    656656 */
    657 static int ieee80211_implement(ieee80211_dev_t *ieee80211_dev,
     657static errno_t ieee80211_implement(ieee80211_dev_t *ieee80211_dev,
    658658    ieee80211_ops_t *ieee80211_ops, ieee80211_iface_t *ieee80211_iface,
    659659    nic_iface_t *nic_iface, ddf_dev_ops_t *nic_dev_ops)
    … …  
    731731 *
    732732 */
    733 int ieee80211_device_init(ieee80211_dev_t *ieee80211_dev, ddf_dev_t *ddf_dev)
     733errno_t ieee80211_device_init(ieee80211_dev_t *ieee80211_dev, ddf_dev_t *ddf_dev)
    734734{
    735735        ieee80211_dev->ddf_dev = ddf_dev;
    … …  
    771771 *
    772772 */
    773 int ieee80211_init(ieee80211_dev_t *ieee80211_dev,
     773errno_t ieee80211_init(ieee80211_dev_t *ieee80211_dev,
    774774    ieee80211_ops_t *ieee80211_ops, ieee80211_iface_t *ieee80211_iface,
    775775    nic_iface_t *ieee80211_nic_iface, ddf_dev_ops_t *ieee80211_nic_dev_ops)
    776776{
    777         int rc = ieee80211_implement(ieee80211_dev,
     777        errno_t rc = ieee80211_implement(ieee80211_dev,
    778778            ieee80211_ops, ieee80211_iface,
    779779            ieee80211_nic_iface, ieee80211_nic_dev_ops);
    … …  
    850850 *
    851851 */
    852 int ieee80211_probe_request(ieee80211_dev_t *ieee80211_dev, char *ssid)
     852errno_t ieee80211_probe_request(ieee80211_dev_t *ieee80211_dev, char *ssid)
    853853{
    854854        nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev);
    … …  
    917917 *
    918918 */
    919 int ieee80211_authenticate(ieee80211_dev_t *ieee80211_dev)
     919errno_t ieee80211_authenticate(ieee80211_dev_t *ieee80211_dev)
    920920{
    921921        nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev);
    … …  
    967967 *
    968968 */
    969 int ieee80211_associate(ieee80211_dev_t *ieee80211_dev, char *password)
     969errno_t ieee80211_associate(ieee80211_dev_t *ieee80211_dev, char *password)
    970970{
    971971        nic_t *nic = nic_get_from_ddf_dev(ieee80211_dev->ddf_dev);
    … …  
    10571057 *
    10581058 */
    1059 int ieee80211_deauthenticate(ieee80211_dev_t *ieee80211_dev)
     1059errno_t ieee80211_deauthenticate(ieee80211_dev_t *ieee80211_dev)
    10601060{
    10611061        ieee80211_scan_result_t *auth_data =
    … …  
    12411241 *
    12421242 */
    1243 static int ieee80211_process_probe_response(ieee80211_dev_t *ieee80211_dev,
     1243static errno_t ieee80211_process_probe_response(ieee80211_dev_t *ieee80211_dev,
    12441244    ieee80211_mgmt_header_t *mgmt_header, size_t buffer_size)
    12451245{
    … …  
    13271327 *
    13281328 */
    1329 static int ieee80211_process_auth_response(ieee80211_dev_t *ieee80211_dev,
     1329static errno_t ieee80211_process_auth_response(ieee80211_dev_t *ieee80211_dev,
    13301330    ieee80211_mgmt_header_t *mgmt_header)
    13311331{
    … …  
    13561356 *
    13571357 */
    1358 static int ieee80211_process_assoc_response(ieee80211_dev_t *ieee80211_dev,
     1358static errno_t ieee80211_process_assoc_response(ieee80211_dev_t *ieee80211_dev,
    13591359    ieee80211_mgmt_header_t *mgmt_header)
    13601360{
    … …  
    13811381}
    13821382
    1383 static int ieee80211_process_4way_handshake(ieee80211_dev_t *ieee80211_dev,
     1383static errno_t ieee80211_process_4way_handshake(ieee80211_dev_t *ieee80211_dev,
    13841384    void *buffer, size_t buffer_size)
    13851385{
    … …  
    14911491                            (buffer + sizeof(ieee80211_eapol_key_frame_t));
    14921492                       
    1493                         int rc;
     1493                        errno_t rc;
    14941494                        uint8_t work_key[32];
    14951495                       
    … …  
    16101610}
    16111611
    1612 static int ieee80211_process_eapol_frame(ieee80211_dev_t *ieee80211_dev,
     1612static errno_t ieee80211_process_eapol_frame(ieee80211_dev_t *ieee80211_dev,
    16131613    void *buffer, size_t buffer_size)
    16141614{
    … …  
    16321632 *
    16331633 */
    1634 static int ieee80211_process_data(ieee80211_dev_t *ieee80211_dev,
     1634static errno_t ieee80211_process_data(ieee80211_dev_t *ieee80211_dev,
    16351635    void *buffer, size_t buffer_size)
    16361636{
    … …  
    16961696 *
    16971697 */
    1698 int ieee80211_rx_handler(ieee80211_dev_t *ieee80211_dev, void *buffer,
     1698errno_t ieee80211_rx_handler(ieee80211_dev_t *ieee80211_dev, void *buffer,
    16991699    size_t buffer_size)
    17001700{

  • uspace/lib/ieee80211/src/ieee80211_iface_impl.c

    r36f0738 rb7fd2a0  
    5050 *
    5151 */
    52 int ieee80211_get_scan_results_impl(ddf_fun_t *fun,
     52errno_t ieee80211_get_scan_results_impl(ddf_fun_t *fun,
    5353    ieee80211_scan_results_t *results, bool now)
    5454{
    … …  
    9898 *
    9999 */
    100 static int ieee80211_connect_proc(ieee80211_dev_t *ieee80211_dev,
     100static errno_t ieee80211_connect_proc(ieee80211_dev_t *ieee80211_dev,
    101101    ieee80211_scan_result_link_t *auth_data, char *password)
    102102{
    … …  
    104104       
    105105        /* Set channel. */
    106         int rc = ieee80211_dev->ops->set_freq(ieee80211_dev,
     106        errno_t rc = ieee80211_dev->ops->set_freq(ieee80211_dev,
    107107            ieee80211_channel_to_freq(auth_data->scan_result.channel));
    108108        if (rc != EOK)
    … …  
    178178 *
    179179 */
    180 int ieee80211_connect_impl(ddf_fun_t *fun, char *ssid_start, char *password)
     180errno_t ieee80211_connect_impl(ddf_fun_t *fun, char *ssid_start, char *password)
    181181{
    182182        assert(ssid_start);
    … …  
    190190       
    191191        if (ieee80211_is_connected(ieee80211_dev)) {
    192                 int rc = ieee80211_dev->iface->disconnect(fun);
     192                errno_t rc = ieee80211_dev->iface->disconnect(fun);
    193193                if (rc != EOK)
    194194                        return rc;
    … …  
    197197        ieee80211_set_connect_request(ieee80211_dev);
    198198       
    199         int rc = ENOENT;
     199        errno_t rc = ENOENT;
    200200        fibril_mutex_lock(&ieee80211_dev->scan_mutex);
    201201       
    … …  
    224224 *
    225225 */
    226 int ieee80211_disconnect_impl(ddf_fun_t *fun)
     226errno_t ieee80211_disconnect_impl(ddf_fun_t *fun)
    227227{
    228228        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    … …  
    236236       
    237237        fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex);
    238         int rc = ieee80211_deauthenticate(ieee80211_dev);
     238        errno_t rc = ieee80211_deauthenticate(ieee80211_dev);
    239239        fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex);
    240240       

  • uspace/lib/ieee80211/src/ieee80211_impl.c

    r36f0738 rb7fd2a0  
    4949 *
    5050 */
    51 int ieee80211_start_impl(ieee80211_dev_t *ieee80211_dev)
     51errno_t ieee80211_start_impl(ieee80211_dev_t *ieee80211_dev)
    5252{
    5353        return EOK;
    … …  
    6363 *
    6464 */
    65 int ieee80211_tx_handler_impl(ieee80211_dev_t *ieee80211_dev, void *buffer,
     65errno_t ieee80211_tx_handler_impl(ieee80211_dev_t *ieee80211_dev, void *buffer,
    6666    size_t buffer_size)
    6767{
    … …  
    7777 *
    7878 */
    79 int ieee80211_set_freq_impl(ieee80211_dev_t *ieee80211_dev, uint16_t freq)
     79errno_t ieee80211_set_freq_impl(ieee80211_dev_t *ieee80211_dev, uint16_t freq)
    8080{
    8181        return EOK;
    … …  
    8989 *
    9090 */
    91 int ieee80211_bssid_change_impl(ieee80211_dev_t *ieee80211_dev,
     91errno_t ieee80211_bssid_change_impl(ieee80211_dev_t *ieee80211_dev,
    9292    bool connected)
    9393{
    … …  
    102102 *
    103103 */
    104 int ieee80211_key_config_impl(ieee80211_dev_t *ieee80211_dev,
     104errno_t ieee80211_key_config_impl(ieee80211_dev_t *ieee80211_dev,
    105105    ieee80211_key_config_t *key_conf, bool insert)
    106106{
    … …  
    116116 *
    117117 */
    118 int ieee80211_scan_impl(ieee80211_dev_t *ieee80211_dev)
     118errno_t ieee80211_scan_impl(ieee80211_dev_t *ieee80211_dev)
    119119{
    120120        fibril_mutex_lock(&ieee80211_dev->scan_mutex);
    … …  
    178178 *
    179179 */
    180 int ieee80211_prf(uint8_t *key, uint8_t *data, uint8_t *hash,
     180errno_t ieee80211_prf(uint8_t *key, uint8_t *data, uint8_t *hash,
    181181    size_t output_size)
    182182{
    … …  
    212212}
    213213
    214 int ieee80211_rc4_key_unwrap(uint8_t *key, uint8_t *data, size_t data_size,
     214errno_t ieee80211_rc4_key_unwrap(uint8_t *key, uint8_t *data, size_t data_size,
    215215    uint8_t *output)
    216216{
    … …  
    218218}
    219219
    220 int ieee80211_aes_key_unwrap(uint8_t *kek, uint8_t *data, size_t data_size,
     220errno_t ieee80211_aes_key_unwrap(uint8_t *kek, uint8_t *data, size_t data_size,
    221221    uint8_t *output)
    222222{
    … …  
    285285}
    286286
    287 int ieee80211_michael_mic(uint8_t *key, uint8_t *buffer, size_t size,
     287errno_t ieee80211_michael_mic(uint8_t *key, uint8_t *buffer, size_t size,
    288288    uint8_t *mic)
    289289{
    … …  
    372372}
    373373
    374 int rnd_sequence(uint8_t *sequence, size_t length)
     374errno_t rnd_sequence(uint8_t *sequence, size_t length)
    375375{
    376376        if (!sequence)
Note: See TracChangeset for help on using the changeset viewer.