<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14876">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, approved
Benjamin Keith Ford: Looks good to me, but someone else must approve
George Joseph: Looks good to me, but someone else must approve
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">conversions: Add string to signed integer conversion functions<br><br>Change-Id: Id603b0b03b78eb84c7fca030a08b343c0d5973f9<br>---<br>M include/asterisk/conversions.h<br>M main/conversions.c<br>M tests/test_conversions.c<br>3 files changed, 257 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/conversions.h b/include/asterisk/conversions.h</span><br><span>index 55906e6..852d80f 100644</span><br><span>--- a/include/asterisk/conversions.h</span><br><span>+++ b/include/asterisk/conversions.h</span><br><span>@@ -26,6 +26,24 @@</span><br><span> #include <stdint.h></span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Convert the given string to a signed integer</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function will return failure for the following reasons:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is empty.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert contains non numeric values</span><br><span style="color: hsl(120, 100%, 40%);">+ * Once converted the number is out of range (less than INT_MIN</span><br><span style="color: hsl(120, 100%, 40%);">+ * or greater than INT_MAX)</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param str The string to convert</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param res [out] The converted value</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns -1 if it fails to convert, 0 on success</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_int(const char *str, int *res);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Convert the given string to an unsigned integer</span><br><span> *</span><br><span> * This function will return failure for the following reasons:</span><br><span>@@ -44,6 +62,24 @@</span><br><span> int ast_str_to_uint(const char *str, unsigned int *res);</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Convert the given string to a signed long</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function will return failure for the following reasons:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is empty.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert contains non numeric values</span><br><span style="color: hsl(120, 100%, 40%);">+ * Once converted the number is out of range (less than LONG_MIN</span><br><span style="color: hsl(120, 100%, 40%);">+ * or greater than LONG_MAX)</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param str The string to convert</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param res [out] The converted value</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns -1 if it fails to convert, 0 on success</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_long(const char *str, long *res);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Convert the given string to an unsigned long</span><br><span> *</span><br><span> * This function will return failure for the following reasons:</span><br><span>@@ -62,6 +98,24 @@</span><br><span> int ast_str_to_ulong(const char *str, unsigned long *res);</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Convert the given string to a signed max size integer</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function will return failure for the following reasons:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert is empty.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The given string to convert contains non numeric values</span><br><span style="color: hsl(120, 100%, 40%);">+ * Once converted the number is out of range (less than INTMAX_MIN</span><br><span style="color: hsl(120, 100%, 40%);">+ * or greater than INTMAX_MAX)</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param str The string to convert</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param res [out] The converted value</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns -1 if it fails to convert, 0 on success</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_imax(const char *str, intmax_t *res);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Convert the given string to an unsigned max size integer</span><br><span> *</span><br><span> * This function will return failure for the following reasons:</span><br><span>diff --git a/main/conversions.c b/main/conversions.c</span><br><span>index 2fd3146..007e24d 100644</span><br><span>--- a/main/conversions.c</span><br><span>+++ b/main/conversions.c</span><br><span>@@ -41,6 +41,18 @@</span><br><span> return **str == '-';</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_int(const char *str, int *res)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ intmax_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_str_to_imax(str, &val) || val < INT_MIN || val > INT_MAX) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *res = val;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int ast_str_to_uint(const char *str, unsigned int *res)</span><br><span> {</span><br><span> uintmax_t val;</span><br><span>@@ -53,6 +65,18 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_long(const char *str, long *res)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ intmax_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_str_to_imax(str, &val) || val < LONG_MIN || val > LONG_MAX) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *res = val;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int ast_str_to_ulong(const char *str, unsigned long *res)</span><br><span> {</span><br><span> uintmax_t val;</span><br><span>@@ -65,6 +89,33 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int ast_str_to_imax(const char *str, intmax_t *res)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char *end;</span><br><span style="color: hsl(120, 100%, 40%);">+ intmax_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!str) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ errno = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ val = strtoimax(str, &end, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * If str equals end then no digits were found. If end is not pointing to</span><br><span style="color: hsl(120, 100%, 40%);">+ * a null character then the string contained some numbers that could be</span><br><span style="color: hsl(120, 100%, 40%);">+ * converted, but some characters that could not, which we'll consider</span><br><span style="color: hsl(120, 100%, 40%);">+ * invalid.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (str == end || *end != '\0' || (errno == ERANGE &&</span><br><span style="color: hsl(120, 100%, 40%);">+ (val == INTMAX_MIN || val == INTMAX_MAX))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *res = val;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int ast_str_to_umax(const char *str, uintmax_t *res)</span><br><span> {</span><br><span> char *end;</span><br><span>diff --git a/tests/test_conversions.c b/tests/test_conversions.c</span><br><span>index 1a765b4..f49c8e6 100644</span><br><span>--- a/tests/test_conversions.c</span><br><span>+++ b/tests/test_conversions.c</span><br><span>@@ -37,6 +37,54 @@</span><br><span> </span><br><span> #define CATEGORY "/main/conversions/"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AST_TEST_DEFINE(str_to_int)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid = "abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid_partial = "7abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative = "-7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_spaces = " -7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_out_of_range = "-9999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *out_of_range = "9999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *spaces = " ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid = "7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid_spaces = " 7";</span><br><span style="color: hsl(120, 100%, 40%);">+ int val;</span><br><span style="color: hsl(120, 100%, 40%);">+ char str[64];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cmd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_INIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ info->name = __func__;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->category = CATEGORY;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->summary = "convert a string to a signed integer";</span><br><span style="color: hsl(120, 100%, 40%);">+ info->description = info->summary;</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_NOT_RUN;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_EXECUTE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(NULL, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int("\0", &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(invalid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(invalid_partial, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(negative, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(negative_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(negative_out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_int(spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(valid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(valid_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%d", INT_MAX) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == INT_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%d", INT_MIN) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_int(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == INT_MIN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_PASS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AST_TEST_DEFINE(str_to_uint)</span><br><span> {</span><br><span> const char *invalid = "abc";</span><br><span>@@ -79,6 +127,54 @@</span><br><span> return AST_TEST_PASS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AST_TEST_DEFINE(str_to_long)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid = "abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid_partial = "7abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative = "-7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_spaces = " -7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_out_of_range = "-99999999999999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *out_of_range = "99999999999999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *spaces = " ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid = "7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid_spaces = " 7";</span><br><span style="color: hsl(120, 100%, 40%);">+ long val;</span><br><span style="color: hsl(120, 100%, 40%);">+ char str[64];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cmd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_INIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ info->name = __func__;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->category = CATEGORY;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->summary = "convert a string to a signed long";</span><br><span style="color: hsl(120, 100%, 40%);">+ info->description = info->summary;</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_NOT_RUN;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_EXECUTE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(NULL, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long("\0", &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(invalid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(invalid_partial, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(negative, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(negative_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(negative_out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_long(spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(valid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(valid_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%ld", LONG_MAX) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == LONG_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%ld", LONG_MIN) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_long(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == LONG_MIN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_PASS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AST_TEST_DEFINE(str_to_ulong)</span><br><span> {</span><br><span> const char *invalid = "abc";</span><br><span>@@ -121,6 +217,55 @@</span><br><span> return AST_TEST_PASS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AST_TEST_DEFINE(str_to_imax)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid = "abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *invalid_partial = "7abc";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative = "-7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_spaces = " -7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *negative_out_of_range = "-99999999999999999999999999999999999999999999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *out_of_range = "99999999999999999999999999999999999999999999999999";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *spaces = " ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid = "7";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *valid_spaces = " 7";</span><br><span style="color: hsl(120, 100%, 40%);">+ intmax_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+ char str[64];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cmd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_INIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ info->name = __func__;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->category = CATEGORY;</span><br><span style="color: hsl(120, 100%, 40%);">+ info->summary = "convert a string to a signed max size integer";</span><br><span style="color: hsl(120, 100%, 40%);">+ info->description = info->summary;</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_NOT_RUN;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TEST_EXECUTE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(NULL, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax("\0", &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(invalid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(invalid_partial, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(negative, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(negative_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(negative_out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(out_of_range, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, ast_str_to_imax(spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(valid, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(valid_spaces, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%jd", INTMAX_MAX) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == INTMAX_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%jd", INTMAX_MIN) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, !ast_str_to_imax(str, &val));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, val == INTMAX_MIN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return AST_TEST_PASS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AST_TEST_DEFINE(str_to_umax)</span><br><span> {</span><br><span> const char *invalid = "abc";</span><br><span>@@ -156,7 +301,7 @@</span><br><span> ast_test_validate(test, !ast_str_to_umax(valid, &val));</span><br><span> ast_test_validate(test, !ast_str_to_umax(valid_spaces, &val));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_test_validate(test, snprintf(str, sizeof(str), "%lu", UINTMAX_MAX) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_validate(test, snprintf(str, sizeof(str), "%ju", UINTMAX_MAX) > 0);</span><br><span> ast_test_validate(test, !ast_str_to_umax(str, &val));</span><br><span> ast_test_validate(test, val == UINTMAX_MAX);</span><br><span> </span><br><span>@@ -165,16 +310,22 @@</span><br><span> </span><br><span> static int load_module(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_REGISTER(str_to_int);</span><br><span> AST_TEST_REGISTER(str_to_uint);</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_REGISTER(str_to_long);</span><br><span> AST_TEST_REGISTER(str_to_ulong);</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_REGISTER(str_to_imax);</span><br><span> AST_TEST_REGISTER(str_to_umax);</span><br><span> return AST_MODULE_LOAD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> static int unload_module(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_UNREGISTER(str_to_int);</span><br><span> AST_TEST_UNREGISTER(str_to_uint);</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_UNREGISTER(str_to_long);</span><br><span> AST_TEST_UNREGISTER(str_to_ulong);</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_TEST_UNREGISTER(str_to_imax);</span><br><span> AST_TEST_UNREGISTER(str_to_umax);</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14876">change 14876</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14876"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Id603b0b03b78eb84c7fca030a08b343c0d5973f9 </div>
<div style="display:none"> Gerrit-Change-Number: 14876 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>