diff options
author | 2016-12-17 13:23:44 -0500 | |
---|---|---|
committer | 2016-12-17 13:23:44 -0500 | |
commit | f04ee0e68d885d7e1101cc88f9a9337202041f1f (patch) | |
tree | fa4dc296a5f1377867752d320ceef4e4b0178bbf /common/log.c | |
parent | Merge pull request #991 from barfoo1/registry_fix (diff) | |
parent | Fix build error (diff) | |
download | sway-f04ee0e68d885d7e1101cc88f9a9337202041f1f.tar.gz sway-f04ee0e68d885d7e1101cc88f9a9337202041f1f.tar.zst sway-f04ee0e68d885d7e1101cc88f9a9337202041f1f.zip |
Merge pull request #995 from SirCmpwn/memory-use
Handle allocation failures
Diffstat (limited to 'common/log.c')
-rw-r--r-- | common/log.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/common/log.c b/common/log.c index 4f0baa3f..825b176b 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -88,9 +88,14 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const | |||
88 | } | 88 | } |
89 | 89 | ||
90 | if (filename && line) { | 90 | if (filename && line) { |
91 | char *file = strdup(filename); | 91 | const char *file = filename + strlen(filename); |
92 | fprintf(stderr, "[%s:%d] ", basename(file), line); | 92 | while (file != filename && *file != '/') { |
93 | free(file); | 93 | --file; |
94 | } | ||
95 | if (*file == '/') { | ||
96 | ++file; | ||
97 | } | ||
98 | fprintf(stderr, "[%s:%d] ", file, line); | ||
94 | } | 99 | } |
95 | 100 | ||
96 | va_list args; | 101 | va_list args; |