Follow project coding style. Issue #2192.

This commit is contained in:
Eugene Shalygin 2016-12-17 17:29:43 +01:00
parent d330ae2421
commit 514de7edc4

View file

@ -15,10 +15,10 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
fprintf(out, "stack trace:\n"); fprintf(out, "stack trace:\n");
// storage array for stack trace address data // storage array for stack trace address data
void* addrlist[max_frames+1]; void *addrlist[max_frames + 1];
// retrieve current stack addresses // retrieve current stack addresses
int addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void*)); int addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void *));
if (addrlen == 0) { if (addrlen == 0) {
fprintf(out, " <empty, possibly corrupt>\n"); fprintf(out, " <empty, possibly corrupt>\n");
@ -27,36 +27,35 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
// resolve addresses into strings containing "filename(function+address)", // resolve addresses into strings containing "filename(function+address)",
// this array must be free()-ed // this array must be free()-ed
char** symbollist = backtrace_symbols(addrlist, addrlen); char * *symbollist = backtrace_symbols(addrlist, addrlen);
// allocate string which will be filled with the demangled function name // allocate string which will be filled with the demangled function name
size_t funcnamesize = 256; size_t funcnamesize = 256;
char* funcname = (char*)malloc(funcnamesize); char *funcname = (char *)malloc(funcnamesize);
// iterate over the returned symbol lines. skip the first, it is the // iterate over the returned symbol lines. skip the first, it is the
// address of this function. // address of this function.
for (int i = 2; i < addrlen; i++) for (int i = 2; i < addrlen; i++) {
{
char *begin_name = 0, *begin_offset = 0, *end_offset = 0; char *begin_name = 0, *begin_offset = 0, *end_offset = 0;
// find parentheses and +address offset surrounding the mangled name: // find parentheses and +address offset surrounding the mangled name:
// ./module(function+0x15c) [0x8048a6d] // ./module(function+0x15c) [0x8048a6d]
//fprintf(out, "%s TT\n", symbollist[i]); // fprintf(out, "%s TT\n", symbollist[i]);
for (char *p = symbollist[i]; *p; ++p) for (char *p = symbollist[i]; *p; ++p) {
{ if (*p == '(') {
if (*p == '(')
begin_name = p; begin_name = p;
else if (*p == '+') }
else if (*p == '+') {
begin_offset = p; begin_offset = p;
else if (*p == ')' && begin_offset) { }
else if ((*p == ')') && begin_offset) {
end_offset = p; end_offset = p;
break; break;
} }
} }
if (begin_name && begin_offset && end_offset if (begin_name && begin_offset && end_offset
&& begin_name < begin_offset) && (begin_name < begin_offset)) {
{
*begin_name++ = '\0'; *begin_name++ = '\0';
*begin_offset++ = '\0'; *begin_offset++ = '\0';
*end_offset = '\0'; *end_offset = '\0';
@ -66,7 +65,7 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
// __cxa_demangle(): // __cxa_demangle():
int status; int status;
char* ret = abi::__cxa_demangle(begin_name, char *ret = abi::__cxa_demangle(begin_name,
funcname, &funcnamesize, &status); funcname, &funcnamesize, &status);
if (status == 0) { if (status == 0) {
funcname = ret; // use possibly realloc()-ed string funcname = ret; // use possibly realloc()-ed string
@ -80,8 +79,7 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
symbollist[i], begin_name, begin_offset, ++end_offset); symbollist[i], begin_name, begin_offset, ++end_offset);
} }
} }
else else {
{
// couldn't parse the line? print the whole line. // couldn't parse the line? print the whole line.
fprintf(out, " %s\n", symbollist[i]); fprintf(out, " %s\n", symbollist[i]);
} }