kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1299 from ssahoo-five9/switch_utils 

[Core] Add switch_safe_atol() and switch_safe_atoll() functions. Add a unit-test.
This commit is contained in:
Andrey Volk 2021-08-13 20:56:14 +03:00 committed by GitHub
parent c41aa83b17 25823013f8
commit 717b9eec0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/include/switch_utils.h
View File

@ -831,10 +831,10 @@ static inline char *switch_clean_name_string(char *s)
/*!
\brief Turn a string into a number (default if NULL)
\brief Turn a string into an integer (default if NULL)
\param nptr the string
\param dft the default
\return the number version of the string or the default
\return the integer version of the string or the default
*/
static inline int switch_safe_atoi(const char *nptr, int dft)
{
@ -842,6 +842,30 @@ static inline int switch_safe_atoi(const char *nptr, int dft)
}
/*!
\brief Turn a string into a long integer (default if NULL)
\param nptr the string
\param dft the default
\return the long integer version of the string or the default
*/
static inline long int switch_safe_atol(const char *nptr, long int dft)
{
return nptr ? atol(nptr) : dft;
}
/*!
\brief Turn a string into a long long integer (default if NULL)
\param nptr the string
\param dft the default
\return the long long integer version of the string or the default
*/
static inline long long int switch_safe_atoll(const char *nptr, long long int dft)
{
return nptr ? atoll(nptr) : dft;
}
/*!
\brief Free a pointer and set it to NULL unless it already is NULL
\param it the pointer

16
tests/unit/switch_core.c
View File

@ -223,6 +223,22 @@ FST_CORE_BEGIN("./conf")
#endif
}
FST_TEST_END()
FST_TEST_BEGIN(test_switch_safe_atoXX)
{
fst_check_int_equals(switch_safe_atoi("1", 0), 1);
fst_check_int_equals(switch_safe_atoi("", 2), 0);
fst_check_int_equals(switch_safe_atoi(0, 3), 3);
fst_check_int_equals(switch_safe_atol("9275806", 0), 9275806);
fst_check_int_equals(switch_safe_atol("", 2), 0);
fst_check_int_equals(switch_safe_atol(0, 3), 3);
fst_check_int_equals(switch_safe_atoll("9275806", 0), 9275806);
fst_check_int_equals(switch_safe_atoll("", 2), 0);
fst_check_int_equals(switch_safe_atoll(0, 3), 3);
}
FST_TEST_END()
}
FST_SUITE_END()
}