frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'dottedmag/master'

This commit is contained in:
Keith Packard 2010-11-10 14:41:08 -08:00
parent 383dfe23f1 44e8165414
commit acba00c0c1
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/log.c
View File

@ -177,7 +177,6 @@ LogInit(const char *fname, const char *backup)
char *logFileName = NULL; char *logFileName = NULL;
if (fname && *fname) { if (fname && *fname) {
/* malloc() can't be used yet. */
logFileName = malloc(strlen(fname) + strlen(display) + 1); logFileName = malloc(strlen(fname) + strlen(display) + 1);
if (!logFileName) if (!logFileName)
FatalError("Cannot allocate space for the log file name\n"); FatalError("Cannot allocate space for the log file name\n");
@ -302,17 +301,10 @@ LogVWrite(int verb, const char *f, va_list args)
#endif #endif
} }
} else if (needBuffer) { } else if (needBuffer) {
/*
* Note, this code is used before OsInit() has been called, so
* malloc() and friends can't be used.
*/
if (len > bufferUnused) { if (len > bufferUnused) {
bufferSize += 1024; bufferSize += 1024;
bufferUnused += 1024; bufferUnused += 1024;
if (saveBuffer) saveBuffer = realloc(saveBuffer, bufferSize);
saveBuffer = realloc(saveBuffer, bufferSize);
else
saveBuffer = malloc(bufferSize);
if (!saveBuffer) if (!saveBuffer)
FatalError("realloc() failed while saving log messages\n"); FatalError("realloc() failed while saving log messages\n");
} }