summaryrefslogtreecommitdiff
path: root/lib/freetype/src/tools
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-09-01 19:14:26 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-09-01 19:14:26 +0000
commit8185d20f270e773a3bc2a484b35c584f6195d16b (patch)
tree74db6125fc2f405172d73ab4d0f60c59bc219510 /lib/freetype/src/tools
parent252826e7c03446819e919a34ced5eca60c142714 (diff)
Update to freetype 2.4.2. This has been in snapshots for a while
and tested explicitely by ajacoutot@ jasper@, jcs@, krw@ and others on various architectures.
Diffstat (limited to 'lib/freetype/src/tools')
-rw-r--r--lib/freetype/src/tools/apinames.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/freetype/src/tools/apinames.c b/lib/freetype/src/tools/apinames.c
index 7f191e19c..99e3028c9 100644
--- a/lib/freetype/src/tools/apinames.c
+++ b/lib/freetype/src/tools/apinames.c
@@ -10,7 +10,7 @@
* accepted if you are using GCC for compilation (and probably by
* other compilers too).
*
- * Author: David Turner, 2005, 2006, 2008, 2009
+ * Author: David Turner, 2005, 2006, 2008, 2009, 2010
*
* This code is explicitly placed into the public domain.
*
@@ -126,6 +126,7 @@ names_dump( FILE* out,
{
int nn;
+
switch ( format )
{
case OUTPUT_WINDOWS_DEF:
@@ -151,22 +152,25 @@ names_dump( FILE* out,
case OUTPUT_WATCOM_LBC:
{
/* we must omit the .dll suffix from the library name */
- char temp[512];
- char* dot;
+ char temp[512];
+ const char* dot;
+
if ( dll_name == NULL )
{
fprintf( stderr,
- "you must provide a DLL name with the -d option !!\n" );
- exit(4);
+ "you must provide a DLL name with the -d option!\n" );
+ exit( 4 );
}
dot = strchr( dll_name, '.' );
if ( dot != NULL )
{
- int len = (dot - dll_name);
- if ( len > (int)(sizeof(temp)-1) )
- len = sizeof(temp)-1;
+ int len = dot - dll_name;
+
+
+ if ( len > (int)( sizeof( temp ) - 1 ) )
+ len = sizeof ( temp ) - 1;
memcpy( temp, dll_name, len );
temp[len] = 0;