HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup utils_strpos()

Browse Source 
Use strstr() to find the substring, which makes the code simpler and
is way faster (new version is nearly 2 times faster on my machine).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5994 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-10-03 17:06:12 +00:00
parent 7ff6f6b799
commit 965ef1a285
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/utils.c
View File

@ -697,39 +697,16 @@ void utils_str_replace_all(gchar **haystack, const gchar *needle, const gchar *r
gint utils_strpos(const gchar *haystack, const gchar *needle)
{
gint haystack_length = strlen(haystack);
gint needle_length = strlen(needle);
gint i, j, pos = -1;
const gchar *sub;
if (needle_length > haystack_length)
{
if (! *needle)
return -1;
}
else
{
for (i = 0; (i < haystack_length) && pos == -1; i++)
{
if (haystack[i] == needle[0] && needle_length == 1)
return i;
else if (haystack[i] == needle[0])
{
for (j = 1; (j < needle_length); j++)
{
if (haystack[i + j] == needle[j])
{
if (pos == -1)
pos = i;
}
else
{
pos = -1;
break;
}
}
}
}
return pos;
}
sub = strstr(haystack, needle);
if (! sub)
return -1;
return sub - haystack;
}