anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/string: Add a function for comparing strings 

And switch over the GenericTag to using it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-09-24 13:57:42 -04:00
parent 60678d1ddb
commit 023bae737c
4 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/string.c
View File

@ -64,3 +64,15 @@ gchar *string_lowercase(const gchar *str)
return res;
}
int string_compare(const gchar *lhs, const gchar *rhs)
{
if (strlen(lhs) == 0) {
if (strlen(rhs) == 0)
return 0;
return 1;
}
if (strlen(rhs) == 0)
return -1;
return g_strcmp0(lhs, rhs);
}

6
core/tags/generic.cpp
View File

@ -53,9 +53,5 @@ const std::string &GenericTag :: lowercase()
int GenericTag :: compare(const GenericTag *rhs)
{
if (_lower.size() == 0)
return 1;
if (rhs->_lower.size() == 0)
return -1;
return _lower.compare(rhs->_lower);
return string_compare(_lower.c_str(), rhs->_lower.c_str());
}

9
include/core/string.h
View File

@ -20,4 +20,13 @@ gchar *string_sec2str_long(unsigned int);
/* Convert the input string to lowercase, dropping special characters. */
gchar *string_lowercase(const gchar *);
/*
* Compare two strings.
*
* if ret < 0: lhs < rhs, or rhs is empty.
* if ret = 0: lhs == rhs.
* if ret > 0: lhs > rhs, or lhs is empty.
*/
int string_compare(const gchar *, const gchar *);
#endif /* OCARINA_CORE_STRING_H */

12
tests/core/string.c
View File

@ -69,11 +69,23 @@ void test_lowercase()
test_equal(swap(string_lowercase("! __test(TEXT) + __test(\"TEXT\")")),
"test text test text");
test_equal(swap(string_lowercase("Test~tEXt\\123")), "test text 123");
}
void test_compare()
{
test_equal(string_compare("A", "A"), 0);
test_equal(string_compare("a", "a"), 0);
test_equal(string_compare("A", "B"), -1);
test_equal(string_compare("B", "A"), 1);
test_equal(string_compare("", ""), 0);
test_equal(string_compare("", "A"), 1);
test_equal(string_compare("A", ""), -1);
}
DECLARE_UNIT_TESTS(
UNIT_TEST("Seconds to String", test_sec2str),
UNIT_TEST("Seconds to String (Long)", test_sec2str_long),
UNIT_TEST("String Lowercase", test_lowercase),
UNIT_TEST("String Comparison", test_compare),
);