summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-05-27 21:55:50 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-05-27 21:55:50 +0000
commitdc949d2a601e870084572f231b0ecb57687557d3 (patch)
tree8a2aac68946abaa3b3191f2b934e9373979e8f6e /pango
parent20dd3500dc55252c1b342ad9b4aab1f7ce53175e (diff)
downloadpango-dc949d2a601e870084572f231b0ecb57687557d3.tar.gz
Revert error return changes from last commit.
Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/otlbuffer.c: Revert error return changes from last commit.
Diffstat (limited to 'pango')
-rw-r--r--pango/opentype/otlbuffer.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/pango/opentype/otlbuffer.c b/pango/opentype/otlbuffer.c
index e9fd03b4..bb0d5e43 100644
--- a/pango/opentype/otlbuffer.c
+++ b/pango/opentype/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;