diff options
| author | Werner Lemberg <wl@gnu.org> | 2007-02-12 21:44:10 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2007-02-12 21:44:10 +0000 |
| commit | 442bfb89137086811de13b9eae9cd6390ad5c204 (patch) | |
| tree | cae13f917476ccb12ba3033238655ba8b0dccab8 /src/base/ftutil.c | |
| parent | 2ef3e0f1cd299d96bfcc02ffaa349bd8491c719c (diff) | |
| download | freetype2-442bfb89137086811de13b9eae9cd6390ad5c204.tar.gz | |
Formatting, copyright years, s/memcpy/ft_memcpy/.
Diffstat (limited to 'src/base/ftutil.c')
| -rw-r--r-- | src/base/ftutil.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/base/ftutil.c b/src/base/ftutil.c index eb6f6b1be..e14aea79e 100644 --- a/src/base/ftutil.c +++ b/src/base/ftutil.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility file for memory and list management (body). */ /* */ -/* Copyright 2002, 2004, 2005, 2006 by */ +/* Copyright 2002, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -181,7 +181,8 @@ FT_Error error; FT_Pointer p = ft_mem_qalloc( memory, size, &error ); - if (!error && address) + + if ( !error && address ) ft_memcpy( p, address, size ); *p_error = error; @@ -194,7 +195,9 @@ const char* str, FT_Error *p_error ) { - FT_ULong len = str ? (FT_ULong)ft_strlen(str)+1 : 0; + FT_ULong len = str ? (FT_ULong)ft_strlen( str ) + 1 + : 0; + return ft_mem_dup( memory, str, len, p_error ); } @@ -210,7 +213,7 @@ *dst = 0; /* always zero-terminate */ - return (*src != 0); + return *src != 0; } |