glib/gobject/gbsearcharray.c
Tor Lillqvist f42bc93186 Fix gccisms (pointer arithmetic on void pointer, label without statement
2000-10-26  Tor Lillqvist  <tml@iki.fi>

	* gbsearcharray.c (bsearch_array_insert): Fix gccisms (pointer
	arithmetic on void pointer, label without statement following.

	* gtype.c (type_node_fundamental_info): Don't apply unary minus to
	result of sizeof operator, it can be unsigned. Cast first to
	gssize.

	* gobject.def: Add new functions.

	* makefile.{mingw,msc}.in: Add new objects.
2000-10-26 17:53:08 +00:00

166 lines
4.5 KiB
C

/* GObject - GLib Type, Object, Parameter and Signal Library
* Copyright (C) 2000 Tim Janik
*
* This library is free software; you can redistribute it and/or
* 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
* 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.
*/
#define G_IMPLEMENT_INLINES 1
#define __G_BSEARCHARRAY_C__
#include "gbsearcharray.h"
#include <string.h>
/* --- structures --- */
static inline guint
upper_power2 (guint number)
{
return number ? 1 << g_bit_storage (number - 1) : 0;
}
static inline gpointer
bsearch_array_insert (GBSearchArray *barray,
gconstpointer key_node,
gboolean replace)
{
gint sizeof_node;
guint8 *check;
sizeof_node = barray->sizeof_node;
if (barray->n_nodes == 0)
{
guint new_size = barray->sizeof_node;
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
new_size = upper_power2 (new_size);
barray->nodes = g_realloc (barray->nodes, new_size);
barray->n_nodes = 1;
check = barray->nodes;
replace = TRUE;
}
else
{
GBSearchCompareFunc cmp_func = barray->cmp_func;
guint n_nodes = barray->n_nodes;
guint8 *nodes = barray->nodes;
gint cmp;
guint i;
nodes -= sizeof_node;
do
{
i = (n_nodes + 1) >> 1;
check = nodes + i * sizeof_node;
cmp = cmp_func (key_node, check);
if (cmp > 0)
{
n_nodes -= i;
nodes = check;
}
else if (cmp < 0)
n_nodes = i - 1;
else /* if (cmp == 0) */
goto SKIP_GROW;
}
while (n_nodes);
/* grow */
if (cmp > 0)
check += sizeof_node;
i = (check - ((guint8*) barray->nodes)) / sizeof_node;
n_nodes = barray->n_nodes++;
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
{
guint new_size = upper_power2 (barray->n_nodes * sizeof_node);
guint old_size = upper_power2 (n_nodes * sizeof_node);
if (new_size != old_size)
barray->nodes = g_realloc (barray->nodes, new_size);
}
else
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
check = (char *) barray->nodes + i * sizeof_node;
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
replace = TRUE;
SKIP_GROW:
;
}
if (replace)
memcpy (check, key_node, sizeof_node);
return check;
}
gpointer
g_bsearch_array_insert (GBSearchArray *barray,
gconstpointer key_node,
gboolean replace_existing)
{
g_return_val_if_fail (barray != NULL, NULL);
g_return_val_if_fail (key_node != NULL, NULL);
return bsearch_array_insert (barray, key_node, replace_existing);
}
void
g_bsearch_array_remove_node (GBSearchArray *barray,
gpointer _node_in_array)
{
guint8 *nodes, *bound, *node_in_array = _node_in_array;
guint old_size;
g_return_if_fail (barray != NULL);
nodes = barray->nodes;
old_size = barray->sizeof_node;
old_size *= barray->n_nodes; /* beware of int widths */
bound = nodes + old_size;
g_return_if_fail (node_in_array >= nodes && node_in_array < bound);
bound -= barray->sizeof_node;
barray->n_nodes -= 1;
g_memmove (node_in_array, node_in_array + barray->sizeof_node, (bound - node_in_array) / barray->sizeof_node);
if ((barray->flags & G_BSEARCH_DEFER_SHRINK) == 0)
{
guint new_size = bound - nodes; /* old_size - barray->sizeof_node */
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
{
new_size = upper_power2 (new_size);
old_size = upper_power2 (old_size);
if (old_size != new_size)
barray->nodes = g_realloc (barray->nodes, new_size);
}
else
barray->nodes = g_realloc (barray->nodes, new_size);
}
}
void
g_bsearch_array_remove (GBSearchArray *barray,
gconstpointer key_node)
{
gpointer node_in_array;
g_return_if_fail (barray != NULL);
node_in_array = g_bsearch_array_lookup (barray, key_node);
if (!node_in_array)
g_warning (G_STRLOC ": unable to remove unexistant node");
else
g_bsearch_array_remove_node (barray, node_in_array);
}