Skip to content
Permalink
Browse files

Fix endlines for logging via OutputDebugString().

  • Loading branch information
icculus committed Aug 29, 2013
1 parent aa65211 commit 2538d3114074bb8046d40df17200fcffae57449f
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/SDL_log.c
@@ -332,16 +332,16 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
if (!attachResult) {
attachError = GetLastError();
if (attachError == ERROR_INVALID_HANDLE) {
OutputDebugString(TEXT("Parent process has no console"));
OutputDebugString(TEXT("Parent process has no console\r\n"));
consoleAttached = -1;
} else if (attachError == ERROR_GEN_FAILURE) {
OutputDebugString(TEXT("Could not attach to console of parent process"));
OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
consoleAttached = -1;
} else if (attachError == ERROR_ACCESS_DENIED) {
/* Already attached */
consoleAttached = 1;
} else {
OutputDebugString(TEXT("Error attaching console"));
OutputDebugString(TEXT("Error attaching console\r\n"));
consoleAttached = -1;
}
} else {
@@ -354,9 +354,9 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
}
}

length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1;
length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1 + 1;
output = SDL_stack_alloc(char, length);
SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message);
SDL_snprintf(output, length, "%s: %s\r\n", SDL_priority_prefixes[priority], message);
tstr = WIN_UTF8ToString(output);

/* Output to debugger */
@@ -365,10 +365,10 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
/* Screen output to stderr, if console was attached. */
if (consoleAttached == 1) {
if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
OutputDebugString(TEXT("Error calling WriteConsole"));
OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
}
if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
OutputDebugString(TEXT("Insufficient heap memory to write message"));
OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
}
}

0 comments on commit 2538d31

Please sign in to comment.