Changeset b7fd2a0 in mainline for uspace/lib/c/generic/inet/addr.c

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/c/generic/inet/addr.c (modified) (10 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -290 +290 @@
 }
 
-static int inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
+static errno_t inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
     int *prefix, char **endptr)
 {
@@ -299 +299 @@
 
         while (i < 4) {
-                int rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
+                errno_t rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
                 if (rc != EOK)
                         return rc;
@@ -339 +339 @@
 }
 
-static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
+static errno_t inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
     char **endptr)
 {
@@ -362 +362 @@
                 uint16_t bioctet;
                 const char *gend;
-                int rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
+                errno_t rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
                 if (rc != EOK)
                         break;
@@ -446 +446 @@
  *
  */
-int inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
-{
-        int rc;
+errno_t inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
+{
+        errno_t rc;
 
         rc = inet_addr_parse_v4(text, addr, NULL, endptr);
@@ -473 +473 @@
  *
  */
-int inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
-{
-        int rc;
+errno_t inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
+{
+        errno_t rc;
         inet_addr_t addr;
         int prefix;
@@ -494 +494 @@
 }
 
-static int inet_addr_format_v4(addr32_t addr, char **bufp)
+static errno_t inet_addr_format_v4(addr32_t addr, char **bufp)
 {
         int rc;
@@ -506 +506 @@
 }
 
-static int inet_addr_format_v6(const addr128_t addr, char **bufp)
+static errno_t inet_addr_format_v6(const addr128_t addr, char **bufp)
 {
         *bufp = (char *) malloc(INET6_ADDRSTRLEN);
@@ -581 +581 @@
  *
  */
-int inet_addr_format(const inet_addr_t *addr, char **bufp)
-{
-        int rc;
+errno_t inet_addr_format(const inet_addr_t *addr, char **bufp)
+{
+        errno_t rc;
         int ret;
 
@@ -616 +616 @@
  *
  */
-int inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
-{
-        int rc;
+errno_t inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
+{
+        errno_t rc;
         int ret;
         char *astr;