pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip newlines from messages in SDL_Log*() before calling logging function.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-07-05 00:41:34 -04:00
parent 47a2869b0d
commit 292c6c09ee
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/SDL_log.c
View file

@ -266,6 +266,7 @@ void
SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap) SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
{ {
char *message; char *message;
size_t len;
/* Nothing to do if we don't have an output function */ /* Nothing to do if we don't have an output function */
if (!SDL_log_function) { if (!SDL_log_function) {
@ -286,7 +287,18 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
if (!message) { if (!message) {
return; return;
} }
SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap); SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
/* Chop off final endline. */
len = SDL_strlen(message);
if ((len > 0) && (message[len-1] == '\n')) {
message[--len] = '\0';
if ((len > 0) && (message[len-1] == '\r')) { /* catch "\r\n", too. */
message[--len] = '\0';
}
}
SDL_log_function(SDL_log_userdata, category, priority, message); SDL_log_function(SDL_log_userdata, category, priority, message);
SDL_stack_free(message); SDL_stack_free(message);
} }
@ -390,9 +402,9 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
char* output; char* output;
FILE* pFile; FILE* pFile;
/* !!! FIXME: is there any reason we didn't just use fprintf() here? */ /* !!! FIXME: is there any reason we didn't just use fprintf() here? */
length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1; length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 2;
output = SDL_stack_alloc(char, length); output = SDL_stack_alloc(char, length);
SDL_snprintf(output, length, "%s: %s", SDL_priority_prefixes[priority], message); SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message);
pFile = fopen ("SDL_Log.txt", "a"); pFile = fopen ("SDL_Log.txt", "a");
fwrite (output, strlen (output), 1, pFile); fwrite (output, strlen (output), 1, pFile);
SDL_stack_free(output); SDL_stack_free(output);