diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-10-04 13:15:46 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2007-10-04 13:31:44 +0100 |
commit | bed8239f03773ad1584c8ba48ceb0b34bbe69453 (patch) | |
tree | fb97a0cd4874f4fd4a2b22d6ec882a77f04202da /src/cairo-os2-surface.c | |
parent | d90d4bb6b99e0a912650234e28d097ea76c1cecc (diff) | |
download | cairo-bed8239f03773ad1584c8ba48ceb0b34bbe69453.tar.gz |
[cairo-error] Clean up all the warnings and missing _cairo_error() calls.
Every time we assign or return a hard-coded error status wrap that value
with a call to _cairo_error(). So the idiom becomes:
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
or
return _cairo_error (CAIRO_STATUS_INVALID_DASH);
This ensures that a breakpoint placed on _cairo_error() will trigger
immediately cairo detects the error.
Diffstat (limited to 'src/cairo-os2-surface.c')
-rw-r--r-- | src/cairo-os2-surface.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c index b4488874b..0d888ed3c 100644 --- a/src/cairo-os2-surface.c +++ b/src/cairo-os2-surface.c @@ -473,7 +473,7 @@ _cairo_os2_surface_acquire_source_image (void *abstract_surfac (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } DosRequestMutexSem (local_os2_surface->hmtx_use_private_fields, SEM_INDEFINITE_WAIT); @@ -529,7 +529,7 @@ _cairo_os2_surface_acquire_dest_image (void *abstract_surfac (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } DosRequestMutexSem (local_os2_surface->hmtx_use_private_fields, SEM_INDEFINITE_WAIT); @@ -637,7 +637,7 @@ _cairo_os2_surface_get_extents (void *abstract_surface, (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } rectangle->x = 0; @@ -773,14 +773,14 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } if ((new_width <= 0) || (new_height <= 0)) { /* Invalid size! */ - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } /* Allocate memory for new stuffs */ @@ -789,7 +789,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, /* Not enough memory for the pixels! * Everything remains the same! */ - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } /* This is possibly not needed, malloc'd space is usually @@ -812,7 +812,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, * Everything remains the same! */ free (pchNewPixels); - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } /* Okay, new memory allocated, so it's time to swap old buffers @@ -824,7 +824,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, */ cairo_surface_destroy ((cairo_surface_t *) pNewImageSurface); free (pchNewPixels); - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } /* We have to make sure that we won't destroy a surface which @@ -840,7 +840,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, /* Either timeout or something wrong... Exit. */ cairo_surface_destroy ((cairo_surface_t *) pNewImageSurface); free (pchNewPixels); - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } /* Okay, grab mutex and check counter again! */ if (DosRequestMutexSem (local_os2_surface->hmtx_use_private_fields, SEM_INDEFINITE_WAIT) @@ -851,7 +851,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, */ cairo_surface_destroy ((cairo_surface_t *) pNewImageSurface); free (pchNewPixels); - return CAIRO_STATUS_NO_MEMORY; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } } @@ -949,7 +949,7 @@ _cairo_os2_surface_finish (void *abstract_surface) (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } DosRequestMutexSem (local_os2_surface->hmtx_use_private_fields, SEM_INDEFINITE_WAIT); @@ -1042,7 +1042,7 @@ _cairo_os2_surface_mark_dirty_rectangle (void *surface, (local_os2_surface->base.backend != &cairo_os2_surface_backend)) { /* Invalid parameter (wrong surface)! */ - return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; + return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH); } /* Get mutex, we'll work with the pixel array! */ |