fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 19:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

array: Cleanup types

Browse source 
Const-ify where appropriate and make all index and element counts
unsigned int.

This is needed to enable accessing const cairo_array_t's without
having to manually remove the const qualifier (which happens in the
to-be-merged mesh pattern code, for example).
This commit is contained in:
Andrea Canciani 2010-11-24 12:08:03 +01:00
parent 9960f299ac
commit 493aaf0f15
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cairo-array.c
View file

@ -1,3 +1,4 @@
/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
/* cairo - a vector graphics library with display and print output
*
* Copyright © 2004 Red Hat, Inc
@ -53,7 +54,7 @@
* called to free resources allocated during use of the array.
**/
void
_cairo_array_init (cairo_array_t *array, int element_size)
_cairo_array_init (cairo_array_t *array, unsigned int element_size)
{
array->size = 0;
array->num_elements = 0;
@ -234,7 +235,9 @@ _cairo_array_index_const (const cairo_array_t *array, unsigned int index)
* location pointed to by @dst.
**/
void
_cairo_array_copy_element (cairo_array_t *array, int index, void *dst)
_cairo_array_copy_element (const cairo_array_t *array,
unsigned int index,
void *dst)
{
memcpy (dst, _cairo_array_index_const (array, index), array->element_size);
}
@ -276,7 +279,7 @@ _cairo_array_append (cairo_array_t *array,
cairo_status_t
_cairo_array_append_multiple (cairo_array_t *array,
const void *elements,
int num_elements)
unsigned int num_elements)
{
cairo_status_t status;
void *dest;
@ -330,8 +333,8 @@ _cairo_array_allocate (cairo_array_t *array,
*
* This space was left intentionally blank, but gtk-doc filled it.
**/
int
_cairo_array_num_elements (cairo_array_t *array)
unsigned int
_cairo_array_num_elements (const cairo_array_t *array)
{
return array->num_elements;
}
@ -344,8 +347,8 @@ _cairo_array_num_elements (cairo_array_t *array)
*
* This space was left intentionally blank, but gtk-doc filled it.
**/
int
_cairo_array_size (cairo_array_t *array)
unsigned int
_cairo_array_size (const cairo_array_t *array)
{
return array->size;
}
@ -490,7 +493,7 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array,
cairo_status_t
_cairo_user_data_array_copy (cairo_user_data_array_t *dst,
cairo_user_data_array_t *src)
const cairo_user_data_array_t *src)
{
/* discard any existing user-data */
if (dst->num_elements != 0) {

18
src/cairoint.h
View file

@ -301,7 +301,7 @@ _cairo_box_intersects_line_segment (cairo_box_t *box,
/* cairo-array.c structures and functions */
cairo_private void
_cairo_array_init (cairo_array_t *array, int element_size);
_cairo_array_init (cairo_array_t *array, unsigned int element_size);
cairo_private void
_cairo_array_fini (cairo_array_t *array);
@ -318,7 +318,7 @@ _cairo_array_append (cairo_array_t *array, const void *element);
cairo_private cairo_status_t
_cairo_array_append_multiple (cairo_array_t *array,
const void *elements,
int num_elements);
unsigned int num_elements);
cairo_private cairo_status_t
_cairo_array_allocate (cairo_array_t *array,
@ -332,13 +332,13 @@ cairo_private const void *
_cairo_array_index_const (const cairo_array_t *array, unsigned int index);
cairo_private void
_cairo_array_copy_element (cairo_array_t *array, int index, void *dst);
_cairo_array_copy_element (const cairo_array_t *array, unsigned int index, void *dst);
cairo_private int
_cairo_array_num_elements (cairo_array_t *array);
cairo_private unsigned int
_cairo_array_num_elements (const cairo_array_t *array);
cairo_private int
_cairo_array_size (cairo_array_t *array);
cairo_private unsigned int
_cairo_array_size (const cairo_array_t *array);
typedef struct {
const cairo_user_data_key_t *key;
@ -363,8 +363,8 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array,
cairo_destroy_func_t destroy);
cairo_private cairo_status_t
_cairo_user_data_array_copy (cairo_user_data_array_t *dst,
cairo_user_data_array_t *src);
_cairo_user_data_array_copy (cairo_user_data_array_t *dst,
const cairo_user_data_array_t *src);
cairo_private void
_cairo_user_data_array_foreach (cairo_user_data_array_t *array,