From 730fb40455118894d970c0cb1a9b37880660889e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sat, 11 Jun 2005 01:09:15 +0000 Subject: [PATCH] Make these functions static, which allows slightly less awkward error handling within them. --- ChangeLog | 8 ++++++++ src/cairo-gstate.c | 22 ++++++++++++++++------ src/cairoint.h | 13 ------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index baf1ca76d..ac543fe36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-11 Carl Worth + + * src/cairoint.h: + * src/cairo-gstate.c: (_cairo_gstate_init, + _cairo_gstate_init_copy, _cairo_gstate_fini): Make these functions + static, which allows slightly less awkward error handling within + them. + 2005-06-10 Carl Worth * src/cairoint.h: Provide font-backend-specific macros for diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index 63572b313..0c35a3a9a 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -41,6 +41,16 @@ #include "cairo-gstate-private.h" +static cairo_status_t +_cairo_gstate_init (cairo_gstate_t *gstate, + cairo_surface_t *target); + +static cairo_status_t +_cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other); + +static void +_cairo_gstate_fini (cairo_gstate_t *gstate); + static cairo_status_t _cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate, cairo_pattern_t *src, @@ -80,7 +90,7 @@ _cairo_gstate_create (cairo_surface_t *target) return gstate; } -cairo_status_t +static cairo_status_t _cairo_gstate_init (cairo_gstate_t *gstate, cairo_surface_t *target) { @@ -117,16 +127,16 @@ _cairo_gstate_init (cairo_gstate_t *gstate, gstate->target = target; cairo_surface_reference (gstate->target); - gstate->next = NULL; - gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK); - if (!gstate->source) - return CAIRO_STATUS_NO_MEMORY; + if (gstate->source == NULL) + return CAIRO_STATUS_NO_MEMORY; + + gstate->next = NULL; return CAIRO_STATUS_SUCCESS; } -cairo_status_t +static cairo_status_t _cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other) { cairo_status_t status; diff --git a/src/cairoint.h b/src/cairoint.h index fa3403d1d..24c3ee29c 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -932,25 +932,12 @@ _cairo_fixed_integer_ceil (cairo_fixed_t f); cairo_private cairo_gstate_t * _cairo_gstate_create (cairo_surface_t *target); -cairo_private cairo_status_t -_cairo_gstate_init (cairo_gstate_t *gstate, - cairo_surface_t *target); - -cairo_private cairo_status_t -_cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other); - -cairo_private void -_cairo_gstate_fini (cairo_gstate_t *gstate); - cairo_private void _cairo_gstate_destroy (cairo_gstate_t *gstate); cairo_private cairo_gstate_t * _cairo_gstate_clone (cairo_gstate_t *gstate); -cairo_private cairo_status_t -_cairo_gstate_copy (cairo_gstate_t *dest, cairo_gstate_t *src); - cairo_private cairo_status_t _cairo_gstate_begin_group (cairo_gstate_t *gstate);