Changeset b7fd2a0 in mainline for uspace/lib/uri

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
<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.

Location:

uspace/lib/uri

Files:

• uri.c (modified) (6 diffs)
• uri.h (modified) (1 diff)

uspace/lib/uri/uri.c

@@ -143 +143 @@
  * @return EOK on success
  */
-int uri_scheme_parse(const char *str, const char **endptr)
+errno_t uri_scheme_parse(const char *str, const char **endptr)
 {
         if (*str == 0) {
@@ -175 +175 @@
 }
 
-int uri_percent_parse(const char *str, const char **endptr,
+errno_t uri_percent_parse(const char *str, const char **endptr,
     uint8_t *decoded)
 {
@@ -186 +186 @@
         
         if (decoded != NULL) {
-                int rc = str_uint8_t(str + 1, NULL, 16, true, decoded);
+                errno_t rc = str_uint8_t(str + 1, NULL, 16, true, decoded);
                 if (rc != EOK)
                         return rc;
@@ -195 +195 @@
 }
 
-int uri_user_info_parse(const char *str, const char **endptr)
+errno_t uri_user_info_parse(const char *str, const char **endptr)
 {
         while (*str != 0) {
@@ -201 +201 @@
                 if (*str == 0)
                         break;
-                int rc = uri_percent_parse(str, &str, NULL);
+                errno_t rc = uri_percent_parse(str, &str, NULL);
                 if (rc != EOK) {
                         *endptr = str;
@@ -220 +220 @@
 }
 
-int uri_port_parse(const char *str, const char **endptr)
+errno_t uri_port_parse(const char *str, const char **endptr)
 {
         if (*str == 0)

uspace/lib/uri/uri.h

@@ -49 +49 @@
 
 extern uri_t *uri_parse(const char *);
-extern int uri_scheme_parse(const char *, const char **);
+extern errno_t uri_scheme_parse(const char *, const char **);
 extern bool uri_scheme_validate(const char *);
-extern int uri_percent_parse(const char *, const char **, uint8_t *);
-extern int uri_user_info_parse(const char *, const char **);
+extern errno_t uri_percent_parse(const char *, const char **, uint8_t *);
+extern errno_t uri_user_info_parse(const char *, const char **);
 extern bool uri_user_info_validate(const char *);
-extern int uri_port_parse(const char *, const char **);
+extern errno_t uri_port_parse(const char *, const char **);
 extern bool uri_port_validate(const char *);
 extern bool uri_validate(uri_t *);