From cd0f233c55fccb437c9fe1cae86a918d2ed31ad7 Mon Sep 17 00:00:00 2001 From: mccallum Date: Mon, 6 Jan 1997 22:40:16 +0000 Subject: [PATCH] [NSAssertionHandler -handleFailureInMethod:object:file: lineNumber:description:]: Use the FORMAT argument! (Reported by Wolfgang Baron .) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2021 72102866-910b-0410-8b05-ffd578937521 --- Source/NSAssertionHandler.m | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Source/NSAssertionHandler.m b/Source/NSAssertionHandler.m index b75c72afa..3aad7a4d6 100644 --- a/Source/NSAssertionHandler.m +++ b/Source/NSAssertionHandler.m @@ -1,5 +1,5 @@ /* NSAssertionHandler - Object encapsulation of assertions - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 1997 Free Software Foundation, Inc. Written by: Adam Fedor Date: Apr 1995 @@ -55,26 +55,25 @@ /* NOT REACHED */ } -- (void)handleFailureInMethod:(SEL)aSelector - object:object - file:(NSString *)fileName - lineNumber:(int)line - description:(NSString *)format,... +- (void) handleFailureInMethod: (SEL) aSelector + object: object + file: (NSString *) fileName + lineNumber: (int) line + description: (NSString *) format,... { va_list ap; va_start(ap, format); // FIXME: should be NSLog; fprintf(stderr, "Assertion failed in %s, method %s, file %s:%d. ", - object_get_class_name(object), sel_get_name(aSelector), - [fileName cString], line); + object_get_class_name(object), sel_get_name(aSelector), + [fileName cString], line); vfprintf(stderr, [format cString], ap); fprintf(stderr, "\n"); + + [NSException raise: NSInternalInconsistencyException + format: format arguments: ap]; va_end(ap); - - [NSException raise:NSInternalInconsistencyException - format:@"Assertion failed in %s, method %s", - object_get_class_name(object), sel_get_name(aSelector)]; /* NOT REACHED */ }