Changeset b401b33 in mainline for kernel/generic/src/lib/str.c

Timestamp:

2019-06-06T12:15:29Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2a103b5, e28175d

Parents:

83b64a59 (diff), 42e91ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-06 12:15:29)

git-committer:

GitHub <noreply@…> (2019-06-06 12:15:29)

Message:

Merge pull request #169 from le-jzr/strtolwip

Removes internal str_uint() function in favor of the one in strtol.c.
Fixes handling of a bunch of corner cases.
The expected behavior of str_uint*_t() functions should be unchanged.

File:

• kernel/generic/src/lib/str.c (modified) (1 diff)

kernel/generic/src/lib/str.c

@@ -789 +789 @@
         str_ncpy(dest, size + 1, src, size);
         return dest;
-}
-
-/** Convert string to uint64_t (internal variant).
- *
- * @param nptr   Pointer to string.
- * @param endptr Pointer to the first invalid character is stored here.
- * @param base   Zero or number between 2 and 36 inclusive.
- * @param neg    Indication of unary minus is stored here.
- * @apram result Result of the conversion.
- *
- * @return EOK if conversion was successful.
- *
- */
-static errno_t str_uint(const char *nptr, char **endptr, unsigned int base,
-    bool *neg, uint64_t *result)
-{
-        assert(endptr != NULL);
-        assert(neg != NULL);
-        assert(result != NULL);
-
-        *neg = false;
-        const char *str = nptr;
-
-        /* Ignore leading whitespace */
-        while (isspace(*str))
-                str++;
-
-        if (*str == '-') {
-                *neg = true;
-                str++;
-        } else if (*str == '+')
-                str++;
-
-        if (base == 0) {
-                /* Decode base if not specified */
-                base = 10;
-
-                if (*str == '0') {
-                        base = 8;
-                        str++;
-
-                        switch (*str) {
-                        case 'b':
-                        case 'B':
-                                base = 2;
-                                str++;
-                                break;
-                        case 'o':
-                        case 'O':
-                                base = 8;
-                                str++;
-                                break;
-                        case 'd':
-                        case 'D':
-                        case 't':
-                        case 'T':
-                                base = 10;
-                                str++;
-                                break;
-                        case 'x':
-                        case 'X':
-                                base = 16;
-                                str++;
-                                break;
-                        default:
-                                str--;
-                        }
-                }
-        } else {
-                /* Check base range */
-                if ((base < 2) || (base > 36)) {
-                        *endptr = (char *) str;
-                        return EINVAL;
-                }
-        }
-
-        *result = 0;
-        const char *startstr = str;
-
-        while (*str != 0) {
-                unsigned int digit;
-
-                if ((*str >= 'a') && (*str <= 'z'))
-                        digit = *str - 'a' + 10;
-                else if ((*str >= 'A') && (*str <= 'Z'))
-                        digit = *str - 'A' + 10;
-                else if ((*str >= '0') && (*str <= '9'))
-                        digit = *str - '0';
-                else
-                        break;
-
-                if (digit >= base)
-                        break;
-
-                uint64_t prev = *result;
-                *result = (*result) * base + digit;
-
-                if (*result < prev) {
-                        /* Overflow */
-                        *endptr = (char *) str;
-                        return EOVERFLOW;
-                }
-
-                str++;
-        }
-
-        if (str == startstr) {
-                /*
-                 * No digits were decoded => first invalid character is
-                 * the first character of the string.
-                 */
-                str = nptr;
-        }
-
-        *endptr = (char *) str;
-
-        if (str == nptr)
-                return EINVAL;
-
-        return EOK;
-}
-
-/** Convert string to uint64_t.
- *
- * @param nptr   Pointer to string.
- * @param endptr If not NULL, pointer to the first invalid character
- *               is stored here.
- * @param base   Zero or number between 2 and 36 inclusive.
- * @param strict Do not allow any trailing characters.
- * @param result Result of the conversion.
- *
- * @return EOK if conversion was successful.
- *
- */
-errno_t str_uint64_t(const char *nptr, char **endptr, unsigned int base,
-    bool strict, uint64_t *result)
-{
-        assert(result != NULL);
-
-        bool neg;
-        char *lendptr;
-        errno_t ret = str_uint(nptr, &lendptr, base, &neg, result);
-
-        if (endptr != NULL)
-                *endptr = (char *) lendptr;
-
-        if (ret != EOK)
-                return ret;
-
-        /* Do not allow negative values */
-        if (neg)
-                return EINVAL;
-
-        /*
-         * Check whether we are at the end of
-         * the string in strict mode
-         */
-        if ((strict) && (*lendptr != 0))
-                return EINVAL;
-
-        return EOK;
 }