luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 08:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REVERT] Bug 548612 – g_strstr_len() should use memmem when available

Browse Source 
2008-08-28  Ryan Lortie  <desrt@desrt.ca>

        [REVERT] Bug 548612 – g_strstr_len() should use memmem when available

        * configure.in:
        * glib/gstrfuncs.c (g_strstr_len): revert use of memmem (see bug)


svn path=/trunk/; revision=7413
This commit is contained in:
Ryan Lortie
2008-08-28 22:55:36 +00:00
committed by Ryan Lortie
parent 0eca17a9f2
commit ef4df848e0
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-08-28 Ryan Lortie <desrt@desrt.ca>
[REVERT] Bug 548612 – g_strstr_len() should use memmem when available
* configure.in:
* glib/gstrfuncs.c (g_strstr_len): revert use of memmem (see bug)
2008-08-28 Matthias Clasen <mclsaen@redhat.com> 2008-08-28 Matthias Clasen <mclsaen@redhat.com>
* configure.in: Change libselinux detection to not link libglib * configure.in: Change libselinux detection to not link libglib

1
configure.in
View File

@@ -559,7 +559,6 @@ AC_CHECK_FUNCS(mmap)
AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNCS(posix_memalign)
AC_CHECK_FUNCS(memalign) AC_CHECK_FUNCS(memalign)
AC_CHECK_FUNCS(valloc) AC_CHECK_FUNCS(valloc)
AC_CHECK_FUNCS(memmem)
AC_CHECK_FUNCS(atexit on_exit) AC_CHECK_FUNCS(atexit on_exit)

7
glib/gstrfuncs.c
View File

@@ -2602,12 +2602,6 @@ g_strstr_len (const gchar *haystack,
return strstr (haystack, needle); return strstr (haystack, needle);
else else
{ {
#ifdef HAVE_MEMMEM
size_t len;
len = MIN(haystack_len, strlen (haystack));
return memmem (haystack, len, needle, strlen (needle));
#else
const gchar *p = haystack; const gchar *p = haystack;
gsize needle_len = strlen (needle); gsize needle_len = strlen (needle);
const gchar *end; const gchar *end;
@@ -2634,7 +2628,6 @@ g_strstr_len (const gchar *haystack,
} }
return NULL; return NULL;
#endif /* HAVE_MEMMEM */
} }
} }