Changeset b7fd2a0 in mainline for uspace/lib/nic/include/nic.h

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
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

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.

File:

• uspace/lib/nic/include/nic.h (modified) (9 diffs)

uspace/lib/nic/include/nic.h

@@ -95 +95 @@
  * @return error code on error.
  */
-typedef int (*state_change_handler)(nic_t *);
+typedef errno_t (*state_change_handler)(nic_t *);
 
 /**
@@ -108 +108 @@
  * @return ENOTSUP      If this mode is not supported
  */
-typedef int (*unicast_mode_change_handler)(nic_t *,
+typedef errno_t (*unicast_mode_change_handler)(nic_t *,
     nic_unicast_mode_t, const nic_address_t *, size_t);
 
@@ -122 +122 @@
  * @return ENOTSUP      If this mode is not supported
  */
-typedef int (*multicast_mode_change_handler)(nic_t *,
+typedef errno_t (*multicast_mode_change_handler)(nic_t *,
     nic_multicast_mode_t, const nic_address_t *, size_t);
 
@@ -134 +134 @@
  * @return ENOTSUP      If this mode is not supported
  */
-typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
+typedef errno_t (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
 
 /**
@@ -172 +172 @@
  *                                      limit of these HW filters was reached.
  */
-typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
+typedef errno_t (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
 
 /**
@@ -195 +195 @@
  * @return EINVAL       If this mode cannot be set up under no circumstances
  */
-typedef int (*poll_mode_change_handler)(nic_t *,
+typedef errno_t (*poll_mode_change_handler)(nic_t *,
     nic_poll_mode_t, const struct timeval *);
 
@@ -211 +211 @@
 
 /* Functions called in the main function */
-extern int nic_driver_init(const char *);
+extern errno_t nic_driver_init(const char *);
 extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
     nic_iface_t *);
 
 /* Functions called in add_device */
-extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
+extern errno_t nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
 extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
@@ -239 +239 @@
 extern nic_device_state_t nic_query_state(nic_t *);
 extern void nic_set_tx_busy(nic_t *, int);
-extern int nic_report_address(nic_t *, const nic_address_t *);
-extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
+extern errno_t nic_report_address(nic_t *, const nic_address_t *);
+extern errno_t nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
 extern void nic_query_address(nic_t *, nic_address_t *);
 extern void nic_received_frame(nic_t *, nic_frame_t *);
@@ -268 +268 @@
 extern void nic_query_blocked_sources(const nic_t *,
     size_t, nic_address_t *, size_t *);
-extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
+extern errno_t nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
 extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);
 extern void nic_set_wol_max_caps(nic_t *, nic_wv_type_t, int);