fiddlerwoaroof/crawl - Change XF65ACXZAPMLFX3BK5C4UKFBXZVMPOLP3SW5DVCUKEBTVCVT6FAAC

Add formatting fixes.

Created by David Lawrence Ramsey on October 9, 2009

XF65ACXZAPMLFX3BK5C4UKFBXZVMPOLP3SW5DVCUKEBTVCVT6FAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/crash-u.cc at line 23 [3.3988]

B:BD[2.3359] → [2.3359:3420]

// used to convert from void* to function pointer (without a

[2.3359]

[2.3420]

// Used to convert from void* to function pointer (without a

Replacement in crawl-ref/source/crash-u.cc at line 26 [3.3988]

B:BD[2.3504] → [2.3504:3556]

	union {
		FROM f; TO t;
	} u; u.f = f; return u.t;

[2.3504]

[2.3556]

    union {
        FROM f; TO t;
    } u; u.f = f; return u.t;

Replacement in crawl-ref/source/crash-u.cc at line 157 [3.3988]

B:BD[2.3614] → [2.3614:4021]

	backtrace_t backtrace;
	backtrace_symbols_t backtrace_symbols;
	backtrace = nasty_cast<backtrace_t, void*>(dlsym(RTLD_DEFAULT, "backtrace"));
	backtrace_symbols = nasty_cast<backtrace_symbols_t, void*>(dlsym(RTLD_DEFAULT, "backtrace_symbols"));
	if (!backtrace || !backtrace_symbols)
	{
		fprintf(stderr, "Couldn't get a stack trace." EOL);
		fprintf(file, "Couldn't get a stack trace." EOL);
		return;
	}

[2.3614]

[2.4021]

    backtrace_t backtrace;
    backtrace_symbols_t backtrace_symbols;
    backtrace = nasty_cast<backtrace_t, void*>(dlsym(RTLD_DEFAULT, "backtrace"));
    backtrace_symbols = nasty_cast<backtrace_symbols_t, void*>(dlsym(RTLD_DEFAULT, "backtrace_symbols"));
    if (!backtrace || !backtrace_symbols)
    {
        fprintf(stderr, "Couldn't get a stack trace." EOL);
        fprintf(file, "Couldn't get a stack trace." EOL);
        return;
    }

Replacement in crawl-ref/source/crash-u.cc at line 185 [3.3988]

B:BD[2.4108] → [2.4108:4169]

	fprintf(file, "Obtained %d stack frames." EOL, num_frames);

[2.4108]

[3.7597]

    fprintf(file, "Obtained %d stack frames." EOL, num_frames);

Replacement in crawl-ref/source/crash-u.cc at line 187 [3.3988]

B:BD[3.7598] → [2.4170:4308]

	// Now we prettify the printout to even show demangled C++ function names.
	std::string bt = "";
	for (int i = 0; i < num_frames; i++) {

[3.7598]

[2.4308]

    // Now we prettify the printout to even show demangled C++ function names.
    std::string bt = "";
    for (int i = 0; i < num_frames; i++) {

Replacement in crawl-ref/source/crash-u.cc at line 191 [3.3988]

B:BD[2.4326] → [2.4326:4834]

		char *addr = ::strstr(symbols[i], "0x");
		char *mangled = ::strchr(addr, ' ') + 1;
		char *offset = ::strchr(addr, '+');
		char *postmangle = ::strchr(mangled, ' ');
		if (mangled) *(mangled - 1) = 0;
		bt += addr;
		int status;
		bt += ": ";
		if (addr && mangled) {
			if (postmangle)
				*postmangle = '\0';
			char *realname = abi::__cxa_demangle(mangled, 0, 0, &status);
			if (realname) {
				bt += realname;
			} else {
				bt += mangled;
			}
			bt += " ";
			bt += offset;
			free(realname);
		}

[2.4326]

[2.4834]

        char *addr = ::strstr(symbols[i], "0x");
        char *mangled = ::strchr(addr, ' ') + 1;
        char *offset = ::strchr(addr, '+');
        char *postmangle = ::strchr(mangled, ' ');
        if (mangled)
            *(mangled - 1) = 0;
        bt += addr;
        int status;
        bt += ": ";
        if (addr && mangled)
        {
            if (postmangle)
                *postmangle = '\0';
            char *realname = abi::__cxa_demangle(mangled, 0, 0, &status);
            if (realname)
                bt += realname;
            else
                bt += mangled;
            bt += " ";
            bt += offset;
            free(realname);
        }

Replacement in crawl-ref/source/crash-u.cc at line 214 [3.3988]

B:BD[2.4847] → [2.4847:5304]

		bt += symbols[i];
		int status;
		/* extract the identifier from symbols[i].  It's inside of parens. */
		char * firstparen = ::strchr(symbols[i], '(');
		char * lastparen = ::strchr(symbols[i], '+');
		if (firstparen != 0 && lastparen != 0 && firstparen < lastparen) {
			bt += ": ";
			*lastparen = '\0';
			char * realname = abi::__cxa_demangle(firstparen + 1, 0, 0, &status);
			if (realname != NULL) {
				bt += realname;
			}
			free(realname);
		}

[2.4847]

[2.5304]

        bt += symbols[i];
        int status;
        // Extract the identifier from symbols[i].  It's inside of parens.
        char *firstparen = ::strchr(symbols[i], '(');
        char *lastparen = ::strchr(symbols[i], '+');
        if (firstparen != 0 && lastparen != 0 && firstparen < lastparen)
        {
            bt += ": ";
            *lastparen = '\0';
            char *realname = abi::__cxa_demangle(firstparen + 1, 0, 0, &status);
            if (realname != NULL)
                bt += realname;
            free(realname);
        }

Replacement in crawl-ref/source/crash-u.cc at line 229 [3.3988]
B:BD[2.5311] → [2.5311:5327]
```
		bt += EOL;
	}
```
[2.5311]
[3.7707]
```
        bt += EOL;
    }
```
Replacement in crawl-ref/source/crash-u.cc at line 232 [3.3988]
B:BD[3.7708] → [2.5328:5362]
```
	fprintf(file, "%s", bt.c_str());
```
[3.7708]
[2.5362]
```
    fprintf(file, "%s", bt.c_str());
```