luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-12 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

make static

Browse Source 
2000-12-13  Havoc Pennington  <hp@redhat.com>

	* gconvert.c (open_converter): make static

	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
	speeding it up - now we just return FALSE if we had to bail out
	for any reason before getting to the end of the string, as defined
	by a nul byte if len was -1, defined by the len otherwise. This
	also fixes a bug where nul bytes were not treated as invalid
	when the length was specified.
This commit is contained in:
Havoc Pennington 2000-12-13 23:54:51 +00:00 committed by Havoc Pennington
parent 484f2ee732
commit b0baf3db03
12 changed files with 120 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2000-12-13 Havoc Pennington <hp@redhat.com>
* gconvert.c (open_converter): make static
* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
speeding it up - now we just return FALSE if we had to bail out
for any reason before getting to the end of the string, as defined
by a nul byte if len was -1, defined by the len otherwise. This
also fixes a bug where nul bytes were not treated as invalid
when the length was specified.
2000-12-12 Havoc Pennington <hp@pobox.com>
* gmain.c (g_main_context_destroy): don't try to use thread stuff

2
gconvert.c
View File

@ -80,7 +80,7 @@ g_iconv_close (GIConv converter)
return iconv_close (cd);
}
GIConv
static GIConv
open_converter (const gchar *to_codeset,
const gchar *from_codeset,
GError **error)

2
glib/gconvert.c
View File

@ -80,7 +80,7 @@ g_iconv_close (GIConv converter)
return iconv_close (cd);
}
GIConv
static GIConv
open_converter (const gchar *to_codeset,
const gchar *from_codeset,
GError **error)

30
glib/gutf8.c
View File

@ -550,7 +550,6 @@ g_utf8_validate (const gchar *str,
{
const gchar *p;
gboolean retval = TRUE;
if (end)
*end = str;
@ -566,34 +565,35 @@ g_utf8_validate (const gchar *str,
UTF8_COMPUTE (c, mask, len);
if (len == -1)
{
retval = FALSE;
break;
}
break;
/* check that the expected number of bytes exists in str */
if (max_len >= 0 &&
((max_len - (p - str)) < len))
{
retval = FALSE;
break;
}
break;
UTF8_GET (result, p, i, mask, len);
if (result == (gunichar)-1)
{
retval = FALSE;
break;
}
break;
p += len;
}
if (end)
*end = p;
return retval;
/* See that we covered the entire length if a length was
* passed in, or that we ended on a nul if not
*/
if (max_len >= 0 &&
p != (str + max_len))
return FALSE;
else if (max_len < 0 &&
*p != '\0')
return FALSE;
else
return TRUE;
}

30
gutf8.c
View File

@ -550,7 +550,6 @@ g_utf8_validate (const gchar *str,
{
const gchar *p;
gboolean retval = TRUE;
if (end)
*end = str;
@ -566,34 +565,35 @@ g_utf8_validate (const gchar *str,
UTF8_COMPUTE (c, mask, len);
if (len == -1)
{
retval = FALSE;
break;
}
break;
/* check that the expected number of bytes exists in str */
if (max_len >= 0 &&
((max_len - (p - str)) < len))
{
retval = FALSE;
break;
}
break;
UTF8_GET (result, p, i, mask, len);
if (result == (gunichar)-1)
{
retval = FALSE;
break;
}
break;
p += len;
}
if (end)
*end = p;
return retval;
/* See that we covered the entire length if a length was
* passed in, or that we ended on a nul if not
*/
if (max_len >= 0 &&
p != (str + max_len))
return FALSE;
else if (max_len < 0 &&
*p != '\0')
return FALSE;
else
return TRUE;
}