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

GString: cosmetic cleanups

Browse Source
This commit is contained in:
Matthias Clasen
2011-10-01 23:23:40 -04:00
parent 7154d44c5c
commit 459b14d89a
2 changed files with 357 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
glib/gstring.c
View File

@@ -71,14 +71,14 @@
*
* To free the entire #GStringChunk use g_string_chunk_free(). It is
* not possible to free individual strings.
**/
*/
/**
* GStringChunk:
*
* An opaque data structure representing String Chunks. It should only
* be accessed by using the following functions.
**/
*/
struct _GStringChunk
{
GHashTable *const_table;
@@ -132,7 +132,7 @@ g_str_equal (gconstpointer v1,
* when using strings as keys in a #GHashTable.
*
* Returns: a hash value corresponding to the key
**/
*/
guint
g_str_hash (gconstpointer v)
{
@@ -392,7 +392,7 @@ g_string_chunk_insert_len (GStringChunk *chunk,
/* Strings.
*/
static void
g_string_maybe_expand (GString* string,
g_string_maybe_expand (GString *string,
gsize len)
{
if (string->len + len >= string->allocated_len)
@@ -414,7 +414,7 @@ g_string_maybe_expand (GString* string,
*
* Returns: the new #GString
*/
GString*
GString *
g_string_sized_new (gsize dfl_size)
{
GString *string = g_slice_new (GString);
@@ -437,7 +437,7 @@ g_string_sized_new (gsize dfl_size)
*
* Returns: the new #GString
*/
GString*
GString *
g_string_new (const gchar *init)
{
GString *string;
@@ -472,7 +472,7 @@ g_string_new (const gchar *init)
*
* Returns: a new #GString
*/
GString*
GString *
g_string_new_len (const gchar *init,
gssize len)
{
@@ -494,7 +494,7 @@ g_string_new_len (const gchar *init,
/**
* g_string_free:
* @string: a #GString
* @free_segment: if %TRUE the actual character data is freed as well
* @free_segment: if %TRUE, the actual character data is freed as well
*
* Frees the memory allocated for the #GString.
* If @free_segment is %TRUE it also frees the character data. If
@@ -504,7 +504,7 @@ g_string_new_len (const gchar *init,
* Returns: the character data of @string
* (i.e. %NULL if @free_segment is %TRUE)
*/
gchar*
gchar *
g_string_free (GString *string,
gboolean free_segment)
{
@@ -569,7 +569,6 @@ g_string_equal (const GString *v,
*
* Returns: hash code for @str
*/
/* 31 bit hash function */
guint
g_string_hash (const GString *str)
{
@@ -577,6 +576,7 @@ g_string_hash (const GString *str)
gsize n = str->len;
guint h = 0;
/* 31 bit hash function */
while (n--)
{
h = (h << 5) - h + *p;
@@ -599,7 +599,7 @@ g_string_hash (const GString *str)
*
* Returns: @string
*/
GString*
GString *
g_string_assign (GString *string,
const gchar *rval)
{
@@ -609,8 +609,9 @@ g_string_assign (GString *string,
/* Make sure assigning to itself doesn't corrupt the string. */
if (string->str != rval)
{
/* Assigning from substring should be ok since g_string_truncate
does not realloc. */
/* Assigning from substring should be ok, since
* g_string_truncate() does not reallocate.
*/
g_string_truncate (string, 0);
g_string_append (string, rval);
}
@@ -627,7 +628,7 @@ g_string_assign (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_truncate (GString *string,
gsize len)
{
@@ -651,8 +652,8 @@ g_string_truncate (GString *string,
* always, string->str[string->len] will be a nul byte.)
*
* Return value: @string
**/
GString*
*/
GString *
g_string_set_size (GString *string,
gsize len)
{
@@ -686,7 +687,7 @@ g_string_set_size (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_insert_len (GString *string,
gssize pos,
const gchar *val,
@@ -706,10 +707,11 @@ g_string_insert_len (GString *string,
else
g_return_val_if_fail (pos <= string->len, string);
/* Check whether val represents a substring of string. This test
probably violates chapter and verse of the C standards, since
">=" and "<=" are only valid when val really is a substring.
In practice, it will work on modern archs. */
/* Check whether val represents a substring of string.
* This test probably violates chapter and verse of the C standards,
* since ">=" and "<=" are only valid when val really is a substring.
* In practice, it will work on modern archs.
*/
if (val >= string->str && val <= string->str + string->len)
{
gsize offset = val - string->str;
@@ -763,7 +765,8 @@ g_string_insert_len (GString *string,
#define SUB_DELIM_CHARS "!$&'()*+,;="
static gboolean
is_valid (char c, const char *reserved_chars_allowed)
is_valid (char c,
const char *reserved_chars_allowed)
{
if (g_ascii_isalnum (c) ||
c == '-' ||
@@ -791,7 +794,8 @@ gunichar_ok (gunichar c)
* g_string_append_uri_escaped:
* @string: a #GString
* @unescaped: a string
* @reserved_chars_allowed: a string of reserved characters allowed to be used, or %NULL
* @reserved_chars_allowed: a string of reserved characters allowed
* to be used, or %NULL
* @allow_utf8: set %TRUE if the escaped string may include UTF8 characters
*
* Appends @unescaped to @string, escaped any characters that
@@ -800,15 +804,15 @@ gunichar_ok (gunichar c)
* Returns: @string
*
* Since: 2.16
**/
*/
GString *
g_string_append_uri_escaped (GString *string,
const char *unescaped,
const char *reserved_chars_allowed,
const gchar *unescaped,
const gchar *reserved_chars_allowed,
gboolean allow_utf8)
{
unsigned char c;
const char *end;
const gchar *end;
static const gchar hex[16] = "0123456789ABCDEF";
g_return_val_if_fail (string != NULL, NULL);
@@ -852,7 +856,7 @@ g_string_append_uri_escaped (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_append (GString *string,
const gchar *val)
{
@@ -878,7 +882,7 @@ g_string_append (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_append_len (GString *string,
const gchar *val,
gssize len)
@@ -900,7 +904,7 @@ g_string_append_len (GString *string,
* Returns: @string
*/
#undef g_string_append_c
GString*
GString *
g_string_append_c (GString *string,
gchar c)
{
@@ -918,8 +922,8 @@ g_string_append_c (GString *string,
* to the string.
*
* Return value: @string
**/
GString*
*/
GString *
g_string_append_unichar (GString *string,
gunichar wc)
{
@@ -938,7 +942,7 @@ g_string_append_unichar (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_prepend (GString *string,
const gchar *val)
{
@@ -964,7 +968,7 @@ g_string_prepend (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_prepend_len (GString *string,
const gchar *val,
gssize len)
@@ -985,7 +989,7 @@ g_string_prepend_len (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_prepend_c (GString *string,
gchar c)
{
@@ -1003,8 +1007,8 @@ g_string_prepend_c (GString *string,
* to the string.
*
* Return value: @string
**/
GString*
*/
GString *
g_string_prepend_unichar (GString *string,
gunichar wc)
{
@@ -1024,13 +1028,14 @@ g_string_prepend_unichar (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_insert (GString *string,
gssize pos,
const gchar *val)
{
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string);
if (pos >= 0)
g_return_val_if_fail (pos <= string->len, string);
@@ -1047,7 +1052,7 @@ g_string_insert (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_insert_c (GString *string,
gssize pos,
gchar c)
@@ -1077,16 +1082,16 @@ g_string_insert_c (GString *string,
/**
* g_string_insert_unichar:
* @string: a #GString
* @pos: the position at which to insert character, or -1 to
* append at the end of the string
* @pos: the position at which to insert character, or -1
* to append at the end of the string
* @wc: a Unicode character
*
* Converts a Unicode character into UTF-8, and insert it
* into the string at the given position.
*
* Return value: @string
**/
GString*
*/
GString *
g_string_insert_unichar (GString *string,
gssize pos,
gunichar wc)
@@ -1168,7 +1173,7 @@ g_string_insert_unichar (GString *string,
* Return value: @string
*
* Since: 2.14
**/
*/
GString *
g_string_overwrite (GString *string,
gsize pos,
@@ -1191,7 +1196,7 @@ g_string_overwrite (GString *string,
* Return value: @string
*
* Since: 2.14
**/
*/
GString *
g_string_overwrite_len (GString *string,
gsize pos,
@@ -1239,7 +1244,7 @@ g_string_overwrite_len (GString *string,
*
* Returns: @string
*/
GString*
GString *
g_string_erase (GString *string,
gssize pos,
gssize len)
@@ -1269,13 +1274,13 @@ g_string_erase (GString *string,
* g_string_ascii_down:
* @string: a GString
*
* Converts all upper case ASCII letters to lower case ASCII letters.
* Converts all uppercase ASCII letters to lowercase ASCII letters.
*
* Return value: passed-in @string pointer, with all the upper case
* characters converted to lower case in place, with
* semantics that exactly match g_ascii_tolower().
**/
GString*
* Return value: passed-in @string pointer, with all the
* uppercase characters converted to lowercase in place,
* with semantics that exactly match g_ascii_tolower().
*/
GString *
g_string_ascii_down (GString *string)
{
gchar *s;
@@ -1300,13 +1305,13 @@ g_string_ascii_down (GString *string)
* g_string_ascii_up:
* @string: a GString
*
* Converts all lower case ASCII letters to upper case ASCII letters.
* Converts all lowercase ASCII letters to uppercase ASCII letters.
*
* Return value: passed-in @string pointer, with all the lower case
* characters converted to upper case in place, with
* semantics that exactly match g_ascii_toupper().
**/
GString*
* Return value: passed-in @string pointer, with all the
* lowercase characters converted to uppercase in place,
* with semantics that exactly match g_ascii_toupper().
*/
GString *
g_string_ascii_up (GString *string)
{
gchar *s;
@@ -1333,13 +1338,13 @@ g_string_ascii_up (GString *string)
*
* Converts a #GString to lowercase.
*
* Returns: the #GString.
* Returns: the #GString
*
* Deprecated:2.2: This function uses the locale-specific
* tolower() function, which is almost never the right thing.
* Use g_string_ascii_down() or g_utf8_strdown() instead.
*/
GString*
GString *
g_string_down (GString *string)
{
guchar *s;
@@ -1372,8 +1377,8 @@ g_string_down (GString *string)
* Deprecated:2.2: This function uses the locale-specific
* toupper() function, which is almost never the right thing.
* Use g_string_ascii_up() or g_utf8_strup() instead.
**/
GString*
*/
GString *
g_string_up (GString *string)
{
guchar *s;

12
glib/gstring.h
View File

@@ -145,9 +145,9 @@ void g_string_append_vprintf (GString *string,
void g_string_append_printf (GString *string,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
GString * g_string_append_uri_escaped(GString *string,
const char *unescaped,
const char *reserved_chars_allowed,
GString* g_string_append_uri_escaped (GString *string,
const gchar *unescaped,
const gchar *reserved_chars_allowed,
gboolean allow_utf8);
/* -- optimize g_strig_append_c --- */
@@ -171,15 +171,9 @@ g_string_append_c_inline (GString *gstring,
#ifndef G_DISABLE_DEPRECATED
/* The following two functions are deprecated and will be removed in
* the next major release. They use the locale-specific tolower and
* toupper, which is almost never the right thing.
*/
GString* g_string_down (GString *string);
GString* g_string_up (GString *string);
/* These aliases are included for compatibility. */
#define g_string_sprintf g_string_printf
#define g_string_sprintfa g_string_append_printf