linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2556
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-06-14 22:44:55 +0200
message:
  crash logger cosmetics: fix double new lines & MSVC x86 output
modified:
  win32/CrashLogger.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/CrashLogger.cpp'
--- win32/CrashLogger.cpp	2011-06-12 22:41:02 +0000
+++ win32/CrashLogger.cpp	2011-06-14 20:44:55 +0000
@@ -99,7 +99,7 @@
 
 	bfd *b = bfd_openr(procname, 0);
 	if (!b) {
-		fprintf(f, "Failed to open bfd from %s\r\n", procname);
+		fprintf(f, "Failed to open bfd from %s\n", procname);
 		return false;
 	}
 
@@ -109,7 +109,7 @@
 
 	if (!(r1 && r2 && r3)) {
 		bfd_close(b);
-		fprintf(f, "Failed to init bfd from %s\r\n", procname);
+		fprintf(f, "Failed to init bfd from %s\n", procname);
 		return false;
 	}
 
@@ -120,7 +120,7 @@
 		if (bfd_read_minisymbols(b, TRUE, &symbol_table, &dummy) < 0) {
 			free(symbol_table);
 			bfd_close(b);
-			fprintf(f, "Failed to read symbols from %s\r\n", procname);
+			fprintf(f, "Failed to read symbols from %s\n", procname);
 			return false;
 		}
 	}
@@ -196,11 +196,11 @@
 #endif
 
 inline void writeAppInfo() {
-	fputs(Util::formatTime(APPNAME " has crashed on %Y-%m-%d at %H:%M:%S.\r\n", time(0)).c_str(), f);
-	fputs("Please report this data to the " APPNAME " team for further investigation.\r\n\r\n", f);
+	fputs(Util::formatTime(APPNAME " has crashed on %Y-%m-%d at %H:%M:%S.\n", time(0)).c_str(), f);
+	fputs("Please report this data to the " APPNAME " team for further investigation.\n\n", f);
 
-	fprintf(f, APPNAME " version: %s\r\n", fullVersionString.c_str());
-	fprintf(f, "TTH: %S\r\n", WinUtil::tth.c_str());
+	fprintf(f, APPNAME " version: %s\n", fullVersionString.c_str());
+	fprintf(f, "TTH: %S\n", WinUtil::tth.c_str());
 
 #ifdef __MINGW32__
 	fputs("Compiled with GCC " __VERSION__, f);
@@ -213,7 +213,7 @@
 #ifdef _WIN64
 	fputs(" (x64)", f);
 #endif
-	fputs("\r\n", f);
+	fputs("\n", f);
 }
 
 inline void writePlatformInfo() {
@@ -222,11 +222,11 @@
 		ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
 	if(::GetVersionEx(reinterpret_cast<LPOSVERSIONINFO>(&ver))) {
-		fprintf(f, "Windows version: major = %d, minor = %d, build = %d, SP = %d, type = %d\r\n",
+		fprintf(f, "Windows version: major = %d, minor = %d, build = %d, SP = %d, type = %d\n",
 			ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.wServicePackMajor, ver.wProductType);
 
 	} else {
-		fprintf(f, "Windows version: unknown\r\n");
+		fputs("Windows version: unknown\n", f);
 	}
 
 	SYSTEM_INFO info;
@@ -252,7 +252,7 @@
 #endif
 
 	if(!SymInitialize(process, 0, TRUE)) {
-		fputs("Failed to init symbol context\r\n", f);
+		fputs("Failed to init symbol context\n", f);
 		return;
 	}
 
@@ -348,9 +348,9 @@
 #endif
 
 		if(func == 0) {
-			fprintf(f, "0x%x - %s - %s\r\n", frame.AddrPC.Offset, module_name, file);
+			fprintf(f, "%s - %s\n", module_name, file);
 		} else {
-			fprintf(f, "0x%x - %s - %s (%d) - in function %s\r\n", frame.AddrPC.Offset, module_name, file, line, func);
+			fprintf(f, "%s - %s (%d) - in function %s\n", module_name, file, line, func);
 		}
 	}
 
@@ -369,18 +369,18 @@
 	if(f) {
 		writeAppInfo();
 
-		fprintf(f, "Exception code: %x\r\n", info->ExceptionRecord->ExceptionCode);
+		fprintf(f, "Exception code: %x\n", info->ExceptionRecord->ExceptionCode);
 
 		writePlatformInfo();
 
 #ifdef NO_BACKTRACE
-		fputs("\r\nStack trace unavailable: this program hasn't been compiled with backtrace support\r\n", f);
+		fputs("\nStack trace unavailable: this program hasn't been compiled with backtrace support\n", f);
 #else
-		fputs("\r\nWriting the stack trace...\r\n\r\n", f);
+		fputs("\nWriting the stack trace...\n\n", f);
 		writeBacktrace(info->ContextRecord);
 #endif
 
-		fputs("\r\nInformation about the crash has been written.\r\n", f);
+		fputs("\nInformation about the crash has been written.\n", f);
 		fclose(f);
 	}
 	return EXCEPTION_CONTINUE_SEARCH;