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

Style fix: test-and-bail rather than making the working body conditional.

Browse source 
Allow destroy to work on a NULL object.
This commit is contained in:
Carl Worth 2005-11-07 10:02:06 +00:00
parent 201d4e2ce7
commit 9796a54fa1
2 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-11-07 Carl Worth <cworth@cworth.org>
* src/cairo-gstate.c: (_cairo_gstate_create),
(_cairo_gstate_clone): Style fix: test-and-bail rather than making
the working body conditional.
* src/cairo-gstate.c: (_cairo_gstate_destroy): Allow destroy to
work on a NULL object.
2005-11-07 Carl Worth <cworth@cworth.org>
* src/Makefile.am:

44
src/cairo-gstate.c
View file

@ -79,15 +79,16 @@ _cairo_gstate_create (cairo_surface_t *target)
cairo_status_t status;
cairo_gstate_t *gstate;
gstate = malloc (sizeof (cairo_gstate_t));
assert (target != NULL);
if (gstate)
{
status = _cairo_gstate_init (gstate, target);
if (status) {
free (gstate);
return NULL;
}
gstate = malloc (sizeof (cairo_gstate_t));
if (gstate == NULL)
return NULL;
status = _cairo_gstate_init (gstate, target);
if (status) {
free (gstate);
return NULL;
}
return gstate;
@ -193,6 +194,9 @@ _cairo_gstate_fini (cairo_gstate_t *gstate)
void
_cairo_gstate_destroy (cairo_gstate_t *gstate)
{
if (gstate == NULL)
return;
_cairo_gstate_fini (gstate);
free (gstate);
}
@ -210,22 +214,24 @@ _cairo_gstate_destroy (cairo_gstate_t *gstate)
* memory.
**/
cairo_gstate_t*
_cairo_gstate_clone (cairo_gstate_t *gstate)
_cairo_gstate_clone (cairo_gstate_t *other)
{
cairo_status_t status;
cairo_gstate_t *clone;
cairo_gstate_t *gstate;
clone = malloc (sizeof (cairo_gstate_t));
if (clone) {
status = _cairo_gstate_init_copy (clone, gstate);
if (status) {
free (clone);
return NULL;
}
assert (other != NULL);
gstate = malloc (sizeof (cairo_gstate_t));
if (gstate == NULL)
return NULL;
status = _cairo_gstate_init_copy (gstate, other);
if (status) {
free (gstate);
return NULL;
}
clone->next = NULL;
return clone;
return gstate;
}
/* Push rendering off to an off-screen group. */