1998-06-11 01:21:14 +02:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 13:02:02 +02:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1998-06-11 01:21:14 +02:00
|
|
|
* 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
|
2000-07-26 13:02:02 +02:00
|
|
|
* Lesser General Public License for more details.
|
1998-06-11 01:21:14 +02:00
|
|
|
*
|
2000-07-26 13:02:02 +02:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-06-11 01:21:14 +02:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-02-24 07:14:27 +01:00
|
|
|
/*
|
2000-07-26 13:02:02 +02:00
|
|
|
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:14:27 +01:00
|
|
|
* 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/.
|
|
|
|
*/
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
/*
|
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
2002-12-04 02:27:44 +01:00
|
|
|
#include "config.h"
|
Ok, I'm a moron. When I originally implemented ENABLE_GC_FRIENDLY, I
2000-12-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gslist.c, glist.c: Ok, I'm a moron. When I originally
implemented ENABLE_GC_FRIENDLY, I forgot to include config.h into
the affected files. Now that Alex did that for those two,
inevitable typos surfaced, which are now fixed.
* garray.c, ghash.c, gqueue.c, gtree.c: Include config.h as well,
as ENABLE_GC_FRIENDLY should be known.
2000-12-19 16:40:30 +01:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#include <string.h>
|
2000-11-21 00:59:32 +01:00
|
|
|
#include <stdlib.h>
|
2005-03-14 05:26:57 +01:00
|
|
|
|
|
|
|
#include "garray.h"
|
|
|
|
|
|
|
|
#include "gmem.h"
|
|
|
|
#include "gthread.h"
|
|
|
|
#include "gmessages.h"
|
|
|
|
#include "gqsort.h"
|
|
|
|
|
2004-09-16 08:05:53 +02:00
|
|
|
#include "galias.h"
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
|
|
|
|
#define MIN_ARRAY_SIZE 16
|
|
|
|
|
|
|
|
typedef struct _GRealArray GRealArray;
|
|
|
|
|
|
|
|
struct _GRealArray
|
|
|
|
{
|
|
|
|
guint8 *data;
|
|
|
|
guint len;
|
|
|
|
guint alloc;
|
1998-09-02 09:44:02 +02:00
|
|
|
guint elt_size;
|
|
|
|
guint zero_terminated : 1;
|
|
|
|
guint clear : 1;
|
1998-06-11 01:21:14 +02:00
|
|
|
};
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
#define g_array_elt_len(array,i) ((array)->elt_size * (i))
|
|
|
|
#define g_array_elt_pos(array,i) ((array)->data + g_array_elt_len((array),(i)))
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
#define g_array_elt_zero(array, pos, len) \
|
2000-03-24 16:36:03 +01:00
|
|
|
(memset (g_array_elt_pos ((array), pos), 0, g_array_elt_len ((array), len)))
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
#define g_array_zero_terminate(array) G_STMT_START{ \
|
|
|
|
if ((array)->zero_terminated) \
|
|
|
|
g_array_elt_zero ((array), (array)->len, 1); \
|
2000-03-24 16:36:03 +01:00
|
|
|
}G_STMT_END
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-09-25 23:28:14 +02:00
|
|
|
static gint g_nearest_pow (gint num) G_GNUC_CONST;
|
1998-06-11 01:21:14 +02:00
|
|
|
static void g_array_maybe_expand (GRealArray *array,
|
|
|
|
gint len);
|
|
|
|
|
|
|
|
GArray*
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_new (gboolean zero_terminated,
|
|
|
|
gboolean clear,
|
|
|
|
guint elt_size)
|
2000-04-17 12:59:46 +02:00
|
|
|
{
|
|
|
|
return (GArray*) g_array_sized_new (zero_terminated, clear, elt_size, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
GArray* g_array_sized_new (gboolean zero_terminated,
|
|
|
|
gboolean clear,
|
|
|
|
guint elt_size,
|
|
|
|
guint reserved_size)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
2005-11-01 19:10:31 +01:00
|
|
|
GRealArray *array = g_slice_new (GRealArray);
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
array->data = NULL;
|
|
|
|
array->len = 0;
|
|
|
|
array->alloc = 0;
|
1998-06-11 01:21:14 +02:00
|
|
|
array->zero_terminated = (zero_terminated ? 1 : 0);
|
1998-09-02 09:44:02 +02:00
|
|
|
array->clear = (clear ? 1 : 0);
|
|
|
|
array->elt_size = elt_size;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-04-17 12:59:46 +02:00
|
|
|
if (array->zero_terminated || reserved_size != 0)
|
2000-03-24 16:36:03 +01:00
|
|
|
{
|
2000-04-17 12:59:46 +02:00
|
|
|
g_array_maybe_expand (array, reserved_size);
|
|
|
|
g_array_zero_terminate(array);
|
2000-03-24 16:36:03 +01:00
|
|
|
}
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return (GArray*) array;
|
|
|
|
}
|
|
|
|
|
2000-08-17 23:37:18 +02:00
|
|
|
gchar*
|
version bump to 1.1.3, binary age 0, interface age 0.
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
* version bump to 1.1.3, binary age 0, interface age 0.
* glib.h: be nice to platforms that don't have gint64 and don't
issue #warning on every compilation. since glib doesn't require
gint64 itself, packages that need gint64 should test for this
themselves.
* glib.h:
* gutils.c: added a new function g_vsnprintf().
Fri Aug 14 16:41:53 1998 Tim Janik <timj@gtk.org>
* glib.h: added static inline functions for bit mask tests:
g_bit_nth_lsf, g_bit_nth_msf and g_bit_storage.
Fri Aug 13 14:23:37 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gmessages.c:
revised the message handling system, which is now based on a new
mechanism g_log*. most of the assertment macros got adapted to
feature the new g_log() call with an additional specification of
the log level in a preprocessor macro G_LOG_DOMAIN. if G_LOG_DOMAIN
is undefined upon the includion of glib.h, it'll be defined with a
value of (NULL) and thus preserves the original bahaviour for
warning and error messages. the message handler setting functions
for g_warning, g_error and g_message are only provided for backwards
compatibility and might get removed somewhen.
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GLib" upon compilation. we currently have to add this definition
to the DEFS variable.
* testglib.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
* glib.h: changed some gints to gbooleans, made a few const corrections,
removed some superfluous G_STMT_START{}G_STMT_END wrappers, added some
in other required places.
* gnode.c:
(g_node_prepend):
(g_node_insert_before):
(g_node_insert):
(g_node_append_data):
(g_node_prepend_data):
(g_node_insert_data_before):
(g_node_insert_data):
(g_node_append):
return (node), so these macros/functions can be usefully chained with
g_node_new().
[GModule]
Fri Aug 14 02:24:39 1998 Tim Janik <timj@gtk.org>
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GModule" upon compilation. we currently have to add this definition
to the DEFS variable.
* testgmodule.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
1998-08-16 23:14:11 +02:00
|
|
|
g_array_free (GArray *array,
|
|
|
|
gboolean free_segment)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
2000-08-17 23:37:18 +02:00
|
|
|
gchar* segment;
|
|
|
|
|
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (free_segment)
|
2000-08-17 23:37:18 +02:00
|
|
|
{
|
|
|
|
g_free (array->data);
|
|
|
|
segment = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
segment = array->data;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2005-11-01 19:10:31 +01:00
|
|
|
g_slice_free1 (sizeof (GRealArray), array);
|
2000-08-17 23:37:18 +02:00
|
|
|
|
|
|
|
return segment;
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
GArray*
|
1998-09-03 01:11:04 +02:00
|
|
|
g_array_append_vals (GArray *farray,
|
|
|
|
gconstpointer data,
|
|
|
|
guint len)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
GRealArray *array = (GRealArray*) farray;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_maybe_expand (array, len);
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
memcpy (g_array_elt_pos (array, array->len), data,
|
|
|
|
g_array_elt_len (array, len));
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
array->len += len;
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
g_array_zero_terminate (array);
|
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
return farray;
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
GArray*
|
1998-09-03 01:11:04 +02:00
|
|
|
g_array_prepend_vals (GArray *farray,
|
|
|
|
gconstpointer data,
|
|
|
|
guint len)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
GRealArray *array = (GRealArray*) farray;
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_maybe_expand (array, len);
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
g_memmove (g_array_elt_pos (array, len), g_array_elt_pos (array, 0),
|
|
|
|
g_array_elt_len (array, array->len));
|
1998-06-11 01:21:14 +02:00
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
memcpy (g_array_elt_pos (array, 0), data, g_array_elt_len (array, len));
|
1998-09-02 09:44:02 +02:00
|
|
|
|
|
|
|
array->len += len;
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
g_array_zero_terminate (array);
|
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
return farray;
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
1998-11-23 16:02:44 +01:00
|
|
|
GArray*
|
|
|
|
g_array_insert_vals (GArray *farray,
|
|
|
|
guint index,
|
|
|
|
gconstpointer data,
|
|
|
|
guint len)
|
|
|
|
{
|
|
|
|
GRealArray *array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_array_maybe_expand (array, len);
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
g_memmove (g_array_elt_pos (array, len + index),
|
|
|
|
g_array_elt_pos (array, index),
|
|
|
|
g_array_elt_len (array, array->len - index));
|
1998-11-23 16:02:44 +01:00
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
memcpy (g_array_elt_pos (array, index), data, g_array_elt_len (array, len));
|
1998-11-23 16:02:44 +01:00
|
|
|
|
|
|
|
array->len += len;
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
g_array_zero_terminate (array);
|
|
|
|
|
1998-11-23 16:02:44 +01:00
|
|
|
return farray;
|
|
|
|
}
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
GArray*
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_set_size (GArray *farray,
|
|
|
|
guint length)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
GRealArray *array = (GRealArray*) farray;
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
if (length > array->len)
|
2000-03-24 16:36:03 +01:00
|
|
|
{
|
|
|
|
g_array_maybe_expand (array, length - array->len);
|
|
|
|
|
|
|
|
if (array->clear)
|
|
|
|
g_array_elt_zero (array, array->len, length - array->len);
|
|
|
|
}
|
2006-01-25 16:51:43 +01:00
|
|
|
else if (G_UNLIKELY (g_mem_gc_friendly) && length < array->len)
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
g_array_elt_zero (array, length, array->len - length);
|
2000-03-24 16:36:03 +01:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
array->len = length;
|
2000-03-24 16:36:03 +01:00
|
|
|
|
|
|
|
g_array_zero_terminate (array);
|
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
return farray;
|
|
|
|
}
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
GArray*
|
|
|
|
g_array_remove_index (GArray* farray,
|
|
|
|
guint index)
|
|
|
|
{
|
|
|
|
GRealArray* array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
|
2000-05-19 10:18:29 +02:00
|
|
|
g_return_val_if_fail (index < array->len, NULL);
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
if (index != array->len - 1)
|
2000-03-24 16:36:03 +01:00
|
|
|
g_memmove (g_array_elt_pos (array, index),
|
|
|
|
g_array_elt_pos (array, index + 1),
|
|
|
|
g_array_elt_len (array, array->len - index - 1));
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
array->len -= 1;
|
|
|
|
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
g_array_elt_zero (array, array->len, 1);
|
|
|
|
else
|
|
|
|
g_array_zero_terminate (array);
|
2000-03-24 16:36:03 +01:00
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
return farray;
|
|
|
|
}
|
|
|
|
|
|
|
|
GArray*
|
|
|
|
g_array_remove_index_fast (GArray* farray,
|
2000-05-19 10:18:29 +02:00
|
|
|
guint index)
|
1998-11-03 15:52:25 +01:00
|
|
|
{
|
|
|
|
GRealArray* array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
|
2000-05-19 10:18:29 +02:00
|
|
|
g_return_val_if_fail (index < array->len, NULL);
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
if (index != array->len - 1)
|
2001-05-23 12:20:56 +02:00
|
|
|
memcpy (g_array_elt_pos (array, index),
|
|
|
|
g_array_elt_pos (array, array->len - 1),
|
|
|
|
g_array_elt_len (array, 1));
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
array->len -= 1;
|
|
|
|
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
g_array_elt_zero (array, array->len, 1);
|
|
|
|
else
|
|
|
|
g_array_zero_terminate (array);
|
2000-03-24 16:36:03 +01:00
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
return farray;
|
|
|
|
}
|
|
|
|
|
2003-07-26 10:03:16 +02:00
|
|
|
GArray*
|
|
|
|
g_array_remove_range (GArray *farray,
|
|
|
|
guint index_,
|
|
|
|
guint length)
|
|
|
|
{
|
|
|
|
GRealArray *array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
g_return_val_if_fail (index_ < array->len, NULL);
|
|
|
|
g_return_val_if_fail (index_ + length <= array->len, NULL);
|
|
|
|
|
|
|
|
if (index_ + length != array->len)
|
|
|
|
g_memmove (g_array_elt_pos (array, index_),
|
|
|
|
g_array_elt_pos (array, index_ + length),
|
|
|
|
(array->len - (index_ + length)) * array->elt_size);
|
|
|
|
|
|
|
|
array->len -= length;
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
g_array_elt_zero (array, array->len, length);
|
|
|
|
else
|
|
|
|
g_array_zero_terminate (array);
|
2003-07-26 10:03:16 +02:00
|
|
|
|
|
|
|
return farray;
|
|
|
|
}
|
|
|
|
|
2000-11-21 00:59:32 +01:00
|
|
|
void
|
|
|
|
g_array_sort (GArray *farray,
|
|
|
|
GCompareFunc compare_func)
|
|
|
|
{
|
|
|
|
GRealArray *array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_return_if_fail (array != NULL);
|
|
|
|
|
|
|
|
qsort (array->data,
|
|
|
|
array->len,
|
|
|
|
array->elt_size,
|
|
|
|
compare_func);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_array_sort_with_data (GArray *farray,
|
changed prototype of g_boxed_type_register_static() to contain an optional
Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org>
* gboxed.[hc]: changed prototype of g_boxed_type_register_static()
to contain an optional init function and a hint at whether the
boxed structure uses ref counting internally.
added g_value_set_boxed_take_ownership().
made G_TYPE_BOXED an abstract value type.
* genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value
types.
* glib-genmarshal.c: argument type changes, preparation for third-party
arg specification.
* gobject.[hc]: cleaned up get/set property code.
added g_strdup_value_contents() to improve warnings.
* gparam.[hc]: added g_param_value_convert(), taking over responsibility
of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so
validation alterations may be valid a part of the property setting
process.
* gparamspecs.[hc]: made value comparisons stable (for sort applications).
added GParamSpecValueArray, a param spec for value arrays and
GParamSpecClosure. nuked the value exchange functions and
GParamSpecCCallback.
* gtype.[hc]: catch unintialized usages of the type system with
g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT
to flag types that introduce a value table, but can't be used for
g_value_init(). cleaned up reserved type ids.
* gvalue.[hc]: code cleanups and saner checking.
nuked the value exchange API. implemented value transformations, we
can't really "convert" values, rather transforms are an anylogy to
C casts, real conversions need a param spec for validation, which is
why g_param_value_convert() does real conversions now.
* gvaluearray.[hc]: new files that implement a GValueArray, a struct
that can hold inhomogeneous arrays of value (to that extend that it
also allowes undefined values, i.e. G_VALUE_TYPE(value)==0).
this is exposed to the type system as a boxed type.
* gvaluetransform.c: new file implementing most of the former value
exchange functions as single-sided transformations.
* gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added
g_value_set_string_take_ownership().
* *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/.
* *.[hc]: many fixes and cleanups.
* many warning improvements.
Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org>
* gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS
into G_VALUE_LCOPY(), this needs proper documenting.
* gparam.c: fixed G_PARAM_USER_MASK.
* gtype.c (type_data_make_W):
(type_data_last_unref_Wm): fixed invalid memory freeing.
* gobject.c (g_object_last_unref): destroy signal handlers associated
with object, right before finalization.
* gsignal.c (g_signal_parse_name): catch destroyed nodes or signals
that don't actually support details.
* gobject.[hc]: got rid of property trailers. nuked GObject
properties "data" and the "signal" variants.
(g_object_connect): new convenience function to do multiple
signal connections at once.
(g_object_disconnect): likewise, for disconnections.
* gparam.[hc] (g_param_spec_pool_lookup): took out trailer support.
* gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer()
as private (the latter got renamed from g_value_get_as_pointer()).
Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org>
* glib-object.h: add gvaluearray.h.
* gstring.[hc]: fixup naming of g_string_sprint*.
* gtypes.h: fixed GCompareDataFunc naming.
Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org>
* gobject/Makefile.am: shuffled rules to avoid excessive
rebuilds.
* gobject/gobject-sections.txt: updates.
* gobject/tmpl/*: bunch of updates, added another patch
from Eric Lemings <eric.b.lemings@lmco.com>.
2001-03-07 15:46:45 +01:00
|
|
|
GCompareDataFunc compare_func,
|
2000-11-21 00:59:32 +01:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
GRealArray *array = (GRealArray*) farray;
|
|
|
|
|
|
|
|
g_return_if_fail (array != NULL);
|
|
|
|
|
|
|
|
g_qsort_with_data (array->data,
|
|
|
|
array->len,
|
|
|
|
array->elt_size,
|
|
|
|
compare_func,
|
|
|
|
user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
static gint
|
|
|
|
g_nearest_pow (gint num)
|
|
|
|
{
|
|
|
|
gint n = 1;
|
|
|
|
|
|
|
|
while (n < num)
|
|
|
|
n <<= 1;
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_array_maybe_expand (GRealArray *array,
|
|
|
|
gint len)
|
|
|
|
{
|
2000-03-24 16:36:03 +01:00
|
|
|
guint want_alloc = g_array_elt_len (array, array->len + len +
|
|
|
|
array->zero_terminated);
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
if (want_alloc > array->alloc)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
want_alloc = g_nearest_pow (want_alloc);
|
|
|
|
want_alloc = MAX (want_alloc, MIN_ARRAY_SIZE);
|
1998-09-02 09:44:02 +02:00
|
|
|
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
array->data = g_realloc (array->data, want_alloc);
|
|
|
|
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
memset (array->data + array->alloc, 0, want_alloc - array->alloc);
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
|
|
|
|
array->alloc = want_alloc;
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
}
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
/* Pointer Array
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct _GRealPtrArray GRealPtrArray;
|
|
|
|
|
|
|
|
struct _GRealPtrArray
|
|
|
|
{
|
|
|
|
gpointer *pdata;
|
|
|
|
guint len;
|
|
|
|
guint alloc;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void g_ptr_array_maybe_expand (GRealPtrArray *array,
|
|
|
|
gint len);
|
|
|
|
|
|
|
|
GPtrArray*
|
1998-09-07 11:43:54 +02:00
|
|
|
g_ptr_array_new (void)
|
2000-04-17 12:59:46 +02:00
|
|
|
{
|
|
|
|
return g_ptr_array_sized_new (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
GPtrArray*
|
|
|
|
g_ptr_array_sized_new (guint reserved_size)
|
1998-06-12 11:38:32 +02:00
|
|
|
{
|
2005-11-01 19:10:31 +01:00
|
|
|
GRealPtrArray *array = g_slice_new (GRealPtrArray);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
array->pdata = NULL;
|
|
|
|
array->len = 0;
|
|
|
|
array->alloc = 0;
|
|
|
|
|
2000-04-17 12:59:46 +02:00
|
|
|
if (reserved_size != 0)
|
|
|
|
g_ptr_array_maybe_expand (array, reserved_size);
|
|
|
|
|
|
|
|
return (GPtrArray*) array;
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
|
2000-08-17 23:37:18 +02:00
|
|
|
gpointer*
|
1998-06-12 11:38:32 +02:00
|
|
|
g_ptr_array_free (GPtrArray *array,
|
|
|
|
gboolean free_segment)
|
|
|
|
{
|
2000-08-17 23:37:18 +02:00
|
|
|
gpointer* segment;
|
|
|
|
|
|
|
|
g_return_val_if_fail (array, NULL);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
if (free_segment)
|
2000-08-17 23:37:18 +02:00
|
|
|
{
|
|
|
|
g_free (array->pdata);
|
|
|
|
segment = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
segment = array->pdata;
|
1998-06-12 11:38:32 +02:00
|
|
|
|
2005-11-01 19:10:31 +01:00
|
|
|
g_slice_free1 (sizeof (GRealPtrArray), array);
|
2000-08-17 23:37:18 +02:00
|
|
|
|
|
|
|
return segment;
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_ptr_array_maybe_expand (GRealPtrArray *array,
|
|
|
|
gint len)
|
|
|
|
{
|
|
|
|
if ((array->len + len) > array->alloc)
|
|
|
|
{
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
guint old_alloc = array->alloc;
|
1998-06-12 11:38:32 +02:00
|
|
|
array->alloc = g_nearest_pow (array->len + len);
|
|
|
|
array->alloc = MAX (array->alloc, MIN_ARRAY_SIZE);
|
2003-07-26 10:03:16 +02:00
|
|
|
array->pdata = g_realloc (array->pdata, sizeof (gpointer) * array->alloc);
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
for ( ; old_alloc < array->alloc; old_alloc++)
|
|
|
|
array->pdata [old_alloc] = NULL;
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_ptr_array_set_size (GPtrArray *farray,
|
|
|
|
gint length)
|
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
|
|
|
|
|
|
|
g_return_if_fail (array);
|
|
|
|
|
|
|
|
if (length > array->len)
|
2000-03-24 16:36:03 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
g_ptr_array_maybe_expand (array, (length - array->len));
|
|
|
|
/* This is not
|
|
|
|
* memset (array->pdata + array->len, 0,
|
|
|
|
* sizeof (gpointer) * (length - array->len));
|
|
|
|
* to make it really portable. Remember (void*)NULL needn't be
|
|
|
|
* bitwise zero. It of course is silly not to use memset (..,0,..).
|
|
|
|
*/
|
|
|
|
for (i = array->len; i < length; i++)
|
|
|
|
array->pdata[i] = NULL;
|
|
|
|
}
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly) && length < array->len)
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = length; i < array->len; i++)
|
|
|
|
array->pdata[i] = NULL;
|
|
|
|
}
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
array->len = length;
|
|
|
|
}
|
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
gpointer
|
1998-06-12 11:38:32 +02:00
|
|
|
g_ptr_array_remove_index (GPtrArray* farray,
|
2000-05-19 10:18:29 +02:00
|
|
|
guint index)
|
1998-06-12 11:38:32 +02:00
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
1998-09-02 09:44:02 +02:00
|
|
|
gpointer result;
|
1998-06-12 11:38:32 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
g_return_val_if_fail (array, NULL);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
2000-05-19 10:18:29 +02:00
|
|
|
g_return_val_if_fail (index < array->len, NULL);
|
1998-09-02 09:44:02 +02:00
|
|
|
|
|
|
|
result = array->pdata[index];
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
if (index != array->len - 1)
|
|
|
|
g_memmove (array->pdata + index, array->pdata + index + 1,
|
1998-12-17 09:02:38 +01:00
|
|
|
sizeof (gpointer) * (array->len - index - 1));
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
array->len -= 1;
|
|
|
|
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
array->pdata[array->len] = NULL;
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
g_ptr_array_remove_index_fast (GPtrArray* farray,
|
2000-05-19 10:18:29 +02:00
|
|
|
guint index)
|
1998-11-03 15:52:25 +01:00
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
|
|
|
gpointer result;
|
1998-06-12 11:38:32 +02:00
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
|
2000-05-19 10:18:29 +02:00
|
|
|
g_return_val_if_fail (index < array->len, NULL);
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
result = array->pdata[index];
|
|
|
|
|
|
|
|
if (index != array->len - 1)
|
|
|
|
array->pdata[index] = array->pdata[array->len - 1];
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
array->len -= 1;
|
1998-09-02 09:44:02 +02:00
|
|
|
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
array->pdata[array->len] = NULL;
|
Add configure test for garbage collector friendliness for GLib. If
2000-04-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in, acconfig.h: Add configure test for garbage
collector friendliness for GLib. If enabled, ENABLE_GC_FRIENDLY
will be defined.
* garray.c, ghash.c, glist.c, gmain.c, gmem.c, gnode.c, gqueue.c,
gslist.c, gtree.c: If ENABLE_GC_FRIENDLY is defined, NULLify all
memory released by the user, but cached by GLib. This lets a
garbage collector have a more correct view of the actually used
memory.
2000-04-17 15:23:27 +02:00
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
return result;
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
|
2003-07-26 10:03:16 +02:00
|
|
|
void
|
|
|
|
g_ptr_array_remove_range (GPtrArray* farray,
|
|
|
|
guint index_,
|
|
|
|
guint length)
|
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
|
|
|
|
|
|
|
g_return_if_fail (array);
|
|
|
|
g_return_if_fail (index_ < array->len);
|
|
|
|
g_return_if_fail (index_ + length <= array->len);
|
|
|
|
|
|
|
|
if (index_ + length != array->len)
|
|
|
|
g_memmove (&array->pdata[index_],
|
|
|
|
&array->pdata[index_ + length],
|
|
|
|
(array->len - (index_ + length)) * sizeof (gpointer));
|
|
|
|
|
|
|
|
array->len -= length;
|
2006-01-25 16:51:43 +01:00
|
|
|
if (G_UNLIKELY (g_mem_gc_friendly))
|
|
|
|
{
|
|
|
|
guint i;
|
|
|
|
for (i = 0; i < length; i++)
|
|
|
|
array->pdata[array->len + i] = NULL;
|
|
|
|
}
|
2003-07-26 10:03:16 +02:00
|
|
|
}
|
|
|
|
|
1998-06-12 11:38:32 +02:00
|
|
|
gboolean
|
|
|
|
g_ptr_array_remove (GPtrArray* farray,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
Changes for 64-bit cleanliness, loosely based on patch from Mark Murnane.
Wed Jun 20 12:00:54 2001 Owen Taylor <otaylor@redhat.com>
Changes for 64-bit cleanliness, loosely based on patch
from Mark Murnane.
* gconvert.c (g_convert/g_convert_with_fallback): Remove
workarounds for since-fixed GNU libc bugs. Minor
doc fix.
* gconvert.[ch]: Change gint to gsize/gssize as
appropriate.
* gconvert.c (g_locale/filename_to/from_utf8): Fix incorrect
computation of bytes_read / bytes_written.
* gfileutils.[ch] (g_file_get_contents): Make length
out parameter 'gsize *len'.
* ghook.c (g_hook_compare_ids): Don't compare a
and b as 'a - b'.
* gmacros.h (GSIZE_TO_POINTER): Add GPOINTER_TO_SIZE,
GSIZE_TO_POINTER.
* gmain.c (g_timeout_prepare): Rewrite to avoid
overflows. (Fixes bug when system clock skews
backwards more than 24 days.)
* gmarkup.[ch]: Make lengths passed to callbacks
gsize, length for g_markup_parse-context_parse(),
g_markup_escape_text() gssize.
* gmessages.[ch] (g_printf_string_upper_bound): Change
return value to gsize.
* gmessages.c (printf_string_upper_bound): Remove
a ridiculous use of 'inline' on a 300 line function.
* gstring.[ch]: Represent size of string as a gsize,
not gint. Make parameters to functions take gsize,
or gssize where -1 is allowed.
* gstring.c (g_string_erase): Make
g_string_erase (string, pos, -1) a synonym for
g_string_truncate for consistency with other G*
APIs.
* gstrfuncs.[ch]: Make all functions taking a string
length, take a gsize, or gssize if -1 is allowed.
(g_strstr_len, g_strrstr_len). Also fix some boundary
conditions in g_str[r]str[_len].
* gutf8.c tests/unicode-encoding.c: Make parameters that
are byte lengths gsize, gssize as appropriate. Make
character offsets, other counts, glong.
* gasyncqueue.c gcompletion.c
timeloop.c timeloop-basic.c gutils.c gspawn.c.
Small 64 bit cleanliness fixups.
* glist.c (g_list_sort2, g_list_sort_real): Fix functions
that should have been static.
* gdate.c (g_date_fill_parse_tokens): Fix extra
declaration that was shadowing another.
* tests/module-test.c: Include string.h
Mon Jun 18 15:43:29 2001 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_get_charset): Make argument
G_CONST_RETURN char **.
2001-06-23 15:55:09 +02:00
|
|
|
guint i;
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
g_return_val_if_fail (array, FALSE);
|
|
|
|
|
|
|
|
for (i = 0; i < array->len; i += 1)
|
|
|
|
{
|
|
|
|
if (array->pdata[i] == data)
|
|
|
|
{
|
|
|
|
g_ptr_array_remove_index (farray, i);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
1998-11-03 15:52:25 +01:00
|
|
|
gboolean
|
|
|
|
g_ptr_array_remove_fast (GPtrArray* farray,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
Changes for 64-bit cleanliness, loosely based on patch from Mark Murnane.
Wed Jun 20 12:00:54 2001 Owen Taylor <otaylor@redhat.com>
Changes for 64-bit cleanliness, loosely based on patch
from Mark Murnane.
* gconvert.c (g_convert/g_convert_with_fallback): Remove
workarounds for since-fixed GNU libc bugs. Minor
doc fix.
* gconvert.[ch]: Change gint to gsize/gssize as
appropriate.
* gconvert.c (g_locale/filename_to/from_utf8): Fix incorrect
computation of bytes_read / bytes_written.
* gfileutils.[ch] (g_file_get_contents): Make length
out parameter 'gsize *len'.
* ghook.c (g_hook_compare_ids): Don't compare a
and b as 'a - b'.
* gmacros.h (GSIZE_TO_POINTER): Add GPOINTER_TO_SIZE,
GSIZE_TO_POINTER.
* gmain.c (g_timeout_prepare): Rewrite to avoid
overflows. (Fixes bug when system clock skews
backwards more than 24 days.)
* gmarkup.[ch]: Make lengths passed to callbacks
gsize, length for g_markup_parse-context_parse(),
g_markup_escape_text() gssize.
* gmessages.[ch] (g_printf_string_upper_bound): Change
return value to gsize.
* gmessages.c (printf_string_upper_bound): Remove
a ridiculous use of 'inline' on a 300 line function.
* gstring.[ch]: Represent size of string as a gsize,
not gint. Make parameters to functions take gsize,
or gssize where -1 is allowed.
* gstring.c (g_string_erase): Make
g_string_erase (string, pos, -1) a synonym for
g_string_truncate for consistency with other G*
APIs.
* gstrfuncs.[ch]: Make all functions taking a string
length, take a gsize, or gssize if -1 is allowed.
(g_strstr_len, g_strrstr_len). Also fix some boundary
conditions in g_str[r]str[_len].
* gutf8.c tests/unicode-encoding.c: Make parameters that
are byte lengths gsize, gssize as appropriate. Make
character offsets, other counts, glong.
* gasyncqueue.c gcompletion.c
timeloop.c timeloop-basic.c gutils.c gspawn.c.
Small 64 bit cleanliness fixups.
* glist.c (g_list_sort2, g_list_sort_real): Fix functions
that should have been static.
* gdate.c (g_date_fill_parse_tokens): Fix extra
declaration that was shadowing another.
* tests/module-test.c: Include string.h
Mon Jun 18 15:43:29 2001 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_get_charset): Make argument
G_CONST_RETURN char **.
2001-06-23 15:55:09 +02:00
|
|
|
guint i;
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
g_return_val_if_fail (array, FALSE);
|
|
|
|
|
|
|
|
for (i = 0; i < array->len; i += 1)
|
|
|
|
{
|
|
|
|
if (array->pdata[i] == data)
|
|
|
|
{
|
|
|
|
g_ptr_array_remove_index_fast (farray, i);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
1998-06-12 11:38:32 +02:00
|
|
|
void
|
|
|
|
g_ptr_array_add (GPtrArray* farray,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GRealPtrArray* array = (GRealPtrArray*) farray;
|
|
|
|
|
|
|
|
g_return_if_fail (array);
|
|
|
|
|
|
|
|
g_ptr_array_maybe_expand (array, 1);
|
|
|
|
|
|
|
|
array->pdata[array->len++] = data;
|
|
|
|
}
|
|
|
|
|
2000-11-21 00:59:32 +01:00
|
|
|
void
|
|
|
|
g_ptr_array_sort (GPtrArray *array,
|
|
|
|
GCompareFunc compare_func)
|
|
|
|
{
|
|
|
|
g_return_if_fail (array != NULL);
|
|
|
|
|
|
|
|
qsort (array->pdata,
|
|
|
|
array->len,
|
|
|
|
sizeof (gpointer),
|
|
|
|
compare_func);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_ptr_array_sort_with_data (GPtrArray *array,
|
changed prototype of g_boxed_type_register_static() to contain an optional
Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org>
* gboxed.[hc]: changed prototype of g_boxed_type_register_static()
to contain an optional init function and a hint at whether the
boxed structure uses ref counting internally.
added g_value_set_boxed_take_ownership().
made G_TYPE_BOXED an abstract value type.
* genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value
types.
* glib-genmarshal.c: argument type changes, preparation for third-party
arg specification.
* gobject.[hc]: cleaned up get/set property code.
added g_strdup_value_contents() to improve warnings.
* gparam.[hc]: added g_param_value_convert(), taking over responsibility
of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so
validation alterations may be valid a part of the property setting
process.
* gparamspecs.[hc]: made value comparisons stable (for sort applications).
added GParamSpecValueArray, a param spec for value arrays and
GParamSpecClosure. nuked the value exchange functions and
GParamSpecCCallback.
* gtype.[hc]: catch unintialized usages of the type system with
g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT
to flag types that introduce a value table, but can't be used for
g_value_init(). cleaned up reserved type ids.
* gvalue.[hc]: code cleanups and saner checking.
nuked the value exchange API. implemented value transformations, we
can't really "convert" values, rather transforms are an anylogy to
C casts, real conversions need a param spec for validation, which is
why g_param_value_convert() does real conversions now.
* gvaluearray.[hc]: new files that implement a GValueArray, a struct
that can hold inhomogeneous arrays of value (to that extend that it
also allowes undefined values, i.e. G_VALUE_TYPE(value)==0).
this is exposed to the type system as a boxed type.
* gvaluetransform.c: new file implementing most of the former value
exchange functions as single-sided transformations.
* gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added
g_value_set_string_take_ownership().
* *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/.
* *.[hc]: many fixes and cleanups.
* many warning improvements.
Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org>
* gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS
into G_VALUE_LCOPY(), this needs proper documenting.
* gparam.c: fixed G_PARAM_USER_MASK.
* gtype.c (type_data_make_W):
(type_data_last_unref_Wm): fixed invalid memory freeing.
* gobject.c (g_object_last_unref): destroy signal handlers associated
with object, right before finalization.
* gsignal.c (g_signal_parse_name): catch destroyed nodes or signals
that don't actually support details.
* gobject.[hc]: got rid of property trailers. nuked GObject
properties "data" and the "signal" variants.
(g_object_connect): new convenience function to do multiple
signal connections at once.
(g_object_disconnect): likewise, for disconnections.
* gparam.[hc] (g_param_spec_pool_lookup): took out trailer support.
* gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer()
as private (the latter got renamed from g_value_get_as_pointer()).
Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org>
* glib-object.h: add gvaluearray.h.
* gstring.[hc]: fixup naming of g_string_sprint*.
* gtypes.h: fixed GCompareDataFunc naming.
Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org>
* gobject/Makefile.am: shuffled rules to avoid excessive
rebuilds.
* gobject/gobject-sections.txt: updates.
* gobject/tmpl/*: bunch of updates, added another patch
from Eric Lemings <eric.b.lemings@lmco.com>.
2001-03-07 15:46:45 +01:00
|
|
|
GCompareDataFunc compare_func,
|
2000-11-21 00:59:32 +01:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
g_return_if_fail (array != NULL);
|
|
|
|
|
|
|
|
g_qsort_with_data (array->pdata,
|
|
|
|
array->len,
|
|
|
|
sizeof (gpointer),
|
|
|
|
compare_func,
|
|
|
|
user_data);
|
|
|
|
}
|
|
|
|
|
2003-12-26 02:04:12 +01:00
|
|
|
/**
|
|
|
|
* g_ptr_array_foreach:
|
|
|
|
* @array: a #GPtrArray
|
|
|
|
* @func: the function to call for each array element
|
|
|
|
* @user_data: user data to pass to the function
|
|
|
|
*
|
|
|
|
* Calls a function for each element of a #GPtrArray.
|
|
|
|
*
|
|
|
|
* Since: 2.4
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
g_ptr_array_foreach (GPtrArray *array,
|
|
|
|
GFunc func,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
guint i;
|
|
|
|
|
|
|
|
g_return_if_fail (array);
|
|
|
|
|
|
|
|
for (i = 0; i < array->len; i++)
|
|
|
|
(*func) (array->pdata[i], user_data);
|
|
|
|
}
|
|
|
|
|
2000-03-24 16:36:03 +01:00
|
|
|
/* Byte arrays
|
1998-06-12 11:38:32 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
GByteArray* g_byte_array_new (void)
|
|
|
|
{
|
2000-04-17 12:59:46 +02:00
|
|
|
return (GByteArray*) g_array_sized_new (FALSE, FALSE, 1, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
GByteArray* g_byte_array_sized_new (guint reserved_size)
|
|
|
|
{
|
|
|
|
return (GByteArray*) g_array_sized_new (FALSE, FALSE, 1, reserved_size);
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
|
2000-08-17 23:37:18 +02:00
|
|
|
guint8* g_byte_array_free (GByteArray *array,
|
1998-09-02 09:44:02 +02:00
|
|
|
gboolean free_segment)
|
1998-06-12 11:38:32 +02:00
|
|
|
{
|
2000-08-17 23:37:18 +02:00
|
|
|
return (guint8*) g_array_free ((GArray*) array, free_segment);
|
1998-06-12 11:38:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
GByteArray* g_byte_array_append (GByteArray *array,
|
|
|
|
const guint8 *data,
|
|
|
|
guint len)
|
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_append_vals ((GArray*) array, (guint8*)data, len);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
|
|
|
|
|
|
|
GByteArray* g_byte_array_prepend (GByteArray *array,
|
|
|
|
const guint8 *data,
|
|
|
|
guint len)
|
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_prepend_vals ((GArray*) array, (guint8*)data, len);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
|
|
|
|
1998-09-02 09:44:02 +02:00
|
|
|
GByteArray* g_byte_array_set_size (GByteArray *array,
|
|
|
|
guint length)
|
1998-06-12 11:38:32 +02:00
|
|
|
{
|
1998-09-02 09:44:02 +02:00
|
|
|
g_array_set_size ((GArray*) array, length);
|
1998-06-12 11:38:32 +02:00
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
1998-11-03 15:52:25 +01:00
|
|
|
|
|
|
|
GByteArray* g_byte_array_remove_index (GByteArray *array,
|
|
|
|
guint index)
|
|
|
|
{
|
|
|
|
g_array_remove_index((GArray*) array, index);
|
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
|
|
|
|
|
|
|
GByteArray* g_byte_array_remove_index_fast (GByteArray *array,
|
2000-11-21 00:59:32 +01:00
|
|
|
guint index)
|
1998-11-03 15:52:25 +01:00
|
|
|
{
|
|
|
|
g_array_remove_index_fast((GArray*) array, index);
|
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
2000-11-21 00:59:32 +01:00
|
|
|
|
2003-07-26 10:03:16 +02:00
|
|
|
GByteArray*
|
|
|
|
g_byte_array_remove_range (GByteArray *array,
|
|
|
|
guint index_,
|
|
|
|
guint length)
|
|
|
|
{
|
2004-01-31 03:12:06 +01:00
|
|
|
g_return_val_if_fail (array, NULL);
|
|
|
|
g_return_val_if_fail (index_ < array->len, NULL);
|
|
|
|
g_return_val_if_fail (index_ + length <= array->len, NULL);
|
2003-07-26 10:03:16 +02:00
|
|
|
|
2003-09-30 15:36:25 +02:00
|
|
|
return (GByteArray *)g_array_remove_range ((GArray*) array, index_, length);
|
2003-07-26 10:03:16 +02:00
|
|
|
}
|
|
|
|
|
2000-11-21 00:59:32 +01:00
|
|
|
void
|
|
|
|
g_byte_array_sort (GByteArray *array,
|
|
|
|
GCompareFunc compare_func)
|
|
|
|
{
|
|
|
|
g_array_sort ((GArray *) array, compare_func);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_byte_array_sort_with_data (GByteArray *array,
|
changed prototype of g_boxed_type_register_static() to contain an optional
Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org>
* gboxed.[hc]: changed prototype of g_boxed_type_register_static()
to contain an optional init function and a hint at whether the
boxed structure uses ref counting internally.
added g_value_set_boxed_take_ownership().
made G_TYPE_BOXED an abstract value type.
* genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value
types.
* glib-genmarshal.c: argument type changes, preparation for third-party
arg specification.
* gobject.[hc]: cleaned up get/set property code.
added g_strdup_value_contents() to improve warnings.
* gparam.[hc]: added g_param_value_convert(), taking over responsibility
of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so
validation alterations may be valid a part of the property setting
process.
* gparamspecs.[hc]: made value comparisons stable (for sort applications).
added GParamSpecValueArray, a param spec for value arrays and
GParamSpecClosure. nuked the value exchange functions and
GParamSpecCCallback.
* gtype.[hc]: catch unintialized usages of the type system with
g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT
to flag types that introduce a value table, but can't be used for
g_value_init(). cleaned up reserved type ids.
* gvalue.[hc]: code cleanups and saner checking.
nuked the value exchange API. implemented value transformations, we
can't really "convert" values, rather transforms are an anylogy to
C casts, real conversions need a param spec for validation, which is
why g_param_value_convert() does real conversions now.
* gvaluearray.[hc]: new files that implement a GValueArray, a struct
that can hold inhomogeneous arrays of value (to that extend that it
also allowes undefined values, i.e. G_VALUE_TYPE(value)==0).
this is exposed to the type system as a boxed type.
* gvaluetransform.c: new file implementing most of the former value
exchange functions as single-sided transformations.
* gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added
g_value_set_string_take_ownership().
* *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/.
* *.[hc]: many fixes and cleanups.
* many warning improvements.
Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org>
* gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS
into G_VALUE_LCOPY(), this needs proper documenting.
* gparam.c: fixed G_PARAM_USER_MASK.
* gtype.c (type_data_make_W):
(type_data_last_unref_Wm): fixed invalid memory freeing.
* gobject.c (g_object_last_unref): destroy signal handlers associated
with object, right before finalization.
* gsignal.c (g_signal_parse_name): catch destroyed nodes or signals
that don't actually support details.
* gobject.[hc]: got rid of property trailers. nuked GObject
properties "data" and the "signal" variants.
(g_object_connect): new convenience function to do multiple
signal connections at once.
(g_object_disconnect): likewise, for disconnections.
* gparam.[hc] (g_param_spec_pool_lookup): took out trailer support.
* gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer()
as private (the latter got renamed from g_value_get_as_pointer()).
Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org>
* glib-object.h: add gvaluearray.h.
* gstring.[hc]: fixup naming of g_string_sprint*.
* gtypes.h: fixed GCompareDataFunc naming.
Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org>
* gobject/Makefile.am: shuffled rules to avoid excessive
rebuilds.
* gobject/gobject-sections.txt: updates.
* gobject/tmpl/*: bunch of updates, added another patch
from Eric Lemings <eric.b.lemings@lmco.com>.
2001-03-07 15:46:45 +01:00
|
|
|
GCompareDataFunc compare_func,
|
2000-11-21 00:59:32 +01:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
g_array_sort_with_data ((GArray *) array, compare_func, user_data);
|
|
|
|
}
|
2005-03-14 05:26:57 +01:00
|
|
|
|
|
|
|
#define __G_ARRAY_C__
|
|
|
|
#include "galiasdef.c"
|