@@ -75,15 +75,16 @@ void **backtrace; uint8_t i; }; extern _Unwind_Reason_Code _Unwind_Backtrace( - _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); + _Unwind_Reason_Code (*)(struct _Unwind_Context *, void *), void *); # ifndef HAVE_ARM_EHABI_EXCEPTIONS -extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*); +extern uintptr_t _Unwind_GetIP(struct _Unwind_Context *); # else -extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); +extern int _Unwind_VRS_Get(struct _Unwind_Context *, int, uint32_t, int, + void *); # endif #endif #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) static of_mutex_t mutex; @@ -93,11 +94,11 @@ if (!of_mutex_new(&mutex)) @throw [OFInitializationFailedException exception]; } #endif -OFString* +OFString * of_strerror(int errNo) { OFString *ret; #ifdef HAVE_STRERROR_R char buffer[256]; @@ -226,16 +227,16 @@ { struct backtrace_ctx *bt = data; if (bt->i < OF_BACKTRACE_SIZE) { # ifndef HAVE_ARM_EHABI_EXCEPTIONS - bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx); + bt->backtrace[bt->i++] = (void *)_Unwind_GetIP(ctx); # else uintptr_t ip; _Unwind_VRS_Get(ctx, 0, 15, 0, &ip); - bt->backtrace[bt->i++] = (void*)(ip & ~1); + bt->backtrace[bt->i++] = (void *)(ip & ~1); # endif return _URC_OK; } return _URC_END_OF_STACK; @@ -261,17 +262,17 @@ return self; } #endif -- (OFString*)description +- (OFString *)description { return [OFString stringWithFormat: @"An exception of type %@ occurred!", [self class]]; } -- (OFArray*)backtrace +- (OFArray *)backtrace { #ifdef HAVE_DWARF_EXCEPTIONS OFMutableArray *backtrace = [OFMutableArray array]; void *pool = objc_autoreleasePoolPush(); @@ -282,12 +283,12 @@ if (dladdr(_backtrace[i], &info)) { OFString *frame; if (info.dli_sname != NULL) { - ptrdiff_t offset = (char*)_backtrace[i] - - (char*)info.dli_saddr; + ptrdiff_t offset = (char *)_backtrace[i] - + (char *)info.dli_saddr; frame = [OFString stringWithFormat: @"%p <%s+%td> at %s", _backtrace[i], info.dli_sname, offset, info.dli_fname];