From 3c5ad9516675db198246b460f84ae7ea01b46adb Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 21 Dec 2008 17:51:12 +0000 Subject: [PATCH] * src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c, src/smooth/ftgrays.c, src/base/ftobjc.s, src/sfobjs.c: s/_Err_Bad_Argument/_Err_Invalid_Argument/. The former is for errors in the bytecode interpreter only. --- ChangeLog | 7 +++++++ src/base/ftobjs.c | 4 ++-- src/cache/ftcmanag.c | 6 +++--- src/pfr/pfrdrivr.c | 2 +- src/sfnt/sfobjs.c | 2 +- src/smooth/ftgrays.c | 2 +- src/winfonts/winfnt.c | 6 +++--- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6ff3cfd9..d5e1cb225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-12-21 Werner Lemberg + + * src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c, + src/smooth/ftgrays.c, src/base/ftobjc.s, src/sfobjs.c: + s/_Err_Bad_Argument/_Err_Invalid_Argument/. The former is for + errors in the bytecode interpreter only. + 2008-12-21 Werner Lemberg * src/base/ftpfr.c (FT_Get_PFR_Metrics): Protect against NULL diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 171a8b49b..bea470f3e 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -3444,11 +3444,11 @@ if ( size == NULL ) - return FT_Err_Bad_Argument; + return FT_Err_Invalid_Argument; face = size->face; if ( face == NULL || face->driver == NULL ) - return FT_Err_Bad_Argument; + return FT_Err_Invalid_Argument; /* we don't need anything more complex than that; all size objects */ /* are already listed by the face */ diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 9d7347c3d..989b9e209 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -4,7 +4,7 @@ /* */ /* FreeType Cache Manager (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -181,7 +181,7 @@ if ( asize == NULL ) - return FTC_Err_Bad_Argument; + return FTC_Err_Invalid_Argument; *asize = NULL; @@ -306,7 +306,7 @@ if ( aface == NULL ) - return FTC_Err_Bad_Argument; + return FTC_Err_Invalid_Argument; *aface = NULL; diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c index b65850b61..15cca9854 100644 --- a/src/pfr/pfrdrivr.c +++ b/src/pfr/pfrdrivr.c @@ -66,7 +66,7 @@ FT_Pos *anadvance ) { PFR_Face face = (PFR_Face)pfrface; - FT_Error error = PFR_Err_Bad_Argument; + FT_Error error = PFR_Err_Invalid_Argument; *anadvance = 0; diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 1221fa063..2f9a3b812 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -458,7 +458,7 @@ face_index = 0; if ( face_index >= face->ttc_header.count ) - return SFNT_Err_Bad_Argument; + return SFNT_Err_Invalid_Argument; if ( FT_STREAM_SEEK( face->ttc_header.offsets[face_index] ) ) return error; diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 206a1eae3..571b57a31 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -184,7 +184,7 @@ #define ErrRaster_Invalid_Mode Smooth_Err_Cannot_Render_Glyph #define ErrRaster_Invalid_Outline Smooth_Err_Invalid_Outline #define ErrRaster_Memory_Overflow Smooth_Err_Out_Of_Memory -#define ErrRaster_Invalid_Argument Smooth_Err_Bad_Argument +#define ErrRaster_Invalid_Argument Smooth_Err_Invalid_Argument #endif /* !_STANDALONE_ */ diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index e27a32488..cb6b0352d 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -360,7 +360,7 @@ if ( face_index >= font_count ) { - error = FNT_Err_Bad_Argument; + error = FNT_Err_Invalid_Argument; goto Exit; } else if ( face_index < 0 ) @@ -566,7 +566,7 @@ if ( face_index >= face->root.num_faces ) { - error = FNT_Err_Bad_Argument; + error = FNT_Err_Invalid_Argument; goto Exit; } } @@ -719,7 +719,7 @@ if ( !error ) { if ( face_index > 0 ) - error = FNT_Err_Bad_Argument; + error = FNT_Err_Invalid_Argument; else if ( face_index < 0 ) goto Exit; }