diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-05-27 21:55:50 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-05-27 21:55:50 +0000 |
| commit | dc949d2a601e870084572f231b0ecb57687557d3 (patch) | |
| tree | 8a2aac68946abaa3b3191f2b934e9373979e8f6e | |
| parent | 20dd3500dc55252c1b342ad9b4aab1f7ce53175e (diff) | |
| download | pango-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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/opentype/otlbuffer.c | 16 |
5 files changed, 26 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + Thu May 27 16:57:30 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/otlbuffer.c: Free buffer->positions, diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 736dd09d..caea012a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + Thu May 27 16:57:30 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/otlbuffer.c: Free buffer->positions, diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 736dd09d..caea012a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + Thu May 27 16:57:30 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/otlbuffer.c: Free buffer->positions, diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 736dd09d..caea012a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + Thu May 27 16:57:30 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/otlbuffer.c: Free buffer->positions, 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; |