diff options
Diffstat (limited to 'extra/conky/fix-type-mismatch.patch')
| -rw-r--r-- | extra/conky/fix-type-mismatch.patch | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/extra/conky/fix-type-mismatch.patch b/extra/conky/fix-type-mismatch.patch index 286fa107..a84d05e2 100644 --- a/extra/conky/fix-type-mismatch.patch +++ b/extra/conky/fix-type-mismatch.patch @@ -1,26 +1,13 @@ diff --git a/src/linux.cc b/src/linux.cc -index affa1de1..67d4662e 100644 +index 0a7d4331..09fa6c99 100644 --- a/src/linux.cc +++ b/src/linux.cc -@@ -1171,7 +1171,7 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type, +@@ -1169,7 +1169,7 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type, fd = open(path, O_RDONLY); if (fd < 0) { /* if it fails, strip the /device from dev and attempt again */ -- buf[std::max(0UL, strnlen(buf, 255) - 7)] = 0; -+ buf[std::max((size_t)0UL, strnlen(buf, 255) - 7)] = 0; +- size_t len_to_trunc = std::max(7UL, strnlen(buf, 255)) - 7; ++ size_t len_to_trunc = std::max((size_t)7UL, strnlen(buf, 255)) - 7; + buf[len_to_trunc] = 0; snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n); fd = open(path, O_RDONLY); - if (fd < 0) { -diff --git a/src/mail.cc b/src/mail.cc -index 19dd1af8..fbcc4e2a 100644 ---- a/src/mail.cc -+++ b/src/mail.cc -@@ -302,7 +302,7 @@ static void update_mail_count(struct local_mail_s *mail) { - } - closedir(dir); - -- dirname[std::max(0UL, strnlen(dirname, dirname_len - 1) - 3)] = '\0'; -+ dirname[std::max((size_t)0UL, strnlen(dirname, dirname_len - 1) - 3)] = '\0'; - strcat(dirname, "new"); - - dir = opendir(dirname); |