projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gsettings test: stop testing long-deprecated API
[platform/upstream/glib.git]
/
gobject
/
gvaluearray.c
diff --git
a/gobject/gvaluearray.c
b/gobject/gvaluearray.c
index
e3fe255
..
fb92ba8
100644
(file)
--- a/
gobject/gvaluearray.c
+++ b/
gobject/gvaluearray.c
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-47,13
+45,13
@@
* g_value_unset() as the clear function using g_array_set_clear_func(),
* for instance, the following code:
*
* g_value_unset() as the clear function using g_array_set_clear_func(),
* for instance, the following code:
*
- * |[
+ * |[
<!-- language="C" -->
* GValueArray *array = g_value_array_new (10);
* ]|
*
* can be replaced by:
*
* GValueArray *array = g_value_array_new (10);
* ]|
*
* can be replaced by:
*
- * |[
+ * |[
<!-- language="C" -->
* GArray *array = g_array_sized_new (FALSE, TRUE, sizeof (GValue), 10);
* g_array_set_clear_func (array, (GDestroyNotify) g_value_unset);
* ]|
* GArray *array = g_array_sized_new (FALSE, TRUE, sizeof (GValue), 10);
* g_array_set_clear_func (array, (GDestroyNotify) g_value_unset);
* ]|
@@
-259,7
+257,7
@@
g_value_array_append (GValueArray *value_array,
/**
* g_value_array_insert:
* @value_array: #GValueArray to add an element to
/**
* g_value_array_insert:
* @value_array: #GValueArray to add an element to
- * @index_: insertion position, must be
<
= value_array->n_values
+ * @index_: insertion position, must be
<
= value_array->n_values
* @value: (allow-none): #GValue to copy into #GValueArray, or %NULL
*
* Insert a copy of @value at specified position into @value_array. If @value
* @value: (allow-none): #GValue to copy into #GValueArray, or %NULL
*
* Insert a copy of @value at specified position into @value_array. If @value
@@
-282,8
+280,8
@@
g_value_array_insert (GValueArray *value_array,
i = value_array->n_values;
value_array_grow (value_array, value_array->n_values + 1, FALSE);
if (index + 1 < value_array->n_values)
i = value_array->n_values;
value_array_grow (value_array, value_array->n_values + 1, FALSE);
if (index + 1 < value_array->n_values)
-
g_
memmove (value_array->values + index + 1, value_array->values + index,
-
(i - index) * sizeof (value_array->values[0]));
+ memmove (value_array->values + index + 1, value_array->values + index,
+ (i - index) * sizeof (value_array->values[0]));
memset (value_array->values + index, 0, sizeof (value_array->values[0]));
if (value)
{
memset (value_array->values + index, 0, sizeof (value_array->values[0]));
if (value)
{
@@
-297,8
+295,7
@@
g_value_array_insert (GValueArray *value_array,
* g_value_array_remove:
* @value_array: #GValueArray to remove an element from
* @index_: position of value to remove, which must be less than
* g_value_array_remove:
* @value_array: #GValueArray to remove an element from
* @index_: position of value to remove, which must be less than
- * <code>value_array-><link
- * linkend="GValueArray.n-values">n_values</link></code>
+ * @value_array->n_values
*
* Remove the value at position @index_ from @value_array.
*
*
* Remove the value at position @index_ from @value_array.
*
@@
-317,8
+314,8
@@
g_value_array_remove (GValueArray *value_array,
g_value_unset (value_array->values + index);
value_array->n_values--;
if (index < value_array->n_values)
g_value_unset (value_array->values + index);
value_array->n_values--;
if (index < value_array->n_values)
-
g_
memmove (value_array->values + index, value_array->values + index + 1,
-
(value_array->n_values - index) * sizeof (value_array->values[0]));
+ memmove (value_array->values + index, value_array->values + index + 1,
+ (value_array->n_values - index) * sizeof (value_array->values[0]));
value_array_shrink (value_array);
if (value_array->n_prealloced > value_array->n_values)
memset (value_array->values + value_array->n_values, 0, sizeof (value_array->values[0]));
value_array_shrink (value_array);
if (value_array->n_prealloced > value_array->n_values)
memset (value_array->values + value_array->n_values, 0, sizeof (value_array->values[0]));