diff options
author | 2018-07-23 20:27:56 -0400 | |
---|---|---|
committer | 2018-07-23 20:31:11 -0400 | |
commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /common/util.c | |
parent | Implement pid->workspace tracking (diff) | |
parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'common/util.c')
-rw-r--r-- | common/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/util.c b/common/util.c index fb7f9454..e8a88772 100644 --- a/common/util.c +++ b/common/util.c | |||
@@ -95,7 +95,7 @@ pid_t get_parent_pid(pid_t child) { | |||
95 | token = strtok(NULL, sep); // parent pid | 95 | token = strtok(NULL, sep); // parent pid |
96 | parent = strtol(token, NULL, 10); | 96 | parent = strtol(token, NULL, 10); |
97 | } | 97 | } |
98 | 98 | free(buffer); | |
99 | fclose(stat); | 99 | fclose(stat); |
100 | } | 100 | } |
101 | 101 | ||
@@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) { | |||
113 | 113 | ||
114 | int len = strlen(color); | 114 | int len = strlen(color); |
115 | if (len != 6 && len != 8) { | 115 | if (len != 6 && len != 8) { |
116 | wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); | 116 | wlr_log(WLR_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); |
117 | return 0xFFFFFFFF; | 117 | return 0xFFFFFFFF; |
118 | } | 118 | } |
119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); | 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); |