andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify Error() - don't allocate temporary copy of error string

Browse Source 
Doesn't seem to be any reason to just not pass the error string
as another argument directly to LogVWrite()

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Alan Coopersmith 2010-11-27 22:34:57 -08:00
parent 685286b17d
commit 8f42b2b693
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os.h
View File

@ -526,7 +526,7 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
extern _X_EXPORT void VErrorF(const char *f, va_list args); extern _X_EXPORT void VErrorF(const char *f, va_list args);
extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern _X_EXPORT void Error(char *str); extern _X_EXPORT void Error(const char *str);
extern _X_EXPORT void LogPrintMarkers(void); extern _X_EXPORT void LogPrintMarkers(void);
extern _X_EXPORT void xorg_backtrace(void); extern _X_EXPORT void xorg_backtrace(void);

17
os/log.c
View File

@ -571,21 +571,14 @@ ErrorF(const char * f, ...)
/* A perror() workalike. */ /* A perror() workalike. */
void void
Error(char *str) Error(const char *str)
{ {
char *err = NULL; const char *err = strerror(errno);
int saveErrno = errno;
if (str) { if (str)
err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1); LogWrite(-1, "%s: %s", str, err);
if (!err) else
return;
sprintf(err, "%s: ", str);
strcat(err, strerror(saveErrno));
LogWrite(-1, "%s", err); LogWrite(-1, "%s", err);
free(err);
} else
LogWrite(-1, "%s", strerror(saveErrno));
} }
void void