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

535
glib/gstring.c
View File

File diff suppressed because it is too large Load Diff

180
glib/gstring.h
View File

@@ -8,7 +8,7 @@
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
@@ -37,8 +37,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GString GString; typedef struct _GString GString;
typedef struct _GStringChunk GStringChunk; typedef struct _GStringChunk GStringChunk;
/** /**
* GString: * GString:
@@ -55,100 +55,100 @@ typedef struct _GStringChunk GStringChunk;
struct _GString struct _GString
{ {
gchar *str; gchar *str;
gsize len; gsize len;
gsize allocated_len; gsize allocated_len;
}; };
/* String Chunks /* String Chunks
*/ */
GStringChunk* g_string_chunk_new (gsize size); GStringChunk* g_string_chunk_new (gsize size);
void g_string_chunk_free (GStringChunk *chunk); void g_string_chunk_free (GStringChunk *chunk);
void g_string_chunk_clear (GStringChunk *chunk); void g_string_chunk_clear (GStringChunk *chunk);
gchar* g_string_chunk_insert (GStringChunk *chunk, gchar* g_string_chunk_insert (GStringChunk *chunk,
const gchar *string); const gchar *string);
gchar* g_string_chunk_insert_len (GStringChunk *chunk, gchar* g_string_chunk_insert_len (GStringChunk *chunk,
const gchar *string, const gchar *string,
gssize len); gssize len);
gchar* g_string_chunk_insert_const (GStringChunk *chunk, gchar* g_string_chunk_insert_const (GStringChunk *chunk,
const gchar *string); const gchar *string);
/* Strings /* Strings
*/ */
GString* g_string_new (const gchar *init); GString* g_string_new (const gchar *init);
GString* g_string_new_len (const gchar *init, GString* g_string_new_len (const gchar *init,
gssize len); gssize len);
GString* g_string_sized_new (gsize dfl_size); GString* g_string_sized_new (gsize dfl_size);
gchar* g_string_free (GString *string, gchar* g_string_free (GString *string,
gboolean free_segment); gboolean free_segment);
gboolean g_string_equal (const GString *v, gboolean g_string_equal (const GString *v,
const GString *v2); const GString *v2);
guint g_string_hash (const GString *str); guint g_string_hash (const GString *str);
GString* g_string_assign (GString *string, GString* g_string_assign (GString *string,
const gchar *rval); const gchar *rval);
GString* g_string_truncate (GString *string, GString* g_string_truncate (GString *string,
gsize len); gsize len);
GString* g_string_set_size (GString *string, GString* g_string_set_size (GString *string,
gsize len); gsize len);
GString* g_string_insert_len (GString *string, GString* g_string_insert_len (GString *string,
gssize pos, gssize pos,
const gchar *val, const gchar *val,
gssize len); gssize len);
GString* g_string_append (GString *string, GString* g_string_append (GString *string,
const gchar *val); const gchar *val);
GString* g_string_append_len (GString *string, GString* g_string_append_len (GString *string,
const gchar *val, const gchar *val,
gssize len); gssize len);
GString* g_string_append_c (GString *string, GString* g_string_append_c (GString *string,
gchar c); gchar c);
GString* g_string_append_unichar (GString *string, GString* g_string_append_unichar (GString *string,
gunichar wc); gunichar wc);
GString* g_string_prepend (GString *string, GString* g_string_prepend (GString *string,
const gchar *val); const gchar *val);
GString* g_string_prepend_c (GString *string, GString* g_string_prepend_c (GString *string,
gchar c); gchar c);
GString* g_string_prepend_unichar (GString *string, GString* g_string_prepend_unichar (GString *string,
gunichar wc); gunichar wc);
GString* g_string_prepend_len (GString *string, GString* g_string_prepend_len (GString *string,
const gchar *val, const gchar *val,
gssize len); gssize len);
GString* g_string_insert (GString *string, GString* g_string_insert (GString *string,
gssize pos, gssize pos,
const gchar *val); const gchar *val);
GString* g_string_insert_c (GString *string, GString* g_string_insert_c (GString *string,
gssize pos, gssize pos,
gchar c); gchar c);
GString* g_string_insert_unichar (GString *string, GString* g_string_insert_unichar (GString *string,
gssize pos, gssize pos,
gunichar wc); gunichar wc);
GString* g_string_overwrite (GString *string, GString* g_string_overwrite (GString *string,
gsize pos, gsize pos,
const gchar *val); const gchar *val);
GString* g_string_overwrite_len (GString *string, GString* g_string_overwrite_len (GString *string,
gsize pos, gsize pos,
const gchar *val, const gchar *val,
gssize len); gssize len);
GString* g_string_erase (GString *string, GString* g_string_erase (GString *string,
gssize pos, gssize pos,
gssize len); gssize len);
GString* g_string_ascii_down (GString *string); GString* g_string_ascii_down (GString *string);
GString* g_string_ascii_up (GString *string); GString* g_string_ascii_up (GString *string);
void g_string_vprintf (GString *string, void g_string_vprintf (GString *string,
const gchar *format, const gchar *format,
va_list args); va_list args);
void g_string_printf (GString *string, void g_string_printf (GString *string,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF (2, 3); ...) G_GNUC_PRINTF (2, 3);
void g_string_append_vprintf (GString *string, void g_string_append_vprintf (GString *string,
const gchar *format, const gchar *format,
va_list args); va_list args);
void g_string_append_printf (GString *string, void g_string_append_printf (GString *string,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF (2, 3); ...) G_GNUC_PRINTF (2, 3);
GString * g_string_append_uri_escaped(GString *string, GString* g_string_append_uri_escaped (GString *string,
const char *unescaped, const gchar *unescaped,
const char *reserved_chars_allowed, const gchar *reserved_chars_allowed,
gboolean allow_utf8); gboolean allow_utf8);
/* -- optimize g_strig_append_c --- */ /* -- optimize g_strig_append_c --- */
#ifdef G_CAN_INLINE #ifdef G_CAN_INLINE
@@ -171,17 +171,11 @@ g_string_append_c_inline (GString *gstring,
#ifndef G_DISABLE_DEPRECATED #ifndef G_DISABLE_DEPRECATED
/* The following two functions are deprecated and will be removed in GString* g_string_down (GString *string);
* the next major release. They use the locale-specific tolower and GString* g_string_up (GString *string);
* toupper, which is almost never the right thing.
*/
GString* g_string_down (GString *string); #define g_string_sprintf g_string_printf
GString* g_string_up (GString *string); #define g_string_sprintfa g_string_append_printf
/* These aliases are included for compatibility. */
#define g_string_sprintf g_string_printf
#define g_string_sprintfa g_string_append_printf
#endif /* G_DISABLE_DEPRECATED */ #endif /* G_DISABLE_DEPRECATED */