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

Silence a warning

Browse Source 
g_string_insert_len (s, pos, NULL, 0) is a harmless nop, don't
spew warnings in this case.
This commit is contained in:
Matthias Clasen 2010-04-18 23:53:31 -04:00
parent 32de7d6905
commit 48cd4cbba5
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
glib/gstring.c
View File

@ -663,30 +663,33 @@ g_string_set_size (GString *string,
/** /**
* g_string_insert_len: * g_string_insert_len:
* @string: a #GString * @string: a #GString
* @pos: position in @string where insertion should * @pos: position in @string where insertion should
* happen, or -1 for at the end * happen, or -1 for at the end
* @val: bytes to insert * @val: bytes to insert
* @len: number of bytes of @val to insert * @len: number of bytes of @val to insert
* *
* Inserts @len bytes of @val into @string at @pos. * Inserts @len bytes of @val into @string at @pos.
* Because @len is provided, @val may contain embedded * Because @len is provided, @val may contain embedded
* nuls and need not be nul-terminated. If @pos is -1, * nuls and need not be nul-terminated. If @pos is -1,
* bytes are inserted at the end of the string. * bytes are inserted at the end of the string.
* *
* Since this function does not stop at nul bytes, it is * Since this function does not stop at nul bytes, it is
* the caller's responsibility to ensure that @val has at * the caller's responsibility to ensure that @val has at
* least @len addressable bytes. * least @len addressable bytes.
* *
* Returns: @string * Returns: @string
*/ */
GString* GString*
g_string_insert_len (GString *string, g_string_insert_len (GString *string,
gssize pos, gssize pos,
const gchar *val, const gchar *val,
gssize len) gssize len)
{ {
g_return_val_if_fail (string != NULL, NULL); g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (val != NULL, string); g_return_val_if_fail (len == 0 || val != NULL, string);
if (len == 0)
return string;
if (len < 0) if (len < 0)
len = strlen (val); len = strlen (val);
@ -711,20 +714,20 @@ g_string_insert_len (GString *string,
/* Open up space where we are going to insert. */ /* Open up space where we are going to insert. */
if (pos < string->len) if (pos < string->len)
g_memmove (string->str + pos + len, string->str + pos, string->len - pos); g_memmove (string->str + pos + len, string->str + pos, string->len - pos);
/* Move the source part before the gap, if any. */ /* Move the source part before the gap, if any. */
if (offset < pos) if (offset < pos)
{ {
precount = MIN (len, pos - offset); precount = MIN (len, pos - offset);
memcpy (string->str + pos, val, precount); memcpy (string->str + pos, val, precount);
} }
/* Move the source part after the gap, if any. */ /* Move the source part after the gap, if any. */
if (len > precount) if (len > precount)
memcpy (string->str + pos + precount, memcpy (string->str + pos + precount,
val + /* Already moved: */ precount + /* Space opened up: */ len, val + /* Already moved: */ precount + /* Space opened up: */ len,
len - precount); len - precount);
} }
else else
{ {
@ -734,7 +737,7 @@ g_string_insert_len (GString *string,
* of the old string to the end, opening up space * of the old string to the end, opening up space
*/ */
if (pos < string->len) if (pos < string->len)
g_memmove (string->str + pos + len, string->str + pos, string->len - pos); g_memmove (string->str + pos + len, string->str + pos, string->len - pos);
/* insert the new string */ /* insert the new string */
if (len == 1) if (len == 1)