luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unneeded checks.

Browse Source 
2007-03-19  Paolo Borelli  <pborelli@katamail.com>

	* glib/gutf8.c (fast_validate_len): remove unneeded checks.


svn path=/trunk/; revision=5427
This commit is contained in:
Paolo Borelli 2007-03-18 23:20:35 +00:00 committed by Paolo Borelli
parent c1025d6be4
commit e51854dd5d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-03-19 Paolo Borelli <pborelli@katamail.com>
* glib/gutf8.c (fast_validate_len): remove unneeded checks.
2007-03-18 Matthias Clasen <mclasen@redhat.com>
* glib/gregex.c: Cosmetic fixes

11
glib/gutf8.c
View File

@ -1631,7 +1631,9 @@ fast_validate_len (const char *str,
gunichar min = 0;
const gchar *p;
for (p = str; (max_len < 0 || (p - str) < max_len) && *p; p++)
g_assert (max_len >= 0);
for (p = str; ((p - str) < max_len) && *p; p++)
{
if (*(guchar *)p < 128)
/* done */;
@ -1642,7 +1644,7 @@ fast_validate_len (const char *str,
last = p;
if ((*(guchar *)p & 0xe0) == 0xc0) /* 110xxxxx */
{
if (G_UNLIKELY (max_len >= 0 && max_len - (p - str) < 2))
if (G_UNLIKELY (max_len - (p - str) < 2))
goto error;
if (G_UNLIKELY ((*(guchar *)p & 0x1e) == 0))
@ -1655,7 +1657,7 @@ fast_validate_len (const char *str,
{
if ((*(guchar *)p & 0xf0) == 0xe0) /* 1110xxxx */
{
if (G_UNLIKELY (max_len >= 0 && max_len - (p - str) < 3))
if (G_UNLIKELY (max_len - (p - str) < 3))
goto error;
min = (1 << 11);
@ -1664,7 +1666,7 @@ fast_validate_len (const char *str,
}
else if ((*(guchar *)p & 0xf8) == 0xf0) /* 11110xxx */
{
if (G_UNLIKELY (max_len >= 0 && max_len - (p - str) < 4))
if (G_UNLIKELY (max_len - (p - str) < 4))
goto error;
min = (1 << 16);
@ -1744,7 +1746,6 @@ g_utf8_validate (const char *str,
return TRUE;
}
/**
* g_unichar_validate:
* @ch: a Unicode character