Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Savannah bug #38538.

Browse Source 
* builds/amiga/src/base/ftdebug.c, builds/win32/ftdebug.c,
builds/wince/ftdebug.c (FT_Throw): Add function.
2.6.5
Werner Lemberg 12 years ago
parent 5ea06ce017
commit b114b7c01b
5 changed files with 84 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      ChangeLog
  2. 43
      builds/amiga/src/base/ftdebug.c
  3. 28
      builds/win32/ftdebug.c
  4. 22
      builds/wince/ftdebug.c
  5. 8
      src/base/ftdebug.c

7
ChangeLog
Unescape View File

@ -1,3 +1,10 @@
2013-03-17 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #38538.
* builds/amiga/src/base/ftdebug.c, builds/win32/ftdebug.c,
builds/wince/ftdebug.c (FT_Throw): Add function.
2013-03-17 Werner Lemberg <wl@gnu.org>
Remove dead code.

43
builds/amiga/src/base/ftdebug.c
Unescape View File

@ -2,9 +2,9 @@
/* */
/* ftdebug.c */
/* */
/* Debugging and logging component (body). */
/* Debugging and logging component for amiga (body). */
/* */
/* Copyright 1996-2001, 2002, 2004, 2005 by */
/* Copyright 1996-2001, 2002, 2004, 2005, 2013 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -41,12 +41,12 @@
/*************************************************************************/
/*
* Based on the default ftdebug.c,
* replaced vprintf() with KVPrintF(),
* commented out exit(),
* replaced getenv() with GetVar().
*/
/*
* Based on the default ftdebug.c,
* replaced vprintf() with KVPrintF(),
* commented out exit(),
* replaced getenv() with GetVar().
*/
#include <exec/types.h>
#include <utility/tagitem.h>
@ -59,9 +59,9 @@
#include <clib/debug_protos.h>
#ifndef __amigaos4__
extern struct Library *DOSBase;
extern struct Library *DOSBase;
#else
extern struct DOSIFace *IDOS;
extern struct DOSIFace *IDOS;
#endif
@ -75,13 +75,13 @@ extern struct DOSIFace *IDOS;
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
FT_Message( const char* fmt,
... )
{
va_list ap;
va_start( ap, fmt );
/* vprintf( fmt, ap ); */
KVPrintF( fmt, ap );
va_end( ap );
}
@ -90,19 +90,34 @@ extern struct DOSIFace *IDOS;
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Panic( const char* fmt, ... )
FT_Panic( const char* fmt,
... )
{
va_list ap;
va_start( ap, fmt );
/* vprintf( fmt, ap ); */
KVPrintF( fmt, ap );
va_end( ap );
/* exit( EXIT_FAILURE ); */
}
/* documentation is in ftdebug.h */
FT_BASE_DEF( int )
FT_Throw( FT_Error error,
int line,
const char* file )
{
FT_UNUSED( error );
FT_UNUSED( line );
FT_UNUSED( file );
return 0;
}
#endif /* FT_DEBUG_LEVEL_ERROR */

28
builds/win32/ftdebug.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for Win32 (body). */
/* */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -47,7 +47,6 @@
#ifdef FT_DEBUG_LEVEL_ERROR
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
@ -55,8 +54,11 @@
#include <windows.h>
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
FT_Message( const char* fmt,
... )
{
static char buf[8192];
va_list ap;
@ -71,8 +73,11 @@
}
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Panic( const char* fmt, ... )
FT_Panic( const char* fmt,
... )
{
static char buf[8192];
va_list ap;
@ -87,6 +92,21 @@
}
/* documentation is in ftdebug.h */
FT_BASE_DEF( int )
FT_Throw( FT_Error error,
int line,
const char* file )
{
FT_UNUSED( error );
FT_UNUSED( line );
FT_UNUSED( file );
return 0;
}
#ifdef FT_DEBUG_LEVEL_TRACE

22
builds/wince/ftdebug.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for WinCE (body). */
/* */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -71,7 +71,8 @@
FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
FT_Message( const char* fmt,
... )
{
static char buf[8192];
va_list ap;
@ -87,7 +88,8 @@
FT_BASE_DEF( void )
FT_Panic( const char* fmt, ... )
FT_Panic( const char* fmt,
... )
{
static char buf[8192];
va_list ap;
@ -102,6 +104,20 @@
}
/* documentation is in ftdebug.h */
FT_BASE_DEF( int )
FT_Throw( FT_Error error,
int line,
const char* file )
{
FT_UNUSED( error );
FT_UNUSED( line );
FT_UNUSED( file );
return 0;
}
#ifdef FT_DEBUG_LEVEL_TRACE

8
src/base/ftdebug.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component (body). */
/* */
/* Copyright 1996-2001, 2002, 2004, 2008 by */
/* Copyright 1996-2001, 2002, 2004, 2008, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -51,7 +51,8 @@
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
FT_Message( const char* fmt,
... )
{
va_list ap;
@ -65,7 +66,8 @@
/* documentation is in ftdebug.h */
FT_BASE_DEF( void )
FT_Panic( const char* fmt, ... )
FT_Panic( const char* fmt,
... )
{
va_list ap;

Write Preview
Loading…
Cancel
Save