Merge remote branch 'dottedmag/master'
This commit is contained in:
commit
acba00c0c1
10
os/log.c
10
os/log.c
|
@ -177,7 +177,6 @@ LogInit(const char *fname, const char *backup)
|
|||
char *logFileName = NULL;
|
||||
|
||||
if (fname && *fname) {
|
||||
/* malloc() can't be used yet. */
|
||||
logFileName = malloc(strlen(fname) + strlen(display) + 1);
|
||||
if (!logFileName)
|
||||
FatalError("Cannot allocate space for the log file name\n");
|
||||
|
@ -302,17 +301,10 @@ LogVWrite(int verb, const char *f, va_list args)
|
|||
#endif
|
||||
}
|
||||
} else if (needBuffer) {
|
||||
/*
|
||||
* Note, this code is used before OsInit() has been called, so
|
||||
* malloc() and friends can't be used.
|
||||
*/
|
||||
if (len > bufferUnused) {
|
||||
bufferSize += 1024;
|
||||
bufferUnused += 1024;
|
||||
if (saveBuffer)
|
||||
saveBuffer = realloc(saveBuffer, bufferSize);
|
||||
else
|
||||
saveBuffer = malloc(bufferSize);
|
||||
saveBuffer = realloc(saveBuffer, bufferSize);
|
||||
if (!saveBuffer)
|
||||
FatalError("realloc() failed while saving log messages\n");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user