X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgstring.c;h=f5890bf6424b5d39bf7f2e60277e7ca80beddcd0;hb=40650e33239994237917322d4cfecc34e4cc4394;hp=312a54060f17d1281432b04e10de414c8d0d4772;hpb=931ea952650b013b834041b91b0c37a748ffd449;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gstring.c b/glib/gstring.c
index 312a540..f5890bf 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -2,506 +2,1265 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see .
*/
-/*
+/*
+ * Modified by the GLib Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GLib Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+/*
* MT safe
*/
+#include "config.h"
+
#include
#include
#include
#include
#include
-#include "glib.h"
+#include "gstring.h"
-typedef struct _GRealStringChunk GRealStringChunk;
-typedef struct _GRealString GRealString;
+#include "gprintf.h"
-struct _GRealStringChunk
-{
- GHashTable *const_table;
- GSList *storage_list;
- gint storage_next;
- gint this_size;
- gint default_size;
-};
-
-struct _GRealString
-{
- gchar *str;
- gint len;
- gint alloc;
-};
-static G_LOCK_DEFINE(string_mem_chunk);
-static GMemChunk *string_mem_chunk = NULL;
+/**
+ * SECTION:strings
+ * @title: Strings
+ * @short_description: text buffers which grow automatically
+ * as text is added
+ *
+ * A #GString is an object that handles the memory management of a C
+ * string for you. The emphasis of #GString is on text, typically
+ * UTF-8. Crucially, the "str" member of a #GString is guaranteed to
+ * have a trailing nul character, and it is therefore always safe to
+ * call functions such as strchr() or g_strdup() on it.
+ *
+ * However, a #GString can also hold arbitrary binary data, because it
+ * has a "len" member, which includes any possible embedded nul
+ * characters in the data. Conceptually then, #GString is like a
+ * #GByteArray with the addition of many convenience methods for text,
+ * and a guaranteed nul terminator.
+ */
-/* Hash Functions.
+/**
+ * GString:
+ * @str: points to the character data. It may move as text is added.
+ * The @str field is null-terminated and so
+ * can be used as an ordinary C string.
+ * @len: contains the length of the string, not including the
+ * terminating nul byte.
+ * @allocated_len: the number of bytes that can be stored in the
+ * string before it needs to be reallocated. May be larger than @len.
+ *
+ * The GString struct contains the public fields of a GString.
*/
-gint
-g_str_equal (gconstpointer v, gconstpointer v2)
-{
- return strcmp ((const gchar*) v, (const gchar*)v2) == 0;
-}
-/* a char* hash function from ASU */
-guint
-g_str_hash (gconstpointer v)
-{
- const char *s = (char*)v;
- const char *p;
- guint h=0, g;
+#define MY_MAXSIZE ((gsize)-1)
- for(p = s; *p != '\0'; p += 1) {
- h = ( h << 4 ) + *p;
- if ( ( g = h & 0xf0000000 ) ) {
- h = h ^ (g >> 24);
- h = h ^ g;
+static inline gsize
+nearest_power (gsize base, gsize num)
+{
+ if (num > MY_MAXSIZE / 2)
+ {
+ return MY_MAXSIZE;
}
- }
+ else
+ {
+ gsize n = base;
- return h /* % M */;
+ while (n < num)
+ n <<= 1;
+
+ return n;
+ }
}
+static void
+g_string_maybe_expand (GString *string,
+ gsize len)
+{
+ if (string->len + len >= string->allocated_len)
+ {
+ string->allocated_len = nearest_power (1, string->len + len + 1);
+ string->str = g_realloc (string->str, string->allocated_len);
+ }
+}
-/* String Chunks.
+/**
+ * g_string_sized_new:
+ * @dfl_size: the default size of the space allocated to
+ * hold the string
+ *
+ * Creates a new #GString, with enough space for @dfl_size
+ * bytes. This is useful if you are going to add a lot of
+ * text to the string and don't want it to be reallocated
+ * too often.
+ *
+ * Returns: the new #GString
*/
-
-GStringChunk*
-g_string_chunk_new (gint default_size)
+GString *
+g_string_sized_new (gsize dfl_size)
{
- GRealStringChunk *new_chunk = g_new (GRealStringChunk, 1);
- gint size = 1;
+ GString *string = g_slice_new (GString);
- while (size < default_size)
- size <<= 1;
+ string->allocated_len = 0;
+ string->len = 0;
+ string->str = NULL;
- new_chunk->const_table = NULL;
- new_chunk->storage_list = NULL;
- new_chunk->storage_next = size;
- new_chunk->default_size = size;
- new_chunk->this_size = size;
+ g_string_maybe_expand (string, MAX (dfl_size, 2));
+ string->str[0] = 0;
- return (GStringChunk*) new_chunk;
+ return string;
}
-void
-g_string_chunk_free (GStringChunk *fchunk)
+/**
+ * g_string_new:
+ * @init: (allow-none): the initial text to copy into the string, or %NULL to
+ * start with an empty string.
+ *
+ * Creates a new #GString, initialized with the given string.
+ *
+ * Returns: the new #GString
+ */
+GString *
+g_string_new (const gchar *init)
{
- GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
- GSList *tmp_list;
-
- g_return_if_fail (chunk != NULL);
+ GString *string;
- if (chunk->storage_list)
+ if (init == NULL || *init == '\0')
+ string = g_string_sized_new (2);
+ else
{
- for (tmp_list = chunk->storage_list; tmp_list; tmp_list = tmp_list->next)
- g_free (tmp_list->data);
+ gint len;
- g_slist_free (chunk->storage_list);
- }
+ len = strlen (init);
+ string = g_string_sized_new (len + 2);
- if (chunk->const_table)
- g_hash_table_destroy (chunk->const_table);
+ g_string_append_len (string, init, len);
+ }
- g_free (chunk);
+ return string;
}
-gchar*
-g_string_chunk_insert (GStringChunk *fchunk,
- const gchar *string)
+/**
+ * g_string_new_len:
+ * @init: initial contents of the string
+ * @len: length of @init to use
+ *
+ * Creates a new #GString with @len bytes of the @init buffer.
+ * Because a length is provided, @init need not be nul-terminated,
+ * and can contain embedded nul bytes.
+ *
+ * Since this function does not stop at nul bytes, it is the caller's
+ * responsibility to ensure that @init has at least @len addressable
+ * bytes.
+ *
+ * Returns: a new #GString
+ */
+GString *
+g_string_new_len (const gchar *init,
+ gssize len)
{
- GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
- gint len = strlen (string);
- char* pos;
-
- g_return_val_if_fail (chunk != NULL, NULL);
+ GString *string;
- if ((chunk->storage_next + len + 1) > chunk->this_size)
+ if (len < 0)
+ return g_string_new (init);
+ else
{
- gint new_size = chunk->default_size;
-
- while (new_size < len+1)
- new_size <<= 1;
+ string = g_string_sized_new (len);
- chunk->storage_list = g_slist_prepend (chunk->storage_list,
- g_new (char, new_size));
+ if (init)
+ g_string_append_len (string, init, len);
- chunk->this_size = new_size;
- chunk->storage_next = 0;
+ return string;
}
+}
+
+/**
+ * g_string_free:
+ * @string: a #GString
+ * @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
+ * it's %FALSE, the caller gains ownership of the buffer and must
+ * free it after use with g_free().
+ *
+ * Returns: the character data of @string
+ * (i.e. %NULL if @free_segment is %TRUE)
+ */
+gchar *
+g_string_free (GString *string,
+ gboolean free_segment)
+{
+ gchar *segment;
- pos = ((char*)chunk->storage_list->data) + chunk->storage_next;
+ g_return_val_if_fail (string != NULL, NULL);
- strcpy (pos, string);
+ if (free_segment)
+ {
+ g_free (string->str);
+ segment = NULL;
+ }
+ else
+ segment = string->str;
- chunk->storage_next += len + 1;
+ g_slice_free (GString, string);
- return pos;
+ return segment;
}
-gchar*
-g_string_chunk_insert_const (GStringChunk *fchunk,
- const gchar *string)
+/**
+ * g_string_free_to_bytes:
+ * @string: (transfer full): a #GString
+ *
+ * Transfers ownership of the contents of @string to a newly allocated
+ * #GBytes. The #GString structure itself is deallocated, and it is
+ * therefore invalid to use @string after invoking this function.
+ *
+ * Note that while #GString ensures that its buffer always has a
+ * trailing nul character (not reflected in its "len"), the returned
+ * #GBytes does not include this extra nul; i.e. it has length exactly
+ * equal to the "len" member.
+ *
+ * Returns: A newly allocated #GBytes containing contents of @string; @string itself is freed
+ * Since: 2.34
+ */
+GBytes*
+g_string_free_to_bytes (GString *string)
{
- GRealStringChunk *chunk = (GRealStringChunk*) fchunk;
- char* lookup;
+ gsize len;
+ gchar *buf;
- g_return_val_if_fail (chunk != NULL, NULL);
-
- if (!chunk->const_table)
- chunk->const_table = g_hash_table_new (g_str_hash, g_str_equal);
+ g_return_val_if_fail (string != NULL, NULL);
- lookup = (char*) g_hash_table_lookup (chunk->const_table, (gchar *)string);
+ len = string->len;
- if (!lookup)
- {
- lookup = g_string_chunk_insert (fchunk, string);
- g_hash_table_insert (chunk->const_table, lookup, lookup);
- }
+ buf = g_string_free (string, FALSE);
- return lookup;
+ return g_bytes_new_take (buf, len);
}
-/* Strings.
+/**
+ * g_string_equal:
+ * @v: a #GString
+ * @v2: another #GString
+ *
+ * Compares two strings for equality, returning %TRUE if they are equal.
+ * For use with #GHashTable.
+ *
+ * Returns: %TRUE if the strings are the same length and contain the
+ * same bytes
*/
-static gint
-nearest_pow (gint num)
+gboolean
+g_string_equal (const GString *v,
+ const GString *v2)
{
- gint n = 1;
+ gchar *p, *q;
+ GString *string1 = (GString *) v;
+ GString *string2 = (GString *) v2;
+ gsize i = string1->len;
- while (n < num)
- n <<= 1;
+ if (i != string2->len)
+ return FALSE;
- return n;
+ p = string1->str;
+ q = string2->str;
+ while (i)
+ {
+ if (*p != *q)
+ return FALSE;
+ p++;
+ q++;
+ i--;
+ }
+ return TRUE;
}
-static void
-g_string_maybe_expand (GRealString* string, gint len)
+/**
+ * g_string_hash:
+ * @str: a string to hash
+ *
+ * Creates a hash code for @str; for use with #GHashTable.
+ *
+ * Returns: hash code for @str
+ */
+guint
+g_string_hash (const GString *str)
{
- if (string->len + len >= string->alloc)
+ const gchar *p = str->str;
+ gsize n = str->len;
+ guint h = 0;
+
+ /* 31 bit hash function */
+ while (n--)
{
- string->alloc = nearest_pow (string->len + len + 1);
- string->str = g_realloc (string->str, string->alloc);
+ h = (h << 5) - h + *p;
+ p++;
}
+
+ return h;
}
-GString*
-g_string_sized_new (guint dfl_size)
+/**
+ * g_string_assign:
+ * @string: the destination #GString. Its current contents
+ * are destroyed.
+ * @rval: the string to copy into @string
+ *
+ * Copies the bytes from a string into a #GString,
+ * destroying any previous contents. It is rather like
+ * the standard strcpy() function, except that you do not
+ * have to worry about having enough space to copy the string.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_assign (GString *string,
+ const gchar *rval)
{
- GRealString *string;
+ g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (rval != NULL, string);
- g_lock (string_mem_chunk);
- if (!string_mem_chunk)
- string_mem_chunk = g_mem_chunk_new ("string mem chunk",
- sizeof (GRealString),
- 1024, G_ALLOC_AND_FREE);
+ /* 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 reallocate.
+ */
+ g_string_truncate (string, 0);
+ g_string_append (string, rval);
+ }
- string = g_chunk_new (GRealString, string_mem_chunk);
- g_unlock (string_mem_chunk);
+ return string;
+}
- string->alloc = 0;
- string->len = 0;
- string->str = NULL;
+/**
+ * g_string_truncate:
+ * @string: a #GString
+ * @len: the new size of @string
+ *
+ * Cuts off the end of the GString, leaving the first @len bytes.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_truncate (GString *string,
+ gsize len)
+{
+ g_return_val_if_fail (string != NULL, NULL);
- g_string_maybe_expand (string, MAX (dfl_size, 2));
- string->str[0] = 0;
+ string->len = MIN (len, string->len);
+ string->str[string->len] = 0;
- return (GString*) string;
+ return string;
}
-GString*
-g_string_new (const gchar *init)
+/**
+ * g_string_set_size:
+ * @string: a #GString
+ * @len: the new length
+ *
+ * Sets the length of a #GString. If the length is less than
+ * the current length, the string will be truncated. If the
+ * length is greater than the current length, the contents
+ * of the newly added area are undefined. (However, as
+ * always, string->str[string->len] will be a nul byte.)
+ *
+ * Returns: @string
+ */
+GString *
+g_string_set_size (GString *string,
+ gsize len)
{
- GString *string;
+ g_return_val_if_fail (string != NULL, NULL);
- string = g_string_sized_new (2);
+ if (len >= string->allocated_len)
+ g_string_maybe_expand (string, len - string->len);
- if (init)
- g_string_append (string, init);
+ string->len = len;
+ string->str[len] = 0;
return string;
}
-void
-g_string_free (GString *string,
- gint free_segment)
+/**
+ * g_string_insert_len:
+ * @string: a #GString
+ * @pos: position in @string where insertion should
+ * happen, or -1 for at the end
+ * @val: bytes to insert
+ * @len: number of bytes of @val to insert
+ *
+ * Inserts @len bytes of @val into @string at @pos.
+ * Because @len is provided, @val may contain embedded
+ * nuls and need not be nul-terminated. If @pos is -1,
+ * bytes are inserted at the end of the string.
+ *
+ * Since this function does not stop at nul bytes, it is
+ * the caller's responsibility to ensure that @val has at
+ * least @len addressable bytes.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_insert_len (GString *string,
+ gssize pos,
+ const gchar *val,
+ gssize len)
{
- g_return_if_fail (string != NULL);
+ g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (len == 0 || val != NULL, string);
- if (free_segment)
- g_free (string->str);
+ if (len == 0)
+ return string;
+
+ if (len < 0)
+ len = strlen (val);
- g_lock (string_mem_chunk);
- g_mem_chunk_free (string_mem_chunk, string);
- g_unlock (string_mem_chunk);
+ if (pos < 0)
+ pos = string->len;
+ 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.
+ */
+ if (val >= string->str && val <= string->str + string->len)
+ {
+ gsize offset = val - string->str;
+ gsize precount = 0;
+
+ g_string_maybe_expand (string, len);
+ val = string->str + offset;
+ /* At this point, val is valid again. */
+
+ /* Open up space where we are going to insert. */
+ if (pos < string->len)
+ memmove (string->str + pos + len, string->str + pos, string->len - pos);
+
+ /* Move the source part before the gap, if any. */
+ if (offset < pos)
+ {
+ precount = MIN (len, pos - offset);
+ memcpy (string->str + pos, val, precount);
+ }
+
+ /* Move the source part after the gap, if any. */
+ if (len > precount)
+ memcpy (string->str + pos + precount,
+ val + /* Already moved: */ precount + /* Space opened up: */ len,
+ len - precount);
+ }
+ else
+ {
+ g_string_maybe_expand (string, len);
+
+ /* If we aren't appending at the end, move a hunk
+ * of the old string to the end, opening up space
+ */
+ if (pos < string->len)
+ memmove (string->str + pos + len, string->str + pos, string->len - pos);
+
+ /* insert the new string */
+ if (len == 1)
+ string->str[pos] = *val;
+ else
+ memcpy (string->str + pos, val, len);
+ }
+
+ string->len += len;
+
+ string->str[string->len] = 0;
+
+ return string;
}
-GString*
-g_string_assign (GString *lval,
- const gchar *rval)
+#define SUB_DELIM_CHARS "!$&'()*+,;="
+
+static gboolean
+is_valid (char c,
+ const char *reserved_chars_allowed)
{
- g_string_truncate (lval, 0);
- g_string_append (lval, rval);
+ if (g_ascii_isalnum (c) ||
+ c == '-' ||
+ c == '.' ||
+ c == '_' ||
+ c == '~')
+ return TRUE;
+
+ if (reserved_chars_allowed &&
+ strchr (reserved_chars_allowed, c) != NULL)
+ return TRUE;
+
+ return FALSE;
+}
- return lval;
+static gboolean
+gunichar_ok (gunichar c)
+{
+ return
+ (c != (gunichar) -2) &&
+ (c != (gunichar) -1);
}
-GString*
-g_string_truncate (GString* fstring,
- gint len)
+/**
+ * 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
+ * @allow_utf8: set %TRUE if the escaped string may include UTF8 characters
+ *
+ * Appends @unescaped to @string, escaped any characters that
+ * are reserved in URIs using URI-style escape sequences.
+ *
+ * Returns: @string
+ *
+ * Since: 2.16
+ */
+GString *
+g_string_append_uri_escaped (GString *string,
+ const gchar *unescaped,
+ const gchar *reserved_chars_allowed,
+ gboolean allow_utf8)
{
- GRealString *string = (GRealString*)fstring;
+ unsigned char c;
+ const gchar *end;
+ static const gchar hex[16] = "0123456789ABCDEF";
g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (unescaped != NULL, NULL);
- string->len = len;
+ end = unescaped + strlen (unescaped);
- string->str[len] = 0;
+ while ((c = *unescaped) != 0)
+ {
+ if (c >= 0x80 && allow_utf8 &&
+ gunichar_ok (g_utf8_get_char_validated (unescaped, end - unescaped)))
+ {
+ int len = g_utf8_skip [c];
+ g_string_append_len (string, unescaped, len);
+ unescaped += len;
+ }
+ else if (is_valid (c, reserved_chars_allowed))
+ {
+ g_string_append_c (string, c);
+ unescaped++;
+ }
+ else
+ {
+ g_string_append_c (string, '%');
+ g_string_append_c (string, hex[((guchar)c) >> 4]);
+ g_string_append_c (string, hex[((guchar)c) & 0xf]);
+ unescaped++;
+ }
+ }
- return fstring;
+ return string;
}
-GString*
-g_string_append (GString *fstring,
- const gchar *val)
+/**
+ * g_string_append:
+ * @string: a #GString
+ * @val: the string to append onto the end of @string
+ *
+ * Adds a string onto the end of a #GString, expanding
+ * it if necessary.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_append (GString *string,
+ const gchar *val)
{
- GRealString *string = (GRealString*)fstring;
- int len;
-
g_return_val_if_fail (string != NULL, NULL);
- g_return_val_if_fail (val != NULL, fstring);
-
- len = strlen (val);
- g_string_maybe_expand (string, len);
+ g_return_val_if_fail (val != NULL, string);
- strcpy (string->str + string->len, val);
+ return g_string_insert_len (string, -1, val, -1);
+}
- string->len += len;
+/**
+ * g_string_append_len:
+ * @string: a #GString
+ * @val: bytes to append
+ * @len: number of bytes of @val to use
+ *
+ * Appends @len bytes of @val to @string. Because @len is
+ * provided, @val may contain embedded nuls and need not
+ * be nul-terminated.
+ *
+ * Since this function does not stop at nul bytes, it is
+ * the caller's responsibility to ensure that @val has at
+ * least @len addressable bytes.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_append_len (GString *string,
+ const gchar *val,
+ gssize len)
+{
+ g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (len == 0 || val != NULL, string);
- return fstring;
+ return g_string_insert_len (string, -1, val, len);
}
-GString*
-g_string_append_c (GString *fstring,
- gchar c)
+/**
+ * g_string_append_c:
+ * @string: a #GString
+ * @c: the byte to append onto the end of @string
+ *
+ * Adds a byte onto the end of a #GString, expanding
+ * it if necessary.
+ *
+ * Returns: @string
+ */
+#undef g_string_append_c
+GString *
+g_string_append_c (GString *string,
+ gchar c)
{
- GRealString *string = (GRealString*)fstring;
+ g_return_val_if_fail (string != NULL, NULL);
+ return g_string_insert_c (string, -1, c);
+}
+
+/**
+ * g_string_append_unichar:
+ * @string: a #GString
+ * @wc: a Unicode character
+ *
+ * Converts a Unicode character into UTF-8, and appends it
+ * to the string.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_append_unichar (GString *string,
+ gunichar wc)
+{
g_return_val_if_fail (string != NULL, NULL);
- g_string_maybe_expand (string, 1);
- string->str[string->len++] = c;
- string->str[string->len] = 0;
+ return g_string_insert_unichar (string, -1, wc);
+}
- return fstring;
+/**
+ * g_string_prepend:
+ * @string: a #GString
+ * @val: the string to prepend on the start of @string
+ *
+ * Adds a string on to the start of a #GString,
+ * expanding it if necessary.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_prepend (GString *string,
+ const gchar *val)
+{
+ g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (val != NULL, string);
+
+ return g_string_insert_len (string, 0, val, -1);
}
-GString*
-g_string_prepend (GString *fstring,
- const gchar *val)
+/**
+ * g_string_prepend_len:
+ * @string: a #GString
+ * @val: bytes to prepend
+ * @len: number of bytes in @val to prepend
+ *
+ * Prepends @len bytes of @val to @string.
+ * Because @len is provided, @val may contain
+ * embedded nuls and need not be nul-terminated.
+ *
+ * Since this function does not stop at nul bytes,
+ * it is the caller's responsibility to ensure that
+ * @val has at least @len addressable bytes.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_prepend_len (GString *string,
+ const gchar *val,
+ gssize len)
{
- GRealString *string = (GRealString*)fstring;
- gint len;
+ g_return_val_if_fail (string != NULL, NULL);
+ g_return_val_if_fail (val != NULL, string);
+
+ return g_string_insert_len (string, 0, val, len);
+}
+/**
+ * g_string_prepend_c:
+ * @string: a #GString
+ * @c: the byte to prepend on the start of the #GString
+ *
+ * Adds a byte onto the start of a #GString,
+ * expanding it if necessary.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_prepend_c (GString *string,
+ gchar c)
+{
g_return_val_if_fail (string != NULL, NULL);
- g_return_val_if_fail (val != NULL, fstring);
- len = strlen (val);
- g_string_maybe_expand (string, len);
+ return g_string_insert_c (string, 0, c);
+}
- g_memmove (string->str + len, string->str, string->len);
+/**
+ * g_string_prepend_unichar:
+ * @string: a #GString
+ * @wc: a Unicode character
+ *
+ * Converts a Unicode character into UTF-8, and prepends it
+ * to the string.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_prepend_unichar (GString *string,
+ gunichar wc)
+{
+ g_return_val_if_fail (string != NULL, NULL);
- strncpy (string->str, val, len);
+ return g_string_insert_unichar (string, 0, wc);
+}
- string->len += len;
+/**
+ * g_string_insert:
+ * @string: a #GString
+ * @pos: the position to insert the copy of the string
+ * @val: the string to insert
+ *
+ * Inserts a copy of a string into a #GString,
+ * expanding it if necessary.
+ *
+ * Returns: @string
+ */
+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);
- string->str[string->len] = 0;
+ if (pos >= 0)
+ g_return_val_if_fail (pos <= string->len, string);
- return fstring;
+ return g_string_insert_len (string, pos, val, -1);
}
-GString*
-g_string_prepend_c (GString *fstring,
- gchar c)
+/**
+ * g_string_insert_c:
+ * @string: a #GString
+ * @pos: the position to insert the byte
+ * @c: the byte to insert
+ *
+ * Inserts a byte into a #GString, expanding it if necessary.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_insert_c (GString *string,
+ gssize pos,
+ gchar c)
{
- GRealString *string = (GRealString*)fstring;
-
g_return_val_if_fail (string != NULL, NULL);
+
g_string_maybe_expand (string, 1);
- g_memmove (string->str + 1, string->str, string->len);
+ if (pos < 0)
+ pos = string->len;
+ else
+ g_return_val_if_fail (pos <= string->len, string);
- string->str[0] = c;
+ /* If not just an append, move the old stuff */
+ if (pos < string->len)
+ memmove (string->str + pos + 1, string->str + pos, string->len - pos);
+
+ string->str[pos] = c;
string->len += 1;
string->str[string->len] = 0;
- return fstring;
+ return string;
}
-GString*
-g_string_insert (GString *fstring,
- gint pos,
- const gchar *val)
+/**
+ * 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
+ * @wc: a Unicode character
+ *
+ * Converts a Unicode character into UTF-8, and insert it
+ * into the string at the given position.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_insert_unichar (GString *string,
+ gssize pos,
+ gunichar wc)
{
- GRealString *string = (GRealString*)fstring;
- gint len;
+ gint charlen, first, i;
+ gchar *dest;
g_return_val_if_fail (string != NULL, NULL);
- g_return_val_if_fail (val != NULL, fstring);
- g_return_val_if_fail (pos >= 0, fstring);
- g_return_val_if_fail (pos <= string->len, fstring);
- len = strlen (val);
- g_string_maybe_expand (string, len);
+ /* Code copied from g_unichar_to_utf() */
+ if (wc < 0x80)
+ {
+ first = 0;
+ charlen = 1;
+ }
+ else if (wc < 0x800)
+ {
+ first = 0xc0;
+ charlen = 2;
+ }
+ else if (wc < 0x10000)
+ {
+ first = 0xe0;
+ charlen = 3;
+ }
+ else if (wc < 0x200000)
+ {
+ first = 0xf0;
+ charlen = 4;
+ }
+ else if (wc < 0x4000000)
+ {
+ first = 0xf8;
+ charlen = 5;
+ }
+ else
+ {
+ first = 0xfc;
+ charlen = 6;
+ }
+ /* End of copied code */
+
+ g_string_maybe_expand (string, charlen);
- g_memmove (string->str + pos + len, string->str + pos, string->len - pos);
+ if (pos < 0)
+ pos = string->len;
+ else
+ g_return_val_if_fail (pos <= string->len, string);
- strncpy (string->str + pos, val, len);
+ /* If not just an append, move the old stuff */
+ if (pos < string->len)
+ memmove (string->str + pos + charlen, string->str + pos, string->len - pos);
- string->len += len;
+ dest = string->str + pos;
+ /* Code copied from g_unichar_to_utf() */
+ for (i = charlen - 1; i > 0; --i)
+ {
+ dest[i] = (wc & 0x3f) | 0x80;
+ wc >>= 6;
+ }
+ dest[0] = wc | first;
+ /* End of copied code */
+
+ string->len += charlen;
string->str[string->len] = 0;
- return fstring;
+ return string;
}
+/**
+ * g_string_overwrite:
+ * @string: a #GString
+ * @pos: the position at which to start overwriting
+ * @val: the string that will overwrite the @string starting at @pos
+ *
+ * Overwrites part of a string, lengthening it if necessary.
+ *
+ * Returns: @string
+ *
+ * Since: 2.14
+ */
GString *
-g_string_insert_c (GString *fstring,
- gint pos,
- gchar c)
+g_string_overwrite (GString *string,
+ gsize pos,
+ const gchar *val)
{
- GRealString *string = (GRealString*)fstring;
+ g_return_val_if_fail (val != NULL, string);
+ return g_string_overwrite_len (string, pos, val, strlen (val));
+}
+
+/**
+ * g_string_overwrite_len:
+ * @string: a #GString
+ * @pos: the position at which to start overwriting
+ * @val: the string that will overwrite the @string starting at @pos
+ * @len: the number of bytes to write from @val
+ *
+ * Overwrites part of a string, lengthening it if necessary.
+ * This function will work with embedded nuls.
+ *
+ * Returns: @string
+ *
+ * Since: 2.14
+ */
+GString *
+g_string_overwrite_len (GString *string,
+ gsize pos,
+ const gchar *val,
+ gssize len)
+{
+ gsize end;
g_return_val_if_fail (string != NULL, NULL);
- g_return_val_if_fail (pos <= string->len, fstring);
- g_string_maybe_expand (string, 1);
+ if (!len)
+ return string;
- g_memmove (string->str + pos + 1, string->str + pos, string->len - pos);
+ g_return_val_if_fail (val != NULL, string);
+ g_return_val_if_fail (pos <= string->len, string);
- string->str[pos] = c;
+ if (len < 0)
+ len = strlen (val);
- string->len += 1;
+ end = pos + len;
- string->str[string->len] = 0;
+ if (end > string->len)
+ g_string_maybe_expand (string, end - string->len);
+
+ memcpy (string->str + pos, val, len);
+
+ if (end > string->len)
+ {
+ string->str[end] = '\0';
+ string->len = end;
+ }
- return fstring;
+ return string;
}
-GString*
-g_string_erase (GString *fstring,
- gint pos,
- gint len)
+/**
+ * g_string_erase:
+ * @string: a #GString
+ * @pos: the position of the content to remove
+ * @len: the number of bytes to remove, or -1 to remove all
+ * following bytes
+ *
+ * Removes @len bytes from a #GString, starting at position @pos.
+ * The rest of the #GString is shifted down to fill the gap.
+ *
+ * Returns: @string
+ */
+GString *
+g_string_erase (GString *string,
+ gssize pos,
+ gssize len)
{
- GRealString *string = (GRealString*)fstring;
-
g_return_val_if_fail (string != NULL, NULL);
- g_return_val_if_fail (len >= 0, fstring);
- g_return_val_if_fail (pos >= 0, fstring);
- g_return_val_if_fail (pos <= string->len, fstring);
- g_return_val_if_fail (pos + len <= string->len, fstring);
+ g_return_val_if_fail (pos >= 0, string);
+ g_return_val_if_fail (pos <= string->len, string);
- if (pos + len < string->len)
- g_memmove (string->str + pos, string->str + pos + len, string->len - (pos + len));
+ if (len < 0)
+ len = string->len - pos;
+ else
+ {
+ g_return_val_if_fail (pos + len <= string->len, string);
+
+ if (pos + len < string->len)
+ memmove (string->str + pos, string->str + pos + len, string->len - (pos + len));
+ }
string->len -= len;
-
+
string->str[string->len] = 0;
- return fstring;
+ return string;
}
-GString*
-g_string_down (GString *fstring)
+/**
+ * g_string_ascii_down:
+ * @string: a GString
+ *
+ * Converts all uppercase ASCII letters to lowercase ASCII letters.
+ *
+ * Returns: 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)
{
- GRealString *string = (GRealString*)fstring;
gchar *s;
+ gint n;
g_return_val_if_fail (string != NULL, NULL);
+ n = string->len;
s = string->str;
- while (*s)
+ while (n)
{
- *s = tolower (*s);
+ *s = g_ascii_tolower (*s);
s++;
+ n--;
}
- return fstring;
+ return string;
}
-GString*
-g_string_up (GString *fstring)
+/**
+ * g_string_ascii_up:
+ * @string: a GString
+ *
+ * Converts all lowercase ASCII letters to uppercase ASCII letters.
+ *
+ * Returns: 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)
{
- GRealString *string = (GRealString*)fstring;
gchar *s;
+ gint n;
g_return_val_if_fail (string != NULL, NULL);
+ n = string->len;
s = string->str;
- while (*s)
+ while (n)
{
- *s = toupper (*s);
+ *s = g_ascii_toupper (*s);
s++;
+ n--;
}
- return fstring;
+ return string;
}
-static void
-g_string_sprintfa_int (GString *string,
- const gchar *fmt,
- va_list args)
+/**
+ * g_string_down:
+ * @string: a #GString
+ *
+ * Converts a #GString to lowercase.
+ *
+ * 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 *
+g_string_down (GString *string)
{
- gchar *buffer;
+ guchar *s;
+ glong n;
+
+ g_return_val_if_fail (string != NULL, NULL);
+
+ n = string->len;
+ s = (guchar *) string->str;
+
+ while (n)
+ {
+ if (isupper (*s))
+ *s = tolower (*s);
+ s++;
+ n--;
+ }
- buffer = g_strdup_vprintf (fmt, args);
- g_string_append (string, buffer);
- g_free (buffer);
+ return string;
}
+/**
+ * g_string_up:
+ * @string: a #GString
+ *
+ * Converts a #GString to uppercase.
+ *
+ * Returns: @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 *
+g_string_up (GString *string)
+{
+ guchar *s;
+ glong n;
+
+ g_return_val_if_fail (string != NULL, NULL);
+
+ n = string->len;
+ s = (guchar *) string->str;
+
+ while (n)
+ {
+ if (islower (*s))
+ *s = toupper (*s);
+ s++;
+ n--;
+ }
+
+ return string;
+}
+
+/**
+ * g_string_append_vprintf:
+ * @string: a #GString
+ * @format: the string format. See the printf() documentation
+ * @args: the list of arguments to insert in the output
+ *
+ * Appends a formatted string onto the end of a #GString.
+ * This function is similar to g_string_append_printf()
+ * except that the arguments to the format string are passed
+ * as a va_list.
+ *
+ * Since: 2.14
+ */
void
-g_string_sprintf (GString *string,
- const gchar *fmt,
- ...)
+g_string_append_vprintf (GString *string,
+ const gchar *format,
+ va_list args)
+{
+ gchar *buf;
+ gint len;
+
+ g_return_if_fail (string != NULL);
+ g_return_if_fail (format != NULL);
+
+ len = g_vasprintf (&buf, format, args);
+
+ if (len >= 0)
+ {
+ g_string_maybe_expand (string, len);
+ memcpy (string->str + string->len, buf, len + 1);
+ string->len += len;
+ g_free (buf);
+ }
+}
+
+/**
+ * g_string_vprintf:
+ * @string: a #GString
+ * @format: the string format. See the printf() documentation
+ * @args: the parameters to insert into the format string
+ *
+ * Writes a formatted string into a #GString.
+ * This function is similar to g_string_printf() except that
+ * the arguments to the format string are passed as a va_list.
+ *
+ * Since: 2.14
+ */
+void
+g_string_vprintf (GString *string,
+ const gchar *format,
+ va_list args)
+{
+ g_string_truncate (string, 0);
+ g_string_append_vprintf (string, format, args);
+}
+
+/**
+ * g_string_sprintf:
+ * @string: a #GString
+ * @format: the string format. See the sprintf() documentation
+ * @...: the parameters to insert into the format string
+ *
+ * Writes a formatted string into a #GString.
+ * This is similar to the standard sprintf() function,
+ * except that the #GString buffer automatically expands
+ * to contain the results. The previous contents of the
+ * #GString are destroyed.
+ *
+ * Deprecated: This function has been renamed to g_string_printf().
+ */
+
+/**
+ * g_string_printf:
+ * @string: a #GString
+ * @format: the string format. See the printf() documentation
+ * @...: the parameters to insert into the format string
+ *
+ * Writes a formatted string into a #GString.
+ * This is similar to the standard sprintf() function,
+ * except that the #GString buffer automatically expands
+ * to contain the results. The previous contents of the
+ * #GString are destroyed.
+ */
+void
+g_string_printf (GString *string,
+ const gchar *format,
+ ...)
{
va_list args;
g_string_truncate (string, 0);
- va_start (args, fmt);
- g_string_sprintfa_int (string, fmt, args);
+ va_start (args, format);
+ g_string_append_vprintf (string, format, args);
va_end (args);
}
+/**
+ * g_string_sprintfa:
+ * @string: a #GString
+ * @format: the string format. See the sprintf() documentation
+ * @...: the parameters to insert into the format string
+ *
+ * Appends a formatted string onto the end of a #GString.
+ * This function is similar to g_string_sprintf() except that
+ * the text is appended to the #GString.
+ *
+ * Deprecated: This function has been renamed to g_string_append_printf()
+ */
+
+/**
+ * g_string_append_printf:
+ * @string: a #GString
+ * @format: the string format. See the printf() documentation
+ * @...: the parameters to insert into the format string
+ *
+ * Appends a formatted string onto the end of a #GString.
+ * This function is similar to g_string_printf() except
+ * that the text is appended to the #GString.
+ */
void
-g_string_sprintfa (GString *string,
- const gchar *fmt,
- ...)
+g_string_append_printf (GString *string,
+ const gchar *format,
+ ...)
{
va_list args;
- va_start (args, fmt);
- g_string_sprintfa_int (string, fmt, args);
+ va_start (args, format);
+ g_string_append_vprintf (string, format, args);
va_end (args);
}