mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-15 06:59:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dead stores found by scan-build

Browse source 
In addition to removing unused code, two minor problems are fixed:
 (1) `resize set` and `resize adjust` did not error when given
too many arguments.
 (2) `orientation` was incorrectly overridden to be 'U' for
scroll events in the swaybar tray `handle_click` function.
This commit is contained in:
M Stoeckl 2019-01-22 10:07:38 -05:00
parent 71a37ad186
commit 0af5b26e41
11 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sway/tree/root.c
View file

@ -169,7 +169,6 @@ static pid_t get_parent_pid(pid_t child) {
pid_t parent = -1;
char file_name[100];
char *buffer = NULL;
char *token = NULL;
const char *sep = " ";
FILE *stat = NULL;
size_t buf_size = 0;
@ -178,10 +177,10 @@ static pid_t get_parent_pid(pid_t child) {
if ((stat = fopen(file_name, "r"))) {
if (getline(&buffer, &buf_size, stat) != -1) {
token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid
strtok(buffer, sep); // pid
strtok(NULL, sep); // executable name
strtok(NULL, sep); // state
char *token = strtok(NULL, sep); // parent pid
parent = strtol(token, NULL, 10);
}
free(buffer);

4
sway/tree/view.c
View file

@ -236,8 +236,6 @@ void view_autoconfigure(struct sway_view *view) {
con->border_bottom = bottom_y != ws->y + ws->height;
}
double x, y, width, height;
x = y = width = height = 0;
double y_offset = 0;
// In a tabbed or stacked container, the container's y is the top of the
@ -253,7 +251,9 @@ void view_autoconfigure(struct sway_view *view) {
con->border_top = false;
}
double x, y, width, height;
switch (con->border) {
default:
case B_CSD:
case B_NONE:
x = con->x;