From 068763b547d791e28b892bcaee810f3d60a83018 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 27 May 2004 21:55:50 +0000 Subject: [PATCH] Revert error return changes from last commit. Thu May 27 17:54:24 2004 Owen Taylor * pango/opentype/otlbuffer.c: Revert error return changes from last commit. --- src/otlbuffer.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/otlbuffer.c b/src/otlbuffer.c index e9fd03b4b..bb0d5e431 100644 --- a/src/otlbuffer.c +++ b/src/otlbuffer.c @@ -28,15 +28,12 @@ while (size > new_allocated) new_allocated += (new_allocated >> 1) + 8; - - error = FT_REALLOC_ARRAY( buffer->in_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ); - if ( error ) + + if ( FT_REALLOC_ARRAY( buffer->in_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) return error; - error = FT_REALLOC_ARRAY( buffer->out_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ); - if ( error ) + if ( FT_REALLOC_ARRAY( buffer->out_string, buffer->allocated, new_allocated, OTL_GlyphItemRec ) ) return error; - error = FT_REALLOC_ARRAY( buffer->positions, buffer->allocated, new_allocated, OTL_PositionRec ); - if ( error ) + if ( FT_REALLOC_ARRAY( buffer->positions, buffer->allocated, new_allocated, OTL_PositionRec ) ) return error; buffer->allocated = new_allocated; @@ -50,9 +47,8 @@ OTL_Buffer *buffer ) { FT_Error error; - - error = FT_ALLOC( *buffer, sizeof( OTL_BufferRec ) ); - if ( error ) + + if ( FT_ALLOC( *buffer, sizeof( OTL_BufferRec ) ) ) return error; (*buffer)->memory = memory;