1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Strip file names reported in error messages on Windows, too.

Browse Source 
Commit dd136052b established a policy that error message FILE items
should include only the base name of the reporting source file, for
uniformity and succinctness.  We now observe that some Windows compilers
use backslashes in __FILE__ strings, so truncate at backslashes as well.

This is expected to fix some platform variation in the results of the
new libpq_pipeline test module.

Discussion: https://postgr.es/m/3650140.1617372290@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2021-04-02 10:43:54 -04:00
parent 1877c9ac3a
commit 53aafdb9ff
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/error/elog.c
View File

@ -529,6 +529,10 @@ errfinish(const char *filename, int lineno, const char *funcname)
slash = strrchr(filename, '/'); slash = strrchr(filename, '/');
if (slash) if (slash)
filename = slash + 1; filename = slash + 1;
/* Some Windows compilers use backslashes in __FILE__ strings */
slash = strrchr(filename, '\\');
if (slash)
filename = slash + 1;
} }
edata->filename = filename; edata->filename = filename;