Changes in uspace/lib/c/generic/str.c [cde999a:b7fd2a0] in mainline

File:

• uspace/lib/c/generic/str.c (modified) (16 diffs)

uspace/lib/c/generic/str.c

@@ -196 +196 @@
  *         code was invalid.
  */
-int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
+errno_t chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
         if (*offset >= size)
@@ -839 +839 @@
  *                      non-ASCII bytes.
  */
-int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n)
+errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n)
 {
         size_t sidx;
@@ -845 +845 @@
         size_t dlast;
         uint8_t byte;
-        int rc;
-        int result;
+        errno_t rc;
+        errno_t result;
 
         /* There must be space for a null terminator in the buffer. */
@@ -920 +920 @@
  * @return EOK, if success, an error code otherwise.
  */
-int utf16_to_str(char *dest, size_t size, const uint16_t *src)
+errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src)
 {
         size_t idx = 0, dest_off = 0;
         wchar_t ch;
-        int rc = EOK;
+        errno_t rc = EOK;
 
         /* There must be space for a null terminator in the buffer. */
@@ -963 +963 @@
  * @return EOK, if success, an error code otherwise.
  */
-int str_to_utf16(uint16_t *dest, size_t dlen, const char *src)
-{
-        int rc = EOK;
+errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src)
+{
+        errno_t rc = EOK;
         size_t offset = 0;
         size_t idx = 0;
@@ -1539 +1539 @@
  *
  */
-static int str_uint(const char *nptr, char **endptr, unsigned int base,
+static errno_t str_uint(const char *nptr, char **endptr, unsigned int base,
     bool *neg, uint64_t *result)
 {
@@ -1660 +1660 @@
  *
  */
-int str_uint8_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint8_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint8_t *result)
 {
@@ -1668 +1668 @@
         char *lendptr;
         uint64_t res;
-        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
         
         if (endptr != NULL)
@@ -1707 +1707 @@
  *
  */
-int str_uint16_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint16_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint16_t *result)
 {
@@ -1715 +1715 @@
         char *lendptr;
         uint64_t res;
-        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
         
         if (endptr != NULL)
@@ -1754 +1754 @@
  *
  */
-int str_uint32_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint32_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint32_t *result)
 {
@@ -1762 +1762 @@
         char *lendptr;
         uint64_t res;
-        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
         
         if (endptr != NULL)
@@ -1801 +1801 @@
  *
  */
-int str_uint64_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_uint64_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {
@@ -1808 +1808 @@
         bool neg;
         char *lendptr;
-        int ret = str_uint(nptr, &lendptr, base, &neg, result);
+        errno_t ret = str_uint(nptr, &lendptr, base, &neg, result);
         
         if (endptr != NULL)
@@ -1840 +1840 @@
  *
  */
-int str_size_t(const char *nptr, const char **endptr, unsigned int base,
+errno_t str_size_t(const char *nptr, const char **endptr, unsigned int base,
     bool strict, size_t *result)
 {
@@ -1848 +1848 @@
         char *lendptr;
         uint64_t res;
-        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        errno_t ret = str_uint(nptr, &lendptr, base, &neg, &res);
         
         if (endptr != NULL)