summaryrefslogtreecommitdiff
path: root/src/base/ftstream.c
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2001-06-27 16:18:10 +0000
committerWerner Lemberg <wl@gnu.org>2001-06-27 16:18:10 +0000
commitf814d0fafe344f1454b52e2d455c14b5fcea5b67 (patch)
treeb88a1d230e3a4ff8ac6308bcafbfa379f76f03c4 /src/base/ftstream.c
parentc40f386727d78ddd669814c402611c0443ff195c (diff)
downloadfreetype2-f814d0fafe344f1454b52e2d455c14b5fcea5b67.tar.gz
First round in converting
type foo ( ... ) to type foo ( ... ) Other minor formatting issues.
Diffstat (limited to 'src/base/ftstream.c')
-rw-r--r--src/base/ftstream.c113
1 files changed, 68 insertions, 45 deletions
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 1ada68c09..9bee3c8ab 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -31,10 +31,11 @@
#define FT_COMPONENT trace_stream
- FT_BASE_DEF( void ) FT_New_Memory_Stream( FT_Library library,
- FT_Byte* base,
- FT_ULong size,
- FT_Stream stream )
+ FT_BASE_DEF( void )
+ FT_New_Memory_Stream( FT_Library library,
+ FT_Byte* base,
+ FT_ULong size,
+ FT_Stream stream )
{
stream->memory = library->memory;
stream->base = base;
@@ -46,8 +47,9 @@
}
- FT_BASE_DEF( FT_Error ) FT_Seek_Stream( FT_Stream stream,
- FT_ULong pos )
+ FT_BASE_DEF( FT_Error )
+ FT_Seek_Stream( FT_Stream stream,
+ FT_ULong pos )
{
FT_Error error;
@@ -84,31 +86,35 @@
}
- FT_BASE_DEF( FT_Error ) FT_Skip_Stream( FT_Stream stream,
- FT_Long distance )
+ FT_BASE_DEF( FT_Error )
+ FT_Skip_Stream( FT_Stream stream,
+ FT_Long distance )
{
return FT_Seek_Stream( stream, (FT_ULong)( stream->pos + distance ) );
}
- FT_BASE_DEF( FT_Long ) FT_Stream_Pos( FT_Stream stream )
+ FT_BASE_DEF( FT_Long )
+ FT_Stream_Pos( FT_Stream stream )
{
return stream->pos;
}
- FT_BASE_DEF( FT_Error ) FT_Read_Stream( FT_Stream stream,
- FT_Byte* buffer,
- FT_ULong count )
+ FT_BASE_DEF( FT_Error )
+ FT_Read_Stream( FT_Stream stream,
+ FT_Byte* buffer,
+ FT_ULong count )
{
return FT_Read_Stream_At( stream, stream->pos, buffer, count );
}
- FT_BASE_DEF( FT_Error ) FT_Read_Stream_At( FT_Stream stream,
- FT_ULong pos,
- FT_Byte* buffer,
- FT_ULong count )
+ FT_BASE_DEF( FT_Error )
+ FT_Read_Stream_At( FT_Stream stream,
+ FT_ULong pos,
+ FT_Byte* buffer,
+ FT_ULong count )
{
FT_Error error = FT_Err_Ok;
FT_ULong read_bytes;
@@ -149,9 +155,10 @@
}
- FT_BASE_DEF( FT_Error ) FT_Extract_Frame( FT_Stream stream,
- FT_ULong count,
- FT_Byte** pbytes )
+ FT_BASE_DEF( FT_Error )
+ FT_Extract_Frame( FT_Stream stream,
+ FT_ULong count,
+ FT_Byte** pbytes )
{
FT_Error error;
@@ -170,8 +177,9 @@
}
- FT_BASE_DEF( void ) FT_Release_Frame( FT_Stream stream,
- FT_Byte** pbytes )
+ FT_BASE_DEF( void )
+ FT_Release_Frame( FT_Stream stream,
+ FT_Byte** pbytes )
{
if ( stream->read )
{
@@ -184,8 +192,9 @@
}
- FT_BASE_DEF( FT_Error ) FT_Access_Frame( FT_Stream stream,
- FT_ULong count )
+ FT_BASE_DEF( FT_Error )
+ FT_Access_Frame( FT_Stream stream,
+ FT_ULong count )
{
FT_Error error = FT_Err_Ok;
FT_ULong read_bytes;
@@ -244,7 +253,8 @@
}
- FT_BASE_DEF( void ) FT_Forget_Frame( FT_Stream stream )
+ FT_BASE_DEF( void )
+ FT_Forget_Frame( FT_Stream stream )
{
/* IMPORTANT: The assertion stream->cursor != 0 was removed, given */
/* that it is possible to access a frame of length 0 in */
@@ -269,7 +279,8 @@
}
- FT_BASE_DEF( FT_Char ) FT_Get_Char( FT_Stream stream )
+ FT_BASE_DEF( FT_Char )
+ FT_Get_Char( FT_Stream stream )
{
FT_Char result;
@@ -284,7 +295,8 @@
}
- FT_BASE_DEF( FT_Short ) FT_Get_Short( FT_Stream stream )
+ FT_BASE_DEF( FT_Short )
+ FT_Get_Short( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
@@ -302,7 +314,8 @@
}
- FT_BASE_DEF( FT_Short ) FT_Get_ShortLE( FT_Stream stream )
+ FT_BASE_DEF( FT_Short )
+ FT_Get_ShortLE( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
@@ -320,7 +333,8 @@
}
- FT_BASE_DEF( FT_Long ) FT_Get_Offset( FT_Stream stream )
+ FT_BASE_DEF( FT_Long )
+ FT_Get_Offset( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
@@ -337,7 +351,8 @@
}
- FT_BASE_DEF( FT_Long ) FT_Get_Long( FT_Stream stream )
+ FT_BASE_DEF( FT_Long )
+ FT_Get_Long( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
@@ -354,7 +369,8 @@
}
- FT_BASE_DEF( FT_Long ) FT_Get_LongLE( FT_Stream stream )
+ FT_BASE_DEF( FT_Long )
+ FT_Get_LongLE( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
@@ -371,8 +387,9 @@
}
- FT_BASE_DEF( FT_Char ) FT_Read_Char( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Char )
+ FT_Read_Char( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte result = 0;
@@ -407,8 +424,9 @@
}
- FT_BASE_DEF( FT_Short ) FT_Read_Short( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Short )
+ FT_Read_Short( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
@@ -453,8 +471,9 @@
}
- FT_BASE_DEF( FT_Short ) FT_Read_ShortLE( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Short )
+ FT_Read_ShortLE( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
@@ -499,8 +518,9 @@
}
- FT_BASE_DEF( FT_Long ) FT_Read_Offset( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Long )
+ FT_Read_Offset( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte reads[3];
FT_Byte* p = 0;
@@ -545,8 +565,9 @@
}
- FT_BASE_DEF( FT_Long ) FT_Read_Long( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Long )
+ FT_Read_Long( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte reads[4];
FT_Byte* p = 0;
@@ -591,8 +612,9 @@
}
- FT_BASE_DEF( FT_Long ) FT_Read_LongLE( FT_Stream stream,
- FT_Error* error )
+ FT_BASE_DEF( FT_Long )
+ FT_Read_LongLE( FT_Stream stream,
+ FT_Error* error )
{
FT_Byte reads[4];
FT_Byte* p = 0;
@@ -637,9 +659,10 @@
}
- FT_BASE_DEF( FT_Error ) FT_Read_Fields( FT_Stream stream,
- const FT_Frame_Field* fields,
- void* structure )
+ FT_BASE_DEF( FT_Error )
+ FT_Read_Fields( FT_Stream stream,
+ const FT_Frame_Field* fields,
+ void* structure )
{
FT_Error error;
FT_Bool frame_accessed = 0;