mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 14:34:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1811 from martinetd/gcc_warnings

Browse Source 
Fix gcc warnings
This commit is contained in:
emersion 2018-04-15 07:42:38 +02:00 committed by GitHub
commit 3ea2a9a85e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ipc-client.c
View File

@ -48,7 +48,7 @@ int ipc_open_socket(const char *socket_path) {
sway_abort("Unable to open Unix socket"); sway_abort("Unable to open Unix socket");
} }
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path)); strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
addr.sun_path[sizeof(addr.sun_path) - 1] = 0; addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
int l = sizeof(struct sockaddr_un); int l = sizeof(struct sockaddr_un);
if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) { if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) {

2
sway/commands.c
View File

@ -601,7 +601,7 @@ struct cmd_results *add_color(const char *name,
"Invalid color definition %s", color); "Invalid color definition %s", color);
} }
} }
strncpy(buffer, color, len); strcpy(buffer, color);
// add default alpha channel if color was defined without it // add default alpha channel if color was defined without it
if (len == 7) { if (len == 7) {
buffer[7] = 'f'; buffer[7] = 'f';

2
sway/commands/exec_always.c
View File

@ -32,7 +32,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
// Put argument into cmd array // Put argument into cmd array
char cmd[4096]; char cmd[4096];
strncpy(cmd, tmp, sizeof(cmd)); strncpy(cmd, tmp, sizeof(cmd) - 1);
cmd[sizeof(cmd) - 1] = 0; cmd[sizeof(cmd) - 1] = 0;
free(tmp); free(tmp);
wlr_log(L_DEBUG, "Executing %s", cmd); wlr_log(L_DEBUG, "Executing %s", cmd);

2
sway/ipc-server.c
View File

@ -64,7 +64,7 @@ void ipc_init(struct sway_server *server) {
// We want to use socket name set by user, not existing socket from another sway instance. // We want to use socket name set by user, not existing socket from another sway instance.
if (getenv("SWAYSOCK") != NULL && access(getenv("SWAYSOCK"), F_OK) == -1) { if (getenv("SWAYSOCK") != NULL && access(getenv("SWAYSOCK"), F_OK) == -1) {
strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path)); strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path) - 1);
ipc_sockaddr->sun_path[sizeof(ipc_sockaddr->sun_path) - 1] = 0; ipc_sockaddr->sun_path[sizeof(ipc_sockaddr->sun_path) - 1] = 0;
} }

7
sway/tree/layout.c
View File

@ -288,8 +288,11 @@ void container_move(struct sway_container *container,
switch (current->type) { switch (current->type) {
case C_OUTPUT: { case C_OUTPUT: {
enum wlr_direction wlr_dir; enum wlr_direction wlr_dir = 0;
sway_dir_to_wlr(move_dir, &wlr_dir); if (!sway_assert(sway_dir_to_wlr(move_dir, &wlr_dir),
"got invalid direction: %d", move_dir)) {
return;
}
double ref_lx = current->x + current->width / 2; double ref_lx = current->x + current->width / 2;
double ref_ly = current->y + current->height / 2; double ref_ly = current->y + current->height / 2;
struct wlr_output *next = wlr_output_layout_adjacent_output( struct wlr_output *next = wlr_output_layout_adjacent_output(