Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 21:18:33 +00:00
Code Issues Releases Activity

Enable GCC 12 in actions, fix warning. (#1407)

Browse Source 
* Enable GCC 12 in actions, fix warning.

This resolves #1406.
This commit is contained in:
Brenden Matthews 2023-02-18 08:33:11 -05:00 committed by GitHub
parent 0ccf7f01de
commit 06f000d9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-and-test-linux.yaml vendored
View File

@ -29,7 +29,8 @@ jobs:
- 13
- 14
exclude:
- compiler: gcc
- os: ubuntu-20.04
compiler: gcc
compiler_version: 12
- compiler: gcc
compiler_version: 13

4
src/scroll.cc
View File

@ -27,9 +27,9 @@
*
*/
#include <vector>
#include "colours.h"
#include "conky.h"
#include "core.h"
#include "colours.h"
#include "display-output.hh"
#include "logging.h"
#include "specials.h"
@ -190,7 +190,7 @@ void parse_scroll_arg(struct text_object *obj, const char *arg,
sd->text[0] = 0;
}
strncat(sd->text, arg + n1, strlen(arg + n1));
strncat(sd->text, arg + n1, max_user_text.get(*state) - n1);
sd->start = sd->direction == SCROLL_WAIT ? strlen(sd->text) : 0;
obj->sub =
static_cast<struct text_object *>(malloc(sizeof(struct text_object)));