Monotone-Parent: 473e23aa8952f82b8ef8ebcb95fd3ad46226c3be

Monotone-Revision: 9cebda7de52e1ba413335a38215dc3c20a3b925f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-05T22:51:01
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-12-05 22:51:01 +00:00
parent ca57a6c158
commit 643e8fefe7
2 changed files with 19 additions and 21 deletions

View File

@@ -6,7 +6,7 @@ include ../Version
include ./Version
ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -D_GNU_SOURCE
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -lbfd
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
SOGOD = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
TOOL_NAME = $(SOGOD)
@@ -17,7 +17,7 @@ all::
$(SOGOD)_OBJC_FILES += \
sogod.m \
NSException+Stacktrace.m\
# NSException+Stacktrace.m\
SOGo.m \
SOGoProductLoader.m \
build.m

View File

@@ -77,7 +77,7 @@ _NSFoundationUncaughtExceptionHandler (NSException *exception)
//
//
#define STACKSYMBOLS 1
// #define STACKSYMBOLS 1
@interface GSStackTrace : NSObject
{
@@ -94,7 +94,7 @@ _NSFoundationUncaughtExceptionHandler (NSException *exception)
@end
#ifdef STACKSYMBOLS
// #ifdef STACKSYMBOLS
// GSStackTrace inspired by FYStackTrace.m
// created by Wim Oudshoorn on Mon 11-Apr-2006
@@ -467,7 +467,7 @@ GSLoadModule(NSString *fileName)
return module;
}
#endif /* STACKSYMBOLS */
// #endif /* STACKSYMBOLS */
//
@@ -749,14 +749,12 @@ GSListModules()
+ (GSStackTrace*) currentStack
{
return [[[GSStackTrace alloc] init] autorelease];
return [[GSStackTrace new] autorelease];
}
- (oneway void) dealloc
{
[frames release];
frames = nil;
[super dealloc];
}
@@ -794,11 +792,11 @@ GSListModules()
// grab the current stack
- (id) init
{
#if defined(STACKSYMBOLS)
// #if defined(STACKSYMBOLS)
int i;
int n;
frames = [[NSMutableArray alloc] init];
frames = [NSMutableArray new];
n = NSCountFrames();
for (i = 0; i < n; i++)
@@ -860,20 +858,20 @@ GSListModules()
}
[frames addObject: aFrame];
}
#else
int i;
int n;
// #else
// int i;
// int n;
frames = [[NSMutableArray alloc] init];
n = NSCountFrames();
// frames = [NSMutableArray new];
// n = NSCountFrames();
for (i = 0; i < n; i++)
{
void *address = NSReturnAddress(i);
// for (i = 0; i < n; i++)
// {
// void *address = NSReturnAddress(i);
[frames addObject: [NSString stringWithFormat: @"%p", address]];
}
#endif
// [frames addObject: [NSString stringWithFormat: @"%p", address]];
// }
// #endif
return self;
}